incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1160535 - in /incubator/public/trunk: site-author/guides/branding.xml site-publish/guides/branding.html
Date Tue, 23 Aug 2011 03:11:55 GMT
Author: sebb
Date: Tue Aug 23 03:11:55 2011
New Revision: 1160535

URL: http://svn.apache.org/viewvc?rev=1160535&view=rev
Log:
Clarify disclaimer text

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

Modified: incubator/public/trunk/site-author/guides/branding.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-author/guides/branding.xml?rev=1160535&r1=1160534&r2=1160535&view=diff
==============================================================================
--- incubator/public/trunk/site-author/guides/branding.xml [utf-8] (original)
+++ incubator/public/trunk/site-author/guides/branding.xml [utf-8] Tue Aug 23 03:11:55 2011
@@ -87,11 +87,11 @@ limitations under the License.
     <p>Podling web sites MUST include a clear disclaimer on their
     website and in all documentation (including releases) stating that
     they are in incubation. Podlings SHOULD use the following text for
-    all disclaimers:</p>
+    all disclaimers (replace the underlined phrases as appropriate):</p>
   
-    <blockquote><i>Apache &quot;Podling-Name&quot;</i> is an effort
+    <blockquote>Apache <i><u>Podling-Name</u></i> is an effort
     undergoing incubation at The Apache Software Foundation (ASF),
-    sponsored by the <i>name of sponsor</i>. Incubation is required of all
+    sponsored by the <i><u>name of Apache TLP sponsor</u></i>. Incubation
is required of all
     newly accepted projects until a further review indicates that the
     infrastructure, communications, and decision making process have
     stabilized in a manner consistent with other successful ASF projects.
@@ -101,6 +101,9 @@ limitations under the License.
 
     <p>Podlings wishing to use a different disclaimer message MUST have the
     disclaimer approved by the Incubator PMC prior to use.</p>
+
+    <p>For releases, the text SHOULD be included in a separate DISCLAIMER file
+    stored alongside the NOTICE and LICENSE files.</p>
   </section>
 
   <section id='logos'><title>Incubator Logo</title>

Modified: incubator/public/trunk/site-publish/guides/branding.html
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-publish/guides/branding.html?rev=1160535&r1=1160534&r2=1160535&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/guides/branding.html [utf-8] (original)
+++ incubator/public/trunk/site-publish/guides/branding.html [utf-8] Tue Aug 23 03:11:55 2011
@@ -177,10 +177,10 @@ href="http://wiki.apache.org/incubator">
 <p>Podling web sites MUST include a clear disclaimer on their
     website and in all documentation (including releases) stating that
     they are in incubation. Podlings SHOULD use the following text for
-    all disclaimers:</p>
-<blockquote><i>Apache "Podling-Name"</i> is an effort
+    all disclaimers (replace the underlined phrases as appropriate):</p>
+<blockquote>Apache <i><u>Podling-Name</u></i> is an effort
     undergoing incubation at The Apache Software Foundation (ASF),
-    sponsored by the <i>name of sponsor</i>. Incubation is required of all
+    sponsored by the <i><u>name of Apache TLP sponsor</u></i>. Incubation
is required of all
     newly accepted projects until a further review indicates that the
     infrastructure, communications, and decision making process have
     stabilized in a manner consistent with other successful ASF projects.
@@ -189,6 +189,8 @@ href="http://wiki.apache.org/incubator">
     project has yet to be fully endorsed by the ASF.</blockquote>
 <p>Podlings wishing to use a different disclaimer message MUST have the
     disclaimer approved by the Incubator PMC prior to use.</p>
+<p>For releases, the text SHOULD be included in a separate DISCLAIMER file
+    stored alongside the NOTICE and LICENSE files.</p>
 </div>
            <h2><img src="../images/redarrow.gif" />
    <a name="logos">Incubator Logo</a>



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


Mime
View raw message