1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] edk2: Fix typo in Contributions.txt

Star Zeng posted 1 patch 6 years, 8 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
Contributions.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[edk2] [PATCH] edk2: Fix typo in Contributions.txt
Posted by Star Zeng 6 years, 8 months ago 
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 Contributions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Contributions.txt b/Contributions.txt
index bd2f11f407fa..3c2dc1cf86a3 100644
--- a/Contributions.txt
+++ b/Contributions.txt
@@ -119,7 +119,7 @@ or when applicable, in the associated License.txt file.
 
 Unless otherwise indicated, all Documentation made available on the
 TianoCore site is provided to you under the terms and conditions of the
-FreeBSD Documentation License ("FreeBSD"). A copy of the BSD License is
+FreeBSD Documentation License ("FreeBSD"). A copy of the FreeBSD License is
 available at https://www.freebsd.org/copyright/freebsd-doc-license.html or,
 when applicable, in the associated License.txt file.
 
-- 
2.13.3.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] edk2: Fix typo in Contributions.txt
Posted by Kinney, Michael D 6 years, 8 months ago 
Star,

I recommend changing the sentence to:

"A copy of the license is available at"

Mike


> -----Original Message-----
> From: Zeng, Star
> Sent: Monday, August 14, 2017 6:54 AM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: [PATCH] edk2: Fix typo in Contributions.txt
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  Contributions.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Contributions.txt b/Contributions.txt
> index bd2f11f407fa..3c2dc1cf86a3 100644
> --- a/Contributions.txt
> +++ b/Contributions.txt
> @@ -119,7 +119,7 @@ or when applicable, in the associated
> License.txt file.
> 
>  Unless otherwise indicated, all Documentation made available on
> the
>  TianoCore site is provided to you under the terms and
> conditions of the
> -FreeBSD Documentation License ("FreeBSD"). A copy of the BSD
> License is
> +FreeBSD Documentation License ("FreeBSD"). A copy of the
> FreeBSD License is
>  available at https://www.freebsd.org/copyright/freebsd-doc-
> license.html or,
>  when applicable, in the associated License.txt file.
> 
> --
> 2.13.3.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] edk2: Fix typo in Contributions.txt
Posted by Zeng, Star 6 years, 8 months ago 
Mike,

Follow your recommendation.

"A copy of the BSD License is available at" also need to be "A copy of the license is available at", right?


145215034bc3765a4cc69a9b7494e956e6e0136c
 Contributions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Contributions.txt b/Contributions.txt
index bd2f11f407fa..c47982f77e32 100644
--- a/Contributions.txt
+++ b/Contributions.txt
@@ -113,13 +113,13 @@ USE THE CONTENT.
 
 Unless otherwise indicated, all Content (except Documentation) made available
 on the TianoCore site is provided to you under the terms and conditions of the
-BSD License ("BSD"). A copy of the BSD License is available at
+BSD License ("BSD"). A copy of the License is available at
 http://opensource.org/licenses/bsd-license.php
 or when applicable, in the associated License.txt file.
 
 Unless otherwise indicated, all Documentation made available on the
 TianoCore site is provided to you under the terms and conditions of the
-FreeBSD Documentation License ("FreeBSD"). A copy of the BSD License is
+FreeBSD Documentation License ("FreeBSD"). A copy of the License is
 available at https://www.freebsd.org/copyright/freebsd-doc-license.html or,
 when applicable, in the associated License.txt file.


Thanks,
Star
-----Original Message-----
From: Kinney, Michael D 
Sent: Wednesday, August 16, 2017 7:42 AM
To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: RE: [PATCH] edk2: Fix typo in Contributions.txt

Star,

I recommend changing the sentence to:

"A copy of the license is available at"

Mike


> -----Original Message-----
> From: Zeng, Star
> Sent: Monday, August 14, 2017 6:54 AM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael D 
> <michael.d.kinney@intel.com>
> Subject: [PATCH] edk2: Fix typo in Contributions.txt
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  Contributions.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Contributions.txt b/Contributions.txt index 
> bd2f11f407fa..3c2dc1cf86a3 100644
> --- a/Contributions.txt
> +++ b/Contributions.txt
> @@ -119,7 +119,7 @@ or when applicable, in the associated License.txt 
> file.
> 
>  Unless otherwise indicated, all Documentation made available on the  
> TianoCore site is provided to you under the terms and conditions of 
> the -FreeBSD Documentation License ("FreeBSD"). A copy of the BSD 
> License is
> +FreeBSD Documentation License ("FreeBSD"). A copy of the
> FreeBSD License is
>  available at https://www.freebsd.org/copyright/freebsd-doc-
> license.html or,
>  when applicable, in the associated License.txt file.
> 
> --
> 2.13.3.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] edk2: Fix typo in Contributions.txt
Posted by Kinney, Michael D 6 years, 8 months ago 
Star,

Do not change to the source code paragraph.

Only change the documentation one and use "license" not "License".

Mike

> -----Original Message-----
> From: Zeng, Star
> Sent: Tuesday, August 15, 2017 5:39 PM
> To: Kinney, Michael D <michael.d.kinney@intel.com>; edk2-
> devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>
> Subject: RE: [PATCH] edk2: Fix typo in Contributions.txt
> 
> Mike,
> 
> Follow your recommendation.
> 
> "A copy of the BSD License is available at" also need to be "A
> copy of the license is available at", right?
> 
> 
> 145215034bc3765a4cc69a9b7494e956e6e0136c
>  Contributions.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Contributions.txt b/Contributions.txt
> index bd2f11f407fa..c47982f77e32 100644
> --- a/Contributions.txt
> +++ b/Contributions.txt
> @@ -113,13 +113,13 @@ USE THE CONTENT.
> 
>  Unless otherwise indicated, all Content (except Documentation)
> made available
>  on the TianoCore site is provided to you under the terms and
> conditions of the
> -BSD License ("BSD"). A copy of the BSD License is available at
> +BSD License ("BSD"). A copy of the License is available at
>  http://opensource.org/licenses/bsd-license.php
>  or when applicable, in the associated License.txt file.
> 
>  Unless otherwise indicated, all Documentation made available on
> the
>  TianoCore site is provided to you under the terms and
> conditions of the
> -FreeBSD Documentation License ("FreeBSD"). A copy of the BSD
> License is
> +FreeBSD Documentation License ("FreeBSD"). A copy of the
> License is
>  available at https://www.freebsd.org/copyright/freebsd-doc-
> license.html or,
>  when applicable, in the associated License.txt file.
> 
> 
> Thanks,
> Star
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Wednesday, August 16, 2017 7:42 AM
> To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org;
> Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: RE: [PATCH] edk2: Fix typo in Contributions.txt
> 
> Star,
> 
> I recommend changing the sentence to:
> 
> "A copy of the license is available at"
> 
> Mike
> 
> 
> > -----Original Message-----
> > From: Zeng, Star
> > Sent: Monday, August 14, 2017 6:54 AM
> > To: edk2-devel@lists.01.org
> > Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael D
> > <michael.d.kinney@intel.com>
> > Subject: [PATCH] edk2: Fix typo in Contributions.txt
> >
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Star Zeng <star.zeng@intel.com>
> > ---
> >  Contributions.txt | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Contributions.txt b/Contributions.txt index
> > bd2f11f407fa..3c2dc1cf86a3 100644
> > --- a/Contributions.txt
> > +++ b/Contributions.txt
> > @@ -119,7 +119,7 @@ or when applicable, in the associated
> License.txt
> > file.
> >
> >  Unless otherwise indicated, all Documentation made available
> on the
> > TianoCore site is provided to you under the terms and
> conditions of
> > the -FreeBSD Documentation License ("FreeBSD"). A copy of the
> BSD
> > License is
> > +FreeBSD Documentation License ("FreeBSD"). A copy of the
> > FreeBSD License is
> >  available at https://www.freebsd.org/copyright/freebsd-doc-
> > license.html or,
> >  when applicable, in the associated License.txt file.
> >
> > --
> > 2.13.3.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.