--- /dev/null
+ iThink Software
+ Corporate Contributor License Agreement ("Agreement") v1.0
+
+Thank you for your interest in iThink Software. In order to clarify
+the intellectual property license granted with Contributions from
+any person or entity, iThink Software must have a Contributor
+License Agreement ("CLA") on file that has been signed by each
+Contributor, indicating agreement to the license terms below. This
+license is for your protection as a Contributor as well as the
+protection of iThink Software and its users; it does not change
+your rights to use your own Contributions for any other purpose.
+
+This version of the Agreement allows an entity (the "Corporation")
+to submit Contributions to iThink Software, to authorize Contributions
+submitted by its designated employees to iThink Software, and to grant
+copyright and patent licenses thereto.
+
+If you have not already done so, please complete and sign, then scan
+and email a pdf file of this Agreement to contact@ithinksw.com.
+Alternatively, you may send an original signed Agreement to
+iThink Software, 261 West Lorain Street, Oberlin, OH 44074, U.S.A.
+Please read this document carefully before signing and
+keep a copy for your records.
+
+ Corporation name: ______________________________________________
+
+ Corporation address: ______________________________________________
+
+ ______________________________________________
+
+ ______________________________________________
+
+ Point of Contact: ______________________________________________
+
+ E-Mail: ______________________________________________
+
+ Telephone: ____________________ Fax: ____________________
+
+
+You accept and agree to the following terms and conditions for Your
+present and future Contributions submitted to iThink Software. Except
+for the license granted herein to iThink Software and recipients of
+software distributed by iThink Software, You reserve all right,
+title, and interest in and to Your Contributions.
+
+1. Definitions.
+
+ "You" (or "Your") shall mean the copyright owner or legal entity
+ authorized by the copyright owner that is making this Agreement
+ with iThink Software. For legal entities, the entity making a
+ Contribution and all other entities that control, are controlled
+ by, or are under common control with that entity are considered to
+ be a single Contributor. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "Contribution" shall mean any original work of authorship,
+ including any modifications or additions to an existing work, that
+ is intentionally submitted by You to iThink Software for inclusion
+ in, or documentation of, any of the products owned or managed by
+ iThink Software (the "Work"). For the purposes of this definition,
+ "submitted" means any form of electronic, verbal, or written
+ communication sent to iThink Software or its representatives,
+ including but not limited to communication on electronic mailing
+ lists, source code control systems, and issue tracking systems that
+ are managed by, or on behalf of, iThink Software for the purpose of
+ discussing and improving the Work, but excluding communication that
+ is conspicuously marked or otherwise designated in writing by You
+ as "Not a Contribution."
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this Agreement, You hereby grant to iThink Software and to
+ recipients of software distributed by iThink Software a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare derivative works of,
+ publicly display, publicly perform, sublicense, and distribute Your
+ Contributions and such derivative works.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this Agreement, You hereby grant to iThink Software and to
+ recipients of software distributed by iThink Software a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have
+ made, use, offer to sell, sell, import, and otherwise transfer the
+ Work, where such license applies only to those patent claims
+ licensable by You that are necessarily infringed by Your
+ Contribution(s) alone or by combination of Your Contribution(s)
+ with the Work to which such Contribution(s) were submitted. If any
+ entity institutes patent litigation against You or any other entity
+ (including a cross-claim or counterclaim in a lawsuit) alleging
+ that your Contribution, or the Work to which you have contributed,
+ constitutes direct or contributory patent infringement, then any
+ patent licenses granted to that entity under this Agreement for
+ that Contribution or Work shall terminate as of the date such
+ litigation is filed.
+
+4. You represent that You are legally entitled to grant the above
+ license. You represent further that each employee of the
+ Corporation designated on Schedule A below (or in a subsequent
+ written modification to that Schedule) is authorized to submit
+ Contributions on behalf of the Corporation.
+
+5. You represent that each of Your Contributions is Your original
+ creation (see section 7 for submissions on behalf of others).
+
+6. You are not expected to provide support for Your Contributions,
+ except to the extent You desire to provide support. You may provide
+ support for free, for a fee, or not at all. Unless required by
+ applicable law or agreed to in writing, You provide Your
+ Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied, including, without
+ limitation, any warranties or conditions of TITLE, NON-
+ INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+
+7. Should You wish to submit work that is not Your original creation,
+ You may submit it to iThink Software separately from any
+ Contribution, identifying the complete details of its source and of
+ any license or other restriction (including, but not limited to,
+ related patents, trademarks, and license agreements) of which you
+ are personally aware, and conspicuously marking the work as
+ "Submitted on behalf of a third-party: [named here]".
+
+8. It is your responsibility to notify iThink Software when any change
+ is required to the list of designated employees authorized to submit
+ Contributions on behalf of the Corporation, or to the Corporation's
+ Point of Contact with iThink Software.
+
+
+Please sign: __________________________________ Date: _______________
+
+Title: __________________________________
+
+Corporation: __________________________________
+
+
+Schedule A
+
+ [Initial list of designated employees.]
--- /dev/null
+ iThink Software
+ Individual Contributor License Agreement ("Agreement") v1.0.1
+
+Thank you for your interest in iThink Software. In order to clarify
+the intellectual property license granted with Contributions from
+any person or entity, iThink Software must have a Contributor
+License Agreement ("CLA") on file that has been signed by each
+Contributor, indicating agreement to the license terms below. This
+license is for your protection as a Contributor as well as the
+protection of iThink Software and its users; it does not change
+your rights to use your own Contributions for any other purpose.
+If you have not already done so, please complete and sign, then scan
+and email a pdf file of this Agreement to contact@ithinksw.com.
+Alternatively, you may send an original signed Agreement to
+iThink Software, 261 West Lorain Street, Oberlin, OH 44074, U.S.A.
+Please read this document carefully before signing and
+keep a copy for your records.
+
+ Full name: ______________________________________________________
+
+ Mailing Address: ________________________________________________
+
+ _________________________________________________________________
+
+ Country: ______________________________________________________
+
+ Telephone: ______________________________________________________
+
+ Facsimile: ______________________________________________________
+
+ E-Mail: ______________________________________________________
+
+You accept and agree to the following terms and conditions for Your
+present and future Contributions submitted to iThink Software. Except
+for the license granted herein to iThink Software and recipients of
+software distributed by iThink Software, You reserve all right,
+title, and interest in and to Your Contributions.
+
+1. Definitions.
+
+ "You" (or "Your") shall mean the copyright owner or legal entity
+ authorized by the copyright owner that is making this Agreement
+ with iThink Software. For legal entities, the entity making a
+ Contribution and all other entities that control, are controlled
+ by, or are under common control with that entity are considered to
+ be a single Contributor. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "Contribution" shall mean any original work of authorship,
+ including any modifications or additions to an existing work, that
+ is intentionally submitted by You to iThink Software for inclusion
+ in, or documentation of, any of the products owned or managed by
+ iThink Software (the "Work"). For the purposes of this definition,
+ "submitted" means any form of electronic, verbal, or written
+ communication sent to iThink Software or its representatives,
+ including but not limited to communication on electronic mailing
+ lists, source code control systems, and issue tracking systems that
+ are managed by, or on behalf of, iThink Software for the purpose of
+ discussing and improving the Work, but excluding communication that
+ is conspicuously marked or otherwise designated in writing by You
+ as "Not a Contribution."
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this Agreement, You hereby grant to iThink Software and to
+ recipients of software distributed by iThink Software a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare derivative works of,
+ publicly display, publicly perform, sublicense, and distribute Your
+ Contributions and such derivative works.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this Agreement, You hereby grant to iThink Software and to
+ recipients of software distributed by iThink Software a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have
+ made, use, offer to sell, sell, import, and otherwise transfer the
+ Work, where such license applies only to those patent claims
+ licensable by You that are necessarily infringed by Your
+ Contribution(s) alone or by combination of Your Contribution(s)
+ with the Work to which such Contribution(s) were submitted. If any
+ entity institutes patent litigation against You or any other entity
+ (including a cross-claim or counterclaim in a lawsuit) alleging
+ that your Contribution, or the Work to which you have contributed,
+ constitutes direct or contributory patent infringement, then any
+ patent licenses granted to that entity under this Agreement for
+ that Contribution or Work shall terminate as of the date such
+ litigation is filed.
+
+4. You represent that you are legally entitled to grant the above
+ license. If your employer(s) has rights to intellectual property
+ that you create that includes your Contributions, you represent
+ that you have received permission to make Contributions on behalf
+ of that employer, that your employer has waived such rights for
+ your Contributions to iThink Software, or that your employer has
+ executed a separate Corporate CLA with iThink Software.
+
+5. You represent that each of Your Contributions is Your original
+ creation (see section 7 for submissions on behalf of others). You
+ represent that Your Contribution submissions include complete
+ details of any third-party license or other restriction (including,
+ but not limited to, related patents and trademarks) of which you
+ are personally aware and which are associated with any part of Your
+ Contributions.
+
+6. You are not expected to provide support for Your Contributions,
+ except to the extent You desire to provide support. You may provide
+ support for free, for a fee, or not at all. Unless required by
+ applicable law or agreed to in writing, You provide Your
+ Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied, including, without
+ limitation, any warranties or conditions of TITLE, NON-
+ INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+
+7. Should You wish to submit work that is not Your original creation,
+ You may submit it to iThink Software separately from any
+ Contribution, identifying the complete details of its source and of
+ any license or other restriction (including, but not limited to,
+ related patents, trademarks, and license agreements) of which you
+ are personally aware, and conspicuously marking the work as
+ "Submitted on behalf of a third-party: [named here]".
+
+8. You agree to notify iThink Software of any facts or circumstances of
+ which you become aware that would make these representations
+ inaccurate in any respect.
+
+
+Please sign: __________________________________ Date: ________________
So you want to contribute to Philo? That's great! Here's some ways you can get started:
* **Report bugs and request features.** :mod:`philo` uses a Redmine installation located at `http://ithinksw.org/projects/philo/issues <http://ithinksw.org/projects/philo/issues>`_ for issue tracking. In order to report an issue, you will need to register for an account with the tracker.
-* **Contribute code.** Philo uses git to manage its code. You can fork philo's repository either on `GitHub <http://github.com/ithinksw/philo>`_ or `Gitorious <http://gitorious.org/ithinksw/philo>`_. If you are contributing to Philo, you may need to submit a `Contributor License Agreement <http://en.wikipedia.org/wiki/Contributor_License_Agreement>`_.
+* **Contribute code.** Philo uses git to manage its code. You can fork philo's repository either on `GitHub <http://github.com/ithinksw/philo>`_ or `Gitorious <http://gitorious.org/ithinksw/philo>`_. If you are contributing to Philo, you will need to submit a :ref:`Contributor License Agreement <cla>`.
* **Join the discussion** on IRC at `irc://irc.oftc.net/#philo <irc://irc.oftc.net/#philo>`_ if you have any questions or suggestions or just want to chat about the project. You can also keep in touch via :mod:`philo`'s mailing lists: `philo@ithinksw.org <mailto:philo@ithinksw.org>`_ and `philo-devel@ithinksw.org <mailto:philo-devel@ithinksw.org>`_.
+
+
+Branches and Code Style
++++++++++++++++++++++++
+We use `A successful Git branching model`__ with the blessed repository. To make things easier, you probably should too. This means that you should work on and against the develop branch in most cases, and leave it to the release manager to create the commits on the master branch if and when necessary. Regardless of what you do, the release manager will usually merge your changes into the develop branch unless you explicitly note they should be treated otherwise.
+
+__ http://nvie.com/posts/a-successful-git-branching-model/
+
+Philo adheres to PEP8 for its code style, with two exceptions: tabs are used rather than spaces, and lines are not truncated at 79 characters.
+
+.. _cla:
+
+Licensing and Legal
++++++++++++++++++++
+
+In order for the release manager to merge your changes into the blessed repository, you will need to submit a signed CLA. Our CLAs are based on the Apache Software Foundation's CLAs, which is the same source as the `Django Project's CLAs`_. You might, therefore, find the `Django Project's CLA FAQ`_. helpful.
+
+.. _`Django Project's CLAs`: https://www.djangoproject.com/foundation/cla/
+.. _`Django Project's CLA FAQ`: https://www.djangoproject.com/foundation/cla/faq/
+
+If you are an individual not doing work for an employer, then you can simply submit the :download:`Individual CLA <cla/ithinksw-icla.txt>`.
+
+If you are doing work for an employer, they will need to submit the :download:`Corporate CLA <cla/ithinksw-ccla.txt>` and you will need to submit the Individual CLA :download:`Individual CLA <cla/ithinksw-icla.txt>` as well.
+
+Both documents include information on how to submit them.
git.ithinksw.org / philo.git / commitdiff