You are viewing a plain text version of this content. The canonical link for it is here.
Posted to legal-discuss@apache.org by an...@apache.org on 2021/04/21 14:15:21 UTC
svn commit: r1889063 -
/infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
Author: andreww
Date: Wed Apr 21 14:15:20 2021
New Revision: 1889063
URL: http://svn.apache.org/viewvc?rev=1889063&view=rev
Log:
Minor text edits to the commentary, not to the license itself
Modified:
infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
Modified: infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext?rev=1889063&r1=1889062&r2=1889063&view=diff
==============================================================================
--- infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext (original)
+++ infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext Wed Apr 21 14:15:20 2021
@@ -23,7 +23,7 @@ Notice: Licensed to the Apache Softwa
* OSI Approved License: [https://opensource.org/licenses/Apache-2.0](https://opensource.org/licenses/Apache-2.0)
The 2.0 version of the Apache License, approved by the ASF in 2004, helps us achieve our goal of providing
-reliable and long-lived software products through collaborative open source software development.
+reliable and long-lived software products through collaborative, open-source software development.
All packages produced by the ASF are implicitly licensed under the Apache
License, Version 2.0, unless otherwise explicitly stated.
@@ -217,15 +217,13 @@ liability.</p>
# How to apply the Apache License to your work # {#apply}
-You should include a copy of the Apache License, typically in a file called
-LICENSE, in your work, and consider also including a NOTICE file.
+Include a copy of the Apache License, typically in a file called
+LICENSE, in your work, and consider also including a NOTICE file that references the License.
To apply the Apache License to specific files in your work, attach the following boilerplate
-declaration, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included
-on the same "printed page" as the copyright notice for easier
+declaration, replacing the fields enclosed by brackets "[]" with your own
+identifying information. (Don't include the brackets!) Enclose the text in the appropriate comment syntax for the file format. We also
+recommend that you include a file or class name and description of purpose on the same "printed page" as the copyright notice for easier
identification within third-party archives.
:::text
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org
Re: svn commit: r1889063 -
/infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
Posted by Mark Thomas <ma...@apache.org>.
On 21/04/2021 22:40, Andrew Wetmore wrote:
> Huh: I don't know how to get back to editing the wrapper page I just
> edited. When I click on the CMS bug, I just get the license itself, not
> the text around it.
There should be a bread crumb trial in the top-right that looks
something like:
... >> trunk >> content >> licenses >> LICENSE-2.0.txt
Click on "licenses" to get a directory listing and then
"LICENSE-2.0.mdtext" to get back to the file in question.
HTH,
Mark
>
> a
>
> On Wed, Apr 21, 2021 at 3:00 PM Mark Thomas <markt@apache.org
> <ma...@apache.org>> wrote:
>
> Using explicit cc to ensure Andrew sees this.
>
> On 21/04/2021 15:32, Justin Mclean wrote:
> > Hi,
> >
> >> # How to apply the Apache License to your work # {#apply}
> >>
> >> -You should include a copy of the Apache License, typically in a
> file called
> >> -LICENSE, in your work, and consider also including a NOTICE file.
> >> +Include a copy of the Apache License, typically in a file called
> >> +LICENSE, in your work, and consider also including a NOTICE
> file that references the License.
> >
> > I’m not sure that actually correct, that is not the purpose of
> the NOTICE file.
>
> +1. If we want to add some text maybe something like:
>
> "... a NOTICE file as described in section 4 of the License."
>
> Mark
>
>
>
> --
> Andrew Wetmore
> Technical Writer-Editor
> Infra
> *Apache Software Foundation*
> andreww@apache.org <ma...@apache.org>
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org
Re: svn commit: r1889063 - /infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
Posted by Andrew Wetmore <an...@apache.org>.
Huh: I don't know how to get back to editing the wrapper page I just
edited. When I click on the CMS bug, I just get the license itself, not the
text around it.
a
On Wed, Apr 21, 2021 at 3:00 PM Mark Thomas <ma...@apache.org> wrote:
> Using explicit cc to ensure Andrew sees this.
>
> On 21/04/2021 15:32, Justin Mclean wrote:
> > Hi,
> >
> >> # How to apply the Apache License to your work # {#apply}
> >>
> >> -You should include a copy of the Apache License, typically in a file
> called
> >> -LICENSE, in your work, and consider also including a NOTICE file.
> >> +Include a copy of the Apache License, typically in a file called
> >> +LICENSE, in your work, and consider also including a NOTICE file that
> references the License.
> >
> > I’m not sure that actually correct, that is not the purpose of the
> NOTICE file.
>
> +1. If we want to add some text maybe something like:
>
> "... a NOTICE file as described in section 4 of the License."
>
> Mark
>
--
Andrew Wetmore
Technical Writer-Editor
Infra
*Apache Software Foundation*
andreww@apache.org
Re: svn commit: r1889063 -
/infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
Posted by Mark Thomas <ma...@apache.org>.
Using explicit cc to ensure Andrew sees this.
On 21/04/2021 15:32, Justin Mclean wrote:
> Hi,
>
>> # How to apply the Apache License to your work # {#apply}
>>
>> -You should include a copy of the Apache License, typically in a file called
>> -LICENSE, in your work, and consider also including a NOTICE file.
>> +Include a copy of the Apache License, typically in a file called
>> +LICENSE, in your work, and consider also including a NOTICE file that references the License.
>
> I’m not sure that actually correct, that is not the purpose of the NOTICE file.
+1. If we want to add some text maybe something like:
"... a NOTICE file as described in section 4 of the License."
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org
Re: svn commit: r1889063 -
/infrastructure/site/trunk/content/licenses/LICENSE-2.0.mdtext
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> # How to apply the Apache License to your work # {#apply}
>
> -You should include a copy of the Apache License, typically in a file called
> -LICENSE, in your work, and consider also including a NOTICE file.
> +Include a copy of the Apache License, typically in a file called
> +LICENSE, in your work, and consider also including a NOTICE file that references the License.
I’m not sure that actually correct, that is not the purpose of the NOTICE file.
Thanks,
Justin
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org