incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r506681 - in /incubator/public/trunk: site-author/guides/releasemanagement.xml site-publish/guides/releasemanagement.html
Date Mon, 12 Feb 2007 21:52:30 GMT
Author: rdonkin
Date: Mon Feb 12 13:52:29 2007
New Revision: 506681

URL: http://svn.apache.org/viewvc?view=rev&rev=506681
Log:
Additional explanations about Apache NOTICE document. Based on comments by Cliff posted to
xap-dev.

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?view=diff&rev=506681&r1=506680&r2=506681
==============================================================================
--- incubator/public/trunk/site-author/guides/releasemanagement.xml (original)
+++ incubator/public/trunk/site-author/guides/releasemanagement.xml Mon Feb 12 13:52:29 2007
@@ -214,7 +214,7 @@
                     </li>
                     <li>Check incubator requirements
                     	<ul>
-                    		<li>Check disclaimer is distributed TODO: link</li>
+                    		<li>Check <a href='#notes-disclaimer'>disclaimer</a>
is distributed TODO: link</li>
                     		<li>Check <a href='#best-practice-status'>status document</a></li>
                     	</ul>
                     </li>
@@ -562,12 +562,39 @@
         </section>
         
         <section id='best-practice-notice'><title>NOTICE files</title>
-        	<p>
- TODO: links to infra
-        	</p>
-        	<p>
- Discuss about what's appropriate for NOTICE files. 
-        	</p>
+            <p>
+Read <a href='http://apache.org/legal/src-headers.html#notice'>this</a>.
+The <code>NOTICE</code> is important and serves several purposes. 
+The contents should be included in all downstream redistributions.
+            </p>
+            <p>
+The <code>NOTICE</code> documents copyright notices and other required attributions.
+This must include:
+            </p>
+            <ul>
+                <li>the 
+<a href='http://apache.org/legal/src-headers.html#notice'>standard Apache attribution
and copyright notice</a></li>
+                <li> 
+<a href='http://apache.org/legal/src-headers.html#header-existingcopyright'>inherited</a>

+                copyright and attributions notices</li>
+                <li>all attribution and copyright notices required by licenses for

+ <a href='http://apache.org/legal/src-headers.html#3party'>third party documents</a></li>
+             </ul>
+             <p>
+Every contributor retains the copyright to their contributions and grants Apache only a (generous)
+license for the work. A release is an act of selection by the PMC. Apache holds the copyright
+to the collective work that is the release. The Apache copyright in the <code>NOTICE</code>
+pertains to the collective.
+             </p>
+             <p>
+It is strongly recommended that the <code>NOTICE</code> contains only these legally
+important contents. The <a href='#notes-disclaimer'>incubator disclaimer</a>
is best placed in 
+another document.
+             </p>
+            <p>
+The exact name may be optionally suffixed. For example, both <code>NOTICE</code>

+and <code>NOTICE.txt</code> are fine.
+            </p>
         </section>
         <section id='best-practices-svn'><title>Subversion Best Practices</title>
         	<p>
@@ -755,6 +782,13 @@
         </section>
     </section>
     <section id='notes'><title>Notes</title>
+        <section id='notes-disclaimer'><title>The Incubator Disclaimer</title>
+            <p>
+            TODO: the incubator requires that users are informed that the by
+            including a strandard disclaimer. may be include in README, RELEASE_NOTES
+            DISCLAIMER. It is recommended that it is not included in NOTICES
+            </p>
+        </section>
         <section id='distributing-jars'><title>Distributing Jars</title>
             <p>
             TODO: link to infrastructure

Modified: incubator/public/trunk/site-publish/guides/releasemanagement.html
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-publish/guides/releasemanagement.html?view=diff&rev=506681&r1=506680&r2=506681
==============================================================================
--- incubator/public/trunk/site-publish/guides/releasemanagement.html (original)
+++ incubator/public/trunk/site-publish/guides/releasemanagement.html Mon Feb 12 13:52:29
2007
@@ -314,7 +314,7 @@
                     </li>
                     <li>Check incubator requirements
                     	<ul>
-                    		<li>Check disclaimer is distributed TODO: link</li>
+                    		<li>Check <a href="#notes-disclaimer">disclaimer</a>
is distributed TODO: link</li>
                     		<li>Check <a href="#best-practice-status">status document</a></li>
                     	</ul>
                     </li>
@@ -730,11 +730,38 @@
 </h3>
 <div class="section-content">
 <p>
- TODO: links to infra
-        	</p>
+Read <a href="http://apache.org/legal/src-headers.html#notice">this</a>.
+The <code>NOTICE</code> is important and serves several purposes. 
+The contents should be included in all downstream redistributions.
+            </p>
 <p>
- Discuss about what's appropriate for NOTICE files. 
-        	</p>
+The <code>NOTICE</code> documents copyright notices and other required attributions.
+This must include:
+            </p>
+<ul>
+                <li>the 
+<a href="http://apache.org/legal/src-headers.html#notice">standard Apache attribution
and copyright notice</a></li>
+                <li> 
+<a href="http://apache.org/legal/src-headers.html#header-existingcopyright">inherited</a>

+                copyright and attributions notices</li>
+                <li>all attribution and copyright notices required by licenses for

+ <a href="http://apache.org/legal/src-headers.html#3party">third party documents</a></li>
+             </ul>
+<p>
+Every contributor retains the copyright to their contributions and grants Apache only a (generous)
+license for the work. A release is an act of selection by the PMC. Apache holds the copyright
+to the collective work that is the release. The Apache copyright in the <code>NOTICE</code>
+pertains to the collective.
+             </p>
+<p>
+It is strongly recommended that the <code>NOTICE</code> contains only these legally
+important contents. The <a href="#notes-disclaimer">incubator disclaimer</a>
is best placed in 
+another document.
+             </p>
+<p>
+The exact name may be optionally suffixed. For example, both <code>NOTICE</code>

+and <code>NOTICE.txt</code> are fine.
+            </p>
 </div>
 <h3>
    <a name="best-practices-svn">Subversion Best Practices</a>
@@ -957,6 +984,16 @@
    <a name="notes">Notes</a>
 </h2>
 <div class="section-content">
+<h3>
+   <a name="notes-disclaimer">The Incubator Disclaimer</a>
+</h3>
+<div class="section-content">
+<p>
+            TODO: the incubator requires that users are informed that the by
+            including a strandard disclaimer. may be include in README, RELEASE_NOTES
+            DISCLAIMER. It is recommended that it is not included in NOTICES
+            </p>
+</div>
 <h3>
    <a name="distributing-jars">Distributing Jars</a>
 </h3>



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


Mime
View raw message