incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1237602 - in /incubator/public/trunk: site-author/guides/names.xml site-publish/guides/names.html
Date Mon, 30 Jan 2012 11:10:48 GMT
Author: jukka
Date: Mon Jan 30 11:10:47 2012
New Revision: 1237602

URL: http://svn.apache.org/viewvc?rev=1237602&view=rev
Log:
Remove the extra "Basics" level of nesting from within "Introduction". Some indenting.

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=1237602&r1=1237601&r2=1237602&view=diff
==============================================================================
--- incubator/public/trunk/site-author/guides/names.xml [utf-8] (original)
+++ incubator/public/trunk/site-author/guides/names.xml [utf-8] Mon Jan 30 11:10:47 2012
@@ -19,48 +19,44 @@ limitations under the License.
     <link href="http://purl.org/DC/elements/1.0/" rel="schema.DC"/>
   </properties>
   <body>
-  <section>
-    <title>Podling Name Search Guide</title>
-    <ul>
-      <li>
-        <a href="#intro">Introduction</a>
-        <ul>
-          <li>
-            <a href="#basics">The Basics</a>
-            <ul>
-              <li><a href="#meet-the-team">Meet The Apache Branding Team</a></li>
-              <li><a href="#trademarks">Trademarks</a></li>
-              <li><a href="#alv2">Trademarks And The Apache License</a></li>
-            </ul>
-          </li>
-          <li><a href="#naming-hints">What Makes A Name Good</a></li>
-          <li><a href="#name-search">Podling Suitable Name Search</a></li>
-        </ul>
-      </li>
-      <li>
-        <a href="#search">Conducting A Suitable Name Search</a>
-        <ul>
-          <li>
-            <a href="#elimination">Eliminate Unsuitable Names</a>
-            <ul>
-              <li><a href="#main-sequence">The Main Sequence</a></li>
-              <li><a href="#ethical-suitability">Appropriateness</a></li>
-              <li><a href="#uniqueness-what-and-why">Unique Enough Names</a></li>
-              <li>
-                <a href="#uniqueness-how-to">How To Collect Evidence Of Uniqueness</a>
-                <ul>
-                  <li><a href="#evidence-oss">Evidence Of Open Source Adoption</a></li>
-                  <li><a href="#evidence-registration">Evidence Of Registration</a></li>
-                  <li><a href="#evidence-web">Evidence Of Use On The World Wide
Web</a></li>
-                </ul>
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </li>
-    </ul>
-  </section>
-  <section id='intro'>
+    <section>
+      <title>Podling Name Search Guide</title>
+      <ul>
+        <li>
+          <a href="#intro">Introduction</a>
+          <ul>
+            <li><a href="#meet-the-team">Meet The Apache Branding Team</a></li>
+            <li><a href="#trademarks">Trademarks</a></li>
+            <li><a href="#alv2">Trademarks And The Apache License</a></li>
+            <li><a href="#naming-hints">What Makes A Name Good</a></li>
+            <li><a href="#name-search">Podling Suitable Name Search</a></li>
+          </ul>
+        </li>
+        <li>
+          <a href="#search">Conducting A Suitable Name Search</a>
+          <ul>
+            <li>
+              <a href="#elimination">Eliminate Unsuitable Names</a>
+              <ul>
+                <li><a href="#main-sequence">The Main Sequence</a></li>
+                <li><a href="#ethical-suitability">Appropriateness</a></li>
+                <li><a href="#uniqueness-what-and-why">Unique Enough Names</a></li>
+                <li>
+                  <a href="#uniqueness-how-to">How To Collect Evidence Of Uniqueness</a>
+                  <ul>
+                    <li><a href="#evidence-oss">Evidence Of Open Source Adoption</a></li>
+                    <li><a href="#evidence-registration">Evidence Of Registration</a></li>
+                    <li><a href="#evidence-web">Evidence Of Use On The World
Wide Web</a></li>
+                  </ul>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </li>
+      </ul>
+    </section>
+
+    <section id='intro'>
   <title>Introduction</title>
   <p>
   This guide is <strong>not</strong> <em>legal advice</em> or <em>legal
opinion</em>: 
@@ -74,9 +70,7 @@ limitations under the License.
   why this road isn't right for your podling, 
   consult <a href='http://mail-archives.apache.org/mod_mbox/incubator-general/'>incubator
general</a>.
   </p>
-    <section id="basics">
-  	<title>The Basics</title>
-	<section id="meet-the-team">
+      <section id="meet-the-team">
 	<title>Meet The Apache Branding Team</title>
 <p>
 Names <a href='http://www.apache.org/foundation/marks/#whoweare'>fall</a> within
the responsibilities of the 
@@ -90,8 +84,8 @@ Names <a href='http://www.apache.org/fou
   	  	<p>For podlings in the Incubator, naming issues are managed co-operatively by
the Brand and Incubator communities.
 Rules for podlings include all branding requirements for PMCs, plus a few extras. 
   	</p>
-  	</section>
-  	<section id="trademarks">
+      </section>
+      <section id="trademarks">
         <title>Trademarks</title>
   	<p>
 Trademark law is a complex subject. 
@@ -115,9 +109,9 @@ Please read:
   	</a> by Tiki Dare and Harvey Anderson
   	  in the <a href='http://www.ifosslr.org/'>International Free and Open Source Software
Law Review</a>.</li>
   	</ul>
-  	</section>
-  	
-  	<section id="alv2">
+      </section>
+
+      <section id="alv2">
                 <title>Trademarks And The Apache License</title>
   		<p>
 Like <a href='http://www.ifosslr.org/ifosslr/article/view/11/37'>many</a> 
@@ -144,10 +138,9 @@ beyond the Apache License. This allows A
 <a href='http://www.apache.org/foundation/'>Foundation</a>, within the broader
 framework provided by the Brand team.
             </p>
-  	</section>
-  </section>
-  
-  <section id='naming-hints'>
+      </section>
+
+      <section id='naming-hints'>
   <title>What Makes A Name Good</title>
   <p>Good names for commercial products or <code>UNIX</code> utilities
have tended to work less well here at Apache.
   Many successful Apache project names are memorable, unusual and a little 
@@ -155,8 +148,8 @@ framework provided by the Brand team.
   These qualities also happen to be useful when it comes to securing trademark protection.
   Have fun. Be creative.
   </p>
-  </section>
-  <section id="name-search">
+      </section>
+      <section id="name-search">
   <title>Podling Suitable Name Search</title>
   <p>
 The initial <a href='http://incubator.apache.org/guides/proposal.html'>proposal</a>

@@ -188,8 +181,8 @@ Switching names wastes the efforts put i
 Therefore complete this task as soon as possible.
 </p>
   
-  </section>
-  </section>
+      </section>
+    </section>
 
   <section id='search'>
   <title>Conducting A Suitable Name Search</title>

Modified: incubator/public/trunk/site-publish/guides/names.html
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-publish/guides/names.html?rev=1237602&r1=1237601&r2=1237602&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/guides/names.html [utf-8] (original)
+++ incubator/public/trunk/site-publish/guides/names.html [utf-8] Mon Jan 30 11:10:47 2012
@@ -125,43 +125,38 @@ href="http://wiki.apache.org/incubator">
             <h2><img src="../images/redarrow.gif" />Podling Name Search Guide</h2>
 <div class="section-content">
 <ul>
-      <li>
-        <a href="#intro">Introduction</a>
-        <ul>
-          <li>
-            <a href="#basics">The Basics</a>
-            <ul>
-              <li><a href="#meet-the-team">Meet The Apache Branding Team</a></li>
-              <li><a href="#trademarks">Trademarks</a></li>
-              <li><a href="#alv2">Trademarks And The Apache License</a></li>
-            </ul>
-          </li>
-          <li><a href="#naming-hints">What Makes A Name Good</a></li>
-          <li><a href="#name-search">Podling Suitable Name Search</a></li>
-        </ul>
-      </li>
-      <li>
-        <a href="#search">Conducting A Suitable Name Search</a>
-        <ul>
-          <li>
-            <a href="#elimination">Eliminate Unsuitable Names</a>
-            <ul>
-              <li><a href="#main-sequence">The Main Sequence</a></li>
-              <li><a href="#ethical-suitability">Appropriateness</a></li>
-              <li><a href="#uniqueness-what-and-why">Unique Enough Names</a></li>
-              <li>
-                <a href="#uniqueness-how-to">How To Collect Evidence Of Uniqueness</a>
-                <ul>
-                  <li><a href="#evidence-oss">Evidence Of Open Source Adoption</a></li>
-                  <li><a href="#evidence-registration">Evidence Of Registration</a></li>
-                  <li><a href="#evidence-web">Evidence Of Use On The World Wide
Web</a></li>
-                </ul>
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </li>
-    </ul>
+        <li>
+          <a href="#intro">Introduction</a>
+          <ul>
+            <li><a href="#meet-the-team">Meet The Apache Branding Team</a></li>
+            <li><a href="#trademarks">Trademarks</a></li>
+            <li><a href="#alv2">Trademarks And The Apache License</a></li>
+            <li><a href="#naming-hints">What Makes A Name Good</a></li>
+            <li><a href="#name-search">Podling Suitable Name Search</a></li>
+          </ul>
+        </li>
+        <li>
+          <a href="#search">Conducting A Suitable Name Search</a>
+          <ul>
+            <li>
+              <a href="#elimination">Eliminate Unsuitable Names</a>
+              <ul>
+                <li><a href="#main-sequence">The Main Sequence</a></li>
+                <li><a href="#ethical-suitability">Appropriateness</a></li>
+                <li><a href="#uniqueness-what-and-why">Unique Enough Names</a></li>
+                <li>
+                  <a href="#uniqueness-how-to">How To Collect Evidence Of Uniqueness</a>
+                  <ul>
+                    <li><a href="#evidence-oss">Evidence Of Open Source Adoption</a></li>
+                    <li><a href="#evidence-registration">Evidence Of Registration</a></li>
+                    <li><a href="#evidence-web">Evidence Of Use On The World
Wide Web</a></li>
+                  </ul>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </li>
+      </ul>
 </div>
         <h2 id='intro'><img src="../images/redarrow.gif" />Introduction</h2>
 <div class="section-content">
@@ -178,9 +173,7 @@ href="http://wiki.apache.org/incubator">
   why this road isn't right for your podling, 
   consult <a href="http://mail-archives.apache.org/mod_mbox/incubator-general/">incubator
general</a>.
   </p>
-<h3 id='basics'>The Basics</h3>
-<div class="section-content">
-<h4 id='meet-the-team'>Meet The Apache Branding Team</h4>
+<h3 id='meet-the-team'>Meet The Apache Branding Team</h3>
 <div class="section-content">
 <p>
 Names <a href="http://www.apache.org/foundation/marks/#whoweare">fall</a> within
the responsibilities of the 
@@ -195,7 +188,7 @@ Names <a href="http://www.apache.org/fou
 Rules for podlings include all branding requirements for PMCs, plus a few extras. 
   	</p>
 </div>
-<h4 id='trademarks'>Trademarks</h4>
+<h3 id='trademarks'>Trademarks</h3>
 <div class="section-content">
 <p>
 Trademark law is a complex subject. 
@@ -221,7 +214,7 @@ Please read:
   	  in the <a href="http://www.ifosslr.org/">International Free and Open Source Software
Law Review</a>.</li>
   	</ul>
 </div>
-<h4 id='alv2'>Trademarks And The Apache License</h4>
+<h3 id='alv2'>Trademarks And The Apache License</h3>
 <div class="section-content">
 <p>
 Like <a href="http://www.ifosslr.org/ifosslr/article/view/11/37">many</a> 
@@ -249,7 +242,6 @@ beyond the Apache License. This allows A
 framework provided by the Brand team.
             </p>
 </div>
-</div>
 <h3 id='naming-hints'>What Makes A Name Good</h3>
 <div class="section-content">
 <p>Good names for commercial products or <code>UNIX</code> utilities have
tended to work less well here at Apache.



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


Mime
View raw message