aboutsummaryrefslogtreecommitdiff
path: root/docs/DeveloperPolicy.html
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2008-05-22 03:06:14 +0000
committerChris Lattner <sabre@nondot.org>2008-05-22 03:06:14 +0000
commit64a4c11e2fe39624353a8f1789c5d9b635fe7272 (patch)
tree740fd0d1b433b1134919228e6f8ea0fc0182f6d2 /docs/DeveloperPolicy.html
parent29d929363d9b8a2c0d40c5d50fec022c736cb654 (diff)
minor edits
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@51405 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'docs/DeveloperPolicy.html')
-rw-r--r--docs/DeveloperPolicy.html16
1 files changed, 9 insertions, 7 deletions
diff --git a/docs/DeveloperPolicy.html b/docs/DeveloperPolicy.html
index ab985b565b..144c55ac0d 100644
--- a/docs/DeveloperPolicy.html
+++ b/docs/DeveloperPolicy.html
@@ -468,11 +468,6 @@ Changes</a></div>
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>
- <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>
<!-- _______________________________________________________________________ -->
@@ -527,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>
@@ -544,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>
<!-- *********************************************************************** -->