Browse files

And now for the correct file...

  • Loading branch information...
1 parent 91d7dfd commit 759bb7a34d37ef9db8152da1937c009d404f9967 @ekoneil ekoneil committed Jun 1, 2012
Showing with 13 additions and 6 deletions.
  1. +13 −6 CONTRIBUTING.mdown
@@ -1,8 +1,15 @@
-1/ contributors must sign either the iCLA or cCLA [link]
-2/ all contributions must be ASL licensed
-3/ all contributions CAN be copyrighted by the author. Copyright notice MUST be left in headers for source files.
+Facebook welcomes contributions to our SDKs.
-The SDK uses the Apache Software License (ASL) v2.0, and the SDK projects accept contributions from 3rd parties via Git pull requests.
+All contributors must sign a CLA (contributor license agreement) here:
-All contributions MUST be ASL licensed -- e.g. new files must include the ASL 2.0 header that's described here
-All contributions MAY be copyright'ed by the author. The ASL does not require that patch authors assign copyright to Facebook; if a developer chooses to retain copyright, they should include an update to the project's NOTICE file with the pull request that documents which files they are retaining for copyright. An example NOTICE file is here. [Note, this is pending legal approval]
+To contribute on behalf of your employer, sign the company CLA
+To contribute on behalf of yourself, sign the individual CLA
+All contributions:
+1/ MUST be be licensed using the Apache License, Version 2.0
+2/ authors MAY retain copyright by adding their copyright notice to the appropriate flies
+More information on the Apache License can be found here:

0 comments on commit 759bb7a

Please sign in to comment.