X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=docs%2FDeveloperPolicy.html;h=144c55ac0d8a3ca7b4e1981a461f45993355ff8e;hb=34b176a1817418c59cac6dc411788b37d6d28f31;hp=18c1ff34ac273e6aa53550bc1aff69be0a932b44;hpb=ab2b10c3a998d11756c144d7c961cbb19dd83288;p=oota-llvm.git

diff --git a/docs/DeveloperPolicy.html b/docs/DeveloperPolicy.html
index 18c1ff34ac2..144c55ac0d8 100644
--- a/docs/DeveloperPolicy.html
+++ b/docs/DeveloperPolicy.html
@@ -458,7 +458,7 @@ Changes</a></div>
   
   <p>
   Although UIUC may eventually reassign the copyright of the software to another
-  entity (e.g. a dedicated non-profit "LLVM Organization", or something)
+  entity (e.g. a dedicated non-profit "LLVM Organization")
   the intent for the project is to always have a single entity hold the
   copyrights to LLVM at any given time.</p>
   
@@ -467,6 +467,7 @@ Changes</a></div>
   reduces the managerial burden for any kind of administrative or technical 
   decisions about LLVM.  The goal of the LLVM project is to always keep the code
   open and <a href="#license">licensed under a very liberal license</a>.</p>
+
 </div>
 
 <!-- _______________________________________________________________________ -->
@@ -480,7 +481,8 @@ Changes</a></div>
   <ul>
     <li>You can freely distribute LLVM.</li>
     <li>You must retain the copyright notice if you redistribute LLVM.</li>
-    <li>Binaries derived from LLVM must reproduce the copyright notice.</li>
+    <li>Binaries derived from LLVM must reproduce the copyright notice (e.g. 
+        in an included readme file).</li>
     <li>You can't use our names to promote your LLVM derived products.</li>
     <li>There's no warranty on LLVM at all.</li>
   </ul>
@@ -520,9 +522,11 @@ Changes</a></div>
    arbitrary purposes (including commercial use).</p>
    
 <p>When contributing code, we expect contributors to notify us of any potential
-   for patent-related trouble with their changes.  If you own the rights to a
+   for patent-related trouble with their changes.  If you or your employer
+   own the rights to a
    patent and would like to contribute code to LLVM that relies on it, we
-   require that you sign an agreement that allows any other user of LLVM to
+   require that
+   the copyright owner sign an agreement that allows any other user of LLVM to
    freely use your patent.  Please contact the <a 
    href="mailto:llvm-oversight@cs.uiuc.edu">oversight group</a> for more
    details.</p>
@@ -537,6 +541,11 @@ Changes</a></div>
   the entire software base can be managed by a single copyright holder.  This
   implies that any contributions can be licensed under the license that the
   project uses.</p>
+
+  <p>When contributing code, you also affirm that you are legally entitled to 
+  grant this copyright, personally or on behalf of your employer.  If the code
+  belongs to some other entity, please raise this issue with the oversight
+  group before the code is committed.</p>
 </div>
 
 <!-- *********************************************************************** -->