public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] edk2: Fix typo in Contributions.txt
@ 2017-08-14 13:53 Star Zeng
  2017-08-15 23:42 ` Kinney, Michael D
  0 siblings, 1 reply; 4+ messages in thread
From: Star Zeng @ 2017-08-14 13:53 UTC (permalink / raw)
  To: edk2-devel; +Cc: Star Zeng, Michael D Kinney

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



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] edk2: Fix typo in Contributions.txt
  2017-08-14 13:53 [PATCH] edk2: Fix typo in Contributions.txt Star Zeng
@ 2017-08-15 23:42 ` Kinney, Michael D
  2017-08-16  0:39   ` Zeng, Star
  0 siblings, 1 reply; 4+ messages in thread
From: Kinney, Michael D @ 2017-08-15 23:42 UTC (permalink / raw)
  To: Zeng, Star, edk2-devel@lists.01.org, Kinney, Michael D

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



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] edk2: Fix typo in Contributions.txt
  2017-08-15 23:42 ` Kinney, Michael D
@ 2017-08-16  0:39   ` Zeng, Star
  2017-08-16  1:00     ` Kinney, Michael D
  0 siblings, 1 reply; 4+ messages in thread
From: Zeng, Star @ 2017-08-16  0:39 UTC (permalink / raw)
  To: Kinney, Michael D, edk2-devel@lists.01.org; +Cc: Zeng, Star

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



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] edk2: Fix typo in Contributions.txt
  2017-08-16  0:39   ` Zeng, Star
@ 2017-08-16  1:00     ` Kinney, Michael D
  0 siblings, 0 replies; 4+ messages in thread
From: Kinney, Michael D @ 2017-08-16  1:00 UTC (permalink / raw)
  To: Zeng, Star, edk2-devel@lists.01.org, Kinney, Michael D

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



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-08-16  0:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-14 13:53 [PATCH] edk2: Fix typo in Contributions.txt Star Zeng
2017-08-15 23:42 ` Kinney, Michael D
2017-08-16  0:39   ` Zeng, Star
2017-08-16  1:00     ` Kinney, Michael D

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox