incubator-cvs mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1202346&view=rev
Log:
Move some material around

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=1202346&r1=1202345&r2=1202346&view=diff
==============================================================================
--- incubator/public/trunk/site-author/guides/names.xml [utf-8] (original)
+++ incubator/public/trunk/site-author/guides/names.xml [utf-8] Tue Nov 15 18:13:07 2011
@@ -45,7 +45,10 @@ Please remember that rules for podlings 
 Trademark law is a complex subject. 
 Distinctive differences from other intellectual property laws (such as patent or copyright)
mean that 
 intuition or knowledge gained from other areas may not be applicable. 
-Developing some understanding of the basic principles is therefore important.
+The <a href='http://www.apache.org/foundation'>Apache Software Foundation</a>
is 
+a <a href='http://www.apache.org/foundation/faq.html#is-ASF-a-corporation'>US corporation</a>.

+Developing some understanding of the basic principles of US trademark law is therefore important.
+	</p><p>
 Please read
   	</p>
   	<ul>
@@ -57,11 +60,6 @@ Please read
   		</ul></li>
   	<li><a href='http://en.wikibooks.org/wiki/US_Trademark_Law'>US Trademark Law</a>
WikiBook</li>
   	</ul>
-  	<p>
-The <a href='http://www.apache.org/foundation'>Apache Software Foundation</a>
is 
-a <a href='http://www.apache.org/foundation/faq.html#is-ASF-a-corporation'>US corporation</a>.

-So, US trademark law is most important.
-  	</p>
   	</section>
   </section>
   
@@ -97,7 +95,7 @@ We call this process our 
 A suitable name search must be completed before a podling can graduate. 
 The name proposed when the podling enters the Incubator is provisional. 
 Names are an essential part of building a brand and community. 
-Switching names wastes the efforts put into esetablishing the original name.
+Switching names wastes the efforts put into establishing the original name.
 So, it's in the best interests of the community to complete this task ideally as soon as
possible after entering the Incubator.
 </p>
   

Modified: incubator/public/trunk/site-publish/guides/names.html
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-publish/guides/names.html?rev=1202346&r1=1202345&r2=1202346&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/guides/names.html [utf-8] (original)
+++ incubator/public/trunk/site-publish/guides/names.html [utf-8] Tue Nov 15 18:13:07 2011
@@ -147,7 +147,11 @@ Please remember that rules for podlings 
 Trademark law is a complex subject. 
 Distinctive differences from other intellectual property laws (such as patent or copyright)
mean that 
 intuition or knowledge gained from other areas may not be applicable. 
-Developing some understanding of the basic principles is therefore important.
+The <a href="http://www.apache.org/foundation">Apache Software Foundation</a>
is 
+a <a href="http://www.apache.org/foundation/faq.html#is-ASF-a-corporation">US corporation</a>.

+Developing some understanding of the basic principles of US trademark law is therefore important.
+	</p>
+<p>
 Please read
   	</p>
 <ul>
@@ -159,11 +163,6 @@ Please read
   		</ul></li>
   	<li><a href="http://en.wikibooks.org/wiki/US_Trademark_Law">US Trademark Law</a>
WikiBook</li>
   	</ul>
-<p>
-The <a href="http://www.apache.org/foundation">Apache Software Foundation</a>
is 
-a <a href="http://www.apache.org/foundation/faq.html#is-ASF-a-corporation">US corporation</a>.

-So, US trademark law is most important.
-  	</p>
 </div>
 </div>
 <h3 id='naming-hints'>What Makes A Name Good</h3>
@@ -196,7 +195,7 @@ We call this process our 
 A suitable name search must be completed before a podling can graduate. 
 The name proposed when the podling enters the Incubator is provisional. 
 Names are an essential part of building a brand and community. 
-Switching names wastes the efforts put into esetablishing the original name.
+Switching names wastes the efforts put into establishing the original name.
 So, it's in the best interests of the community to complete this task ideally as soon as
possible after entering the Incubator.
 </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