incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r806321 - in /incubator/public/trunk: site-author/guides/releasemanagement.xml site-publish/guides/releasemanagement.html
Date Thu, 20 Aug 2009 19:36:35 GMT
Author: joes
Date: Thu Aug 20 19:36:34 2009
New Revision: 806321

URL: http://svn.apache.org/viewvc?rev=806321&view=rev
Log:
incorporate ant elder's remarks

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=806321&r1=806320&r2=806321&view=diff
==============================================================================
--- incubator/public/trunk/site-author/guides/releasemanagement.xml [utf-8] (original)
+++ incubator/public/trunk/site-author/guides/releasemanagement.xml [utf-8] Thu Aug 20 19:36:34
2009
@@ -940,12 +940,12 @@
         <section id='best-practice-license'><title>LICENSE and NOTICE</title>
         	<p>
 Apache projects may distribute artifacts and documents as part of a release
-which are not Apache Licensed.
+which are not Apache Licensed.  All such artifacts must comply with Apache's
+<a href='http://www.apache.org/legal/resolved.html'>3rd party licensing policy</a>.
         	</p>
         	<p>
-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.  This <a href='examples/LICENSE'>LICENSE</a>
+All the licenses on all the files to be included within a package
+should be included 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,
@@ -953,7 +953,7 @@
         	</p>
                 <p>
 The NOTICE document is for additional copyright and attribution statements those
-licenses may require.  A typical NOTICE document at a minimum includes a Copyright
+licenses may require.  A typical NOTICE document at a minimum includes a copyright
 and attribution statement for The Apache Software Foundation.  Nothing else
 belongs in the NOTICE document.  See <a href="http://www.apache.org/legal/src-headers.html#notice">
 this document</a> for the typical example.

Modified: incubator/public/trunk/site-publish/guides/releasemanagement.html
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-publish/guides/releasemanagement.html?rev=806321&r1=806320&r2=806321&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/guides/releasemanagement.html [utf-8] (original)
+++ incubator/public/trunk/site-publish/guides/releasemanagement.html [utf-8] Thu Aug 20 19:36:34
2009
@@ -1645,12 +1645,12 @@
 <div class="section-content">
 <p>
 Apache projects may distribute artifacts and documents as part of a release
-which are not Apache Licensed.
+which are not Apache Licensed.  All such artifacts must comply with Apache's
+<a href="http://www.apache.org/legal/resolved.html">3rd party licensing policy</a>.
         	</p>
 <p>
-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.  This <a href="examples/LICENSE">LICENSE</a>
+All the licenses on all the files to be included within a package
+should be included 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,
@@ -1658,7 +1658,7 @@
         	</p>
 <p>
 The NOTICE document is for additional copyright and attribution statements those
-licenses may require.  A typical NOTICE document at a minimum includes a Copyright
+licenses may require.  A typical NOTICE document at a minimum includes a copyright
 and attribution statement for The Apache Software Foundation.  Nothing else
 belongs in the NOTICE document.  See <a href="http://www.apache.org/legal/src-headers.html#notice">
 this document</a> for the typical example.



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


Mime
View raw message