incremental changes to own section, protosection on patents

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34408 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 26 insertions, 14 deletions

diff --git a/docs/DeveloperPolicy.html b/docs/DeveloperPolicy.html
index e3e37f0bc1..9bc6446a12 100644
--- a/docs/DeveloperPolicy.html
+++ b/docs/DeveloperPolicy.html
@@ -10,7 +10,7 @@
 <div class="doc_title">LLVM Developer Policy</div>
 <ol>
   <li><a href="#introduction">Introduction</a></li>
-  <li><a href="#general">General Policies</a>
+  <li><a href="#policies">Developer Policies</a>
   <ol>
     <li><a href="#informed">Stay Informed</a></li>
     <li><a href="#patches">Making a Patch</a></li>
@@ -18,16 +18,15 @@
     <li><a href="#testcases">Test Cases</a></li>
     <li><a href="#quality">Quality</a></li>
     <li><a href="#commitaccess">Obtaining Commit Access</a></li>
-    <li><a href="#newwork">Making a Major Change</a>
-    <ol>
-      <li><a href="#incremental">Incremental Development</a></li>
-    </ol></li>
+    <li><a href="#newwork">Making a Major Change</a></li>
+    <li><a href="#incremental">Incremental Development</a></li>
     <li><a href="#attribution">Attribution of Changes</a></li>
   </ol></li>
   <li><a href="#candl">Copyright and License</a>
   <ol>
     <li><a href="#copyright">Copyright</a></li>
     <li><a href="#license">License</a></li>
+    <li><a href="#patents">Patents</a></li>
     <li><a href="#devagree">Developer Agreements</a></li>
   </ol></li>
 </ol>
@@ -59,7 +58,7 @@
 </div>
 
 <!--=========================================================================-->
-<div class="doc_section"><a name="general">General Policies</a></div>
+<div class="doc_section"><a name="policies">Developer Policies</a></div>
 <!--=========================================================================-->
 <div class="doc_text">
   <p>This section contains policies that pertain generally to regular LLVM
@@ -103,16 +102,13 @@
         
     <li>Patches should be made with this command:
     <pre>cvs diff -Ntdup -5</pre>
-     or with the utility <tt>utils/mkpatch</tt>. to make it easy to read the
+     or with the utility <tt>utils/mkpatch</tt>, which makes it easy to read the
      diff.</li>
      
     <li>Patches should not include differences in generated code such as the
     code generated by <tt>flex</tt>, <tt>bison</tt> or <tt>tblgen</tt>. The
     <tt>utils/mkpatch</tt> utility takes care of this for you.</li>
     
-    <li>Contributions must not knowingly infringe on any patents. To the best of
-    our knowledge, LLVM is free of any existing patent violations and it is our
-    intent to keep it that way.</li>
   </ol>
 </div>
 
@@ -265,15 +261,20 @@ quality patches.  If you would like commit access, please send an email to the
   a major new extension, it is a good idea to get consensus with the development
   community before you start working on it.</p>
   
+  <p>Once the design of the new feature is finalized, the work itself should be
+     done as a series of <a href="#incremental">incremental changes</a>, not as
+     a long-term development branch.</p>
+     
 </div>
 
 <!-- _______________________________________________________________________ -->
-<div class="doc_subsubsection"> <a name="incremental">Incremental Development</a>
+<div class="doc_subsection"> <a name="incremental">Incremental Development</a>
 </div>
 <div class="doc_text">
-  <p>Once the design of the new feature is finalized, the work itself should be
-     done as a series of incremental changes, not as a long-term development
-     branch.  Long-term development branches have a number of drawbacks:</p>
+  <p>In the LLVM project, we do all significant changes as a series of
+     incremental patches.  We have a strong dislike for huge changes or
+     long-term development branches.  Long-term development branches have a
+     number of drawbacks:</p>
      
    <ol>
    <li>Branches must have mainline merged into them periodically.  If the branch
@@ -436,6 +437,17 @@ Changes</a></div>
     href="mailto:llvm-oversight@cs.uiuc.edu">LLVM Oversight Group</a>.</p>
 
 </div>
+
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsection"><a name="patents">Patents</a></div>
+<div class="doc_text">
+
+<p>Contributions must not knowingly infringe on any patents. To the best of
+    our knowledge, LLVM is free of any existing patent violations and it is our
+    intent to keep it that way.</p>
+</div>
+
+
 <!-- _______________________________________________________________________ -->
 <div class="doc_subsection"><a name="devagree">Developer Agreements</a></div>
 <div class="doc_text">