incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r805998 - in /incubator/public/trunk: site-author/guides/releasemanagement.xml site-publish/guides/releasemanagement.html
Date Wed, 19 Aug 2009 22:23:53 GMT
Author: joes
Date: Wed Aug 19 22:23:53 2009
New Revision: 805998

URL: http://svn.apache.org/viewvc?rev=805998&view=rev
Log:
Apply Ted Leung's rewording of this section.
Thanks Ted!

Modified:
    incubator/public/trunk/site-author/guides/releasemanagement.xml
    incubator/public/trunk/site-publish/guides/releasemanagement.html

Modified: incubator/public/trunk/site-author/guides/releasemanagement.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-author/guides/releasemanagement.xml?rev=805998&r1=805997&r2=805998&view=diff
==============================================================================
--- incubator/public/trunk/site-author/guides/releasemanagement.xml [utf-8] (original)
+++ incubator/public/trunk/site-author/guides/releasemanagement.xml [utf-8] Wed Aug 19 22:23:53
2009
@@ -943,14 +943,13 @@
 which are not Apache Licensed.
         	</p>
         	<p>
-The artifacts and documents to which each subsidiary clause applies should be 
-indicated in the LICENSE document. This <a href='examples/LICENSE'>LICENSE</a>
-(courtesy of <a href='http://httpd.apache.org'>Apache HTTPD</a>) is a
-good example. The Apache License is at the top of the LICENSE document. The
-explanation is clear and the files to which the licenses apply are clearly noted.
-In short, all the licenses on all the files to be included within the package
+All the licenses on all the files to be included within the package
 should be included, or at a minimum referenced (discouraged but acceptable for now),
-in the LICENSE document.
+in the LICENSE document.  This <a href='examples/LICENSE'>LICENSE</a>
+(courtesy of <a href='http://httpd.apache.org'>Apache HTTPD</a>) is a
+good example. The Apache License is at the top of the LICENSE document.
+After that, the license for each non-Apache licensed component is included,
+along with a clear explanation of which files that license applies to.
         	</p>
                 <p>
 The NOTICE document is for additional copyright and attribution statements those

Modified: incubator/public/trunk/site-publish/guides/releasemanagement.html
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-publish/guides/releasemanagement.html?rev=805998&r1=805997&r2=805998&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/guides/releasemanagement.html [utf-8] (original)
+++ incubator/public/trunk/site-publish/guides/releasemanagement.html [utf-8] Wed Aug 19 22:23:53
2009
@@ -1648,14 +1648,13 @@
 which are not Apache Licensed.
         	</p>
 <p>
-The artifacts and documents to which each subsidiary clause applies should be 
-indicated in the LICENSE document. This <a href="examples/LICENSE">LICENSE</a>
-(courtesy of <a href="http://httpd.apache.org">Apache HTTPD</a>) is a
-good example. The Apache License is at the top of the LICENSE document. The
-explanation is clear and the files to which the licenses apply are clearly noted.
-In short, all the licenses on all the files to be included within the package
+All the licenses on all the files to be included within the package
 should be included, or at a minimum referenced (discouraged but acceptable for now),
-in the LICENSE document.
+in the LICENSE document.  This <a href="examples/LICENSE">LICENSE</a>
+(courtesy of <a href="http://httpd.apache.org">Apache HTTPD</a>) is a
+good example. The Apache License is at the top of the LICENSE document.
+After that, the license for each non-Apache licensed component is included,
+along with a clear explanation of which files that license applies to.
         	</p>
 <p>
 The NOTICE document is for additional copyright and attribution statements those



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message