incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r1203617 - in /incubator/public/trunk: site-author/guides/names.xml site-publish/guides/names.html
Date Fri, 18 Nov 2011 12:02:15 GMT
Author: rdonkin
Date: Fri Nov 18 12:02:14 2011
New Revision: 1203617

URL: http://svn.apache.org/viewvc?rev=1203617&view=rev
Log:
Improved phrasing.

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

Modified: incubator/public/trunk/site-author/guides/names.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-author/guides/names.xml?rev=1203617&r1=1203616&r2=1203617&view=diff
==============================================================================
--- incubator/public/trunk/site-author/guides/names.xml [utf-8] (original)
+++ incubator/public/trunk/site-author/guides/names.xml [utf-8] Fri Nov 18 12:02:14 2011
@@ -84,7 +84,9 @@ reproducing the content of the NOTICE fi
             <p class='attribution'><a href='http://www.apache.org/licenses/LICENSE-2.0.html#trademarks'>Apache
License, Version 2.0
          	</a></p>
             <p>
-This allows the community to use trademark law to protect its reputation, without the broader
+Copyright and patent rights are granted through the Apache License shared by all projects.

+Trademarks rights are issued and managed independently beyond this license.
+This allows the community to use trademark law to protect its reputation, within the broader
 framework provided by the Brand team for the <a href='http://www.apache.org/foundation/'>Foundation</a>.
             </p>
   	</section>

Modified: incubator/public/trunk/site-publish/guides/names.html
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-publish/guides/names.html?rev=1203617&r1=1203616&r2=1203617&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/guides/names.html [utf-8] (original)
+++ incubator/public/trunk/site-publish/guides/names.html [utf-8] Fri Nov 18 12:02:14 2011
@@ -187,7 +187,9 @@ reproducing the content of the NOTICE fi
 <p class="attribution"><a href="http://www.apache.org/licenses/LICENSE-2.0.html#trademarks">Apache
License, Version 2.0
          	</a></p>
 <p>
-This allows the community to use trademark law to protect its reputation, without the broader
+Copyright and patent rights are granted through the Apache License shared by all projects.

+Trademarks rights are issued and managed independently beyond this license.
+This allows the community to use trademark law to protect its reputation, within the broader
 framework provided by the Brand team for the <a href="http://www.apache.org/foundation/">Foundation</a>.
             </p>
 </div>



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


Mime
View raw message