Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a04886ff4b0d0317bc1a2caa6d093c101ec5c83f..96ba2a40f3837fa4a18007178c1cc315ae689b20 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ When contributing to the Mono project, please follow the [Mono Coding
 Guidelines][1].  We have been using a coding style for many years,
 please make your patches conform to these guidelines.
 
 Guidelines][1].  We have been using a coding style for many years,
 please make your patches conform to these guidelines.
 

-[1] http://www.mono-project.com/community/contributing/coding-guidelines/
+[1]: http://www.mono-project.com/community/contributing/coding-guidelines/

 
 Etiquette
 =========
 
 Etiquette
 =========


@@ -21,29 +21,23 @@ investigate bugs, regressions and problems.
 License
 =======
 
 License
 =======
 

-The Mono project uses the MIT X11, GNU LGPL version 2 and the Apache
-License 2.0.  We also imported some Microsoft code licensed under the
-open source Microsoft Public License.
+The Mono runtime, compilers, and tools and most of the class libraries
+are licensed under the MIT license. But include some bits of code
+licensed under different licenses. The exact list is [available here](https://github.com/mono/mono/blob/master/LICENSE).

 
 Different parts of Mono use different licenses.  The actual details of
 which licenses are used for which parts are detailed on the LICENSE
 file in this directory.
 
 
 Different parts of Mono use different licenses.  The actual details of
 which licenses are used for which parts are detailed on the LICENSE
 file in this directory.
 

-When contributing code, make sure that your contribution falls under
-the appropriate license.  For example, contributions to code licensed
-under MIT/X11 code, should be MIT/X11 code.
+CLA
+=======

 
 

-The runtime (`mono/...`) is a special case.  The code is dual-licensed
-by Xamarin under both the GNU LGPL v2 license and is also available
-under commercial terms.  For the runtime, you should either sign an
-agreement that grants Xamarin the rights to relicense your code under
-other licenses other than the LGPL v2 or your contribution must be
-made as an MIT/X11 license which grants us the same rights, but
-involves no paperwork.  For the latter case, please specify on your
-commit(s) that you are licensing the changes under MIT/X11.
+Contributions are now taken under the [.NET Foundation CLA](https://cla2.dotnetfoundation.org/).

 
 

-For other parts of the project that are dual-licensed, please state
-on your commit(s) what license you are contributing the changes under.
+Code Review
+=======
+We are requiring code reviews before merging a pull request.
+GitHub won't let you merge a PR until someone from the Mono team approves it.

 
 Testing
 =======
 
 Testing
 =======


@@ -68,7 +62,7 @@ status of your pull request. If it succeeded and we like the changes,
 a maintainer will likely merge it. Otherwise, you can amend your pull
 request to fix build breakage and Jenkins will test it again.
 
 a maintainer will likely merge it. Otherwise, you can amend your pull
 request to fix build breakage and Jenkins will test it again.
 

-[2] http://jenkins.mono-project.com/
+[2]: http://jenkins.mono-project.com/

 
 # Inactivity
 
 
 # Inactivity