-Philo is a foundation for developing web content management systems.
+Philo <http://philocms.org/> is a foundation for developing web content management systems.
Prerequisites:
* Python 2.5.4+ <http://www.python.org/>
* Django 1.3+ <http://www.djangoproject.com/>
* django-mptt e734079+ <https://github.com/django-mptt/django-mptt/>
- * (Optional) django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>
- * (Optional) south 0.7.2+ <http://south.aeracode.org/>
- * (philo.contrib.penfield) django-taggit 0.9.3+ <https://github.com/alex/django-taggit>
- * (philo.contrib.waldo, optional) recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>
+ * (optional) django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>
+ * (optional) south 0.7.2+ <http://south.aeracode.org/>
+ * (philo.contrib.penfield) django-taggit 0.9.3+ <https://github.com/alex/django-taggit/>
+ * (philo.contrib.waldo, optional) recaptcha-django r6+ <http://code.google.com/p/recaptcha-django/>
-====
-Using philo
-====
-After installing philo and mptt on your python path, make sure to complete the following steps:
+After installing philo and mptt on your PYTHONPATH, make sure to complete the following steps:
-1. add 'philo.middleware.RequestNodeMiddleware' to settings.MIDDLEWARE_CLASSES.
-2. add 'philo' and 'mptt' to settings.INSTALLED_APPS.
-3. include 'philo.urls' somewhere in your urls.py file.
+1. Add 'philo.middleware.RequestNodeMiddleware' to settings.MIDDLEWARE_CLASSES.
+2. Add 'philo' and 'mptt' to settings.INSTALLED_APPS.
+3. Include 'philo.urls' somewhere in your urls.py file.
4. Optionally add a root node to your current Site.
-Philo should be ready to go! All that's left is to learn more <http://philo.readthedocs.org> and contribute <http://philo.readthedocs.org/en/latest/contribute.html>.
+Philo should be ready to go! All that's left is to learn more <http://docs.philocms.org/> and contribute <http://docs.philocms.org/en/latest/contribute.html>.
-Philo is a foundation for developing web content management systems.
+[Philo](http://philocms.org/) is a foundation for developing web content management systems.
Prerequisites:
- * [Python 2.5.4+ <http://www.python.org>](http://www.python.org/)
- * [Django 1.3+ <http://www.djangoproject.com/>](http://www.djangoproject.com/)
- * [django-mptt e734079+ <https://github.com/django-mptt/django-mptt/>](https://github.com/django-mptt/django-mptt/)
- * (Optional) [django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>](http://code.google.com/p/django-grappelli/)
- * (Optional) [south 0.7.2+ <http://south.aeracode.org/)](http://south.aeracode.org/)
- * (philo.contrib.penfield) [django-taggit 0.9.3+ <https://github.com/alex/django-taggit>](https://github.com/alex/django-taggit)
- * (philo.contrib.waldo, optional) [recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>](http://code.google.com/p/recaptcha-django/)
+ * [Python 2.5.4+](http://www.python.org/)
+ * [Django 1.3+](http://www.djangoproject.com/)
+ * [django-mptt e734079+](https://github.com/django-mptt/django-mptt/)
+ * (optional) [django-grappelli 2.0+](http://code.google.com/p/django-grappelli/)
+ * (optional) [south 0.7.2+](http://south.aeracode.org/)
+ * (philo.contrib.penfield) [django-taggit 0.9.3+](https://github.com/alex/django-taggit/)
+ * (philo.contrib.waldo, optional) [recaptcha-django r6+](http://code.google.com/p/recaptcha-django/)
-To contribute, please visit the [project website](http://project.philocms.org/) and/or make a fork of the git repository on [GitHub](http://github.com/ithinksw/philo) or [Gitorious](http://gitorious
-.org/ithinksw/philo). Feel free to join us on IRC at [irc://irc.oftc.net/#philo](irc://irc.oftc.net/#philo).
+After installing philo and mptt on your PYTHONPATH, make sure to complete the following steps:
-Using philo
-===========
-
-After installing philo and mptt on your python path, make sure to complete the following steps:
-
-1. add 'philo.middleware.RequestNodeMiddleware' to settings.MIDDLEWARE_CLASSES.
-2. add 'philo' and 'mptt' to settings.INSTALLED_APPS.
-3. include 'philo.urls' somewhere in your urls.py file.
+1. Add 'philo.middleware.RequestNodeMiddleware' to settings.MIDDLEWARE_CLASSES.
+2. Add 'philo' and 'mptt' to settings.INSTALLED_APPS.
+3. Include 'philo.urls' somewhere in your urls.py file.
4. Optionally add a root node to your current Site.
-Philo should be ready to go! All that's left is to [learn more](http://philo.readthedocs.org) and [contribute](http://philo.readthedocs.org/en/latest/contribute.html).
+Philo should be ready to go! All that's left is to [learn more](http://docs.philocms.org/) and [contribute](http://docs.philocms.org/en/latest/contribute.html).
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
+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
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
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 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>`_.
+* **Report bugs and request features** using the issue tracker at the `project site <http://project.philocms.org/>`_.
+* **Contribute code** using `git <http://git-scm.com/>`_. 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 using the project 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.
+
+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. When pulling changes into the blessed repository at your request, the release manager will usually merge them into the develop branch unless you explicitly note they be treated otherwise.
__ http://nvie.com/posts/a-successful-git-branching-model/
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.
+In order for the release manager to merge your changes into the blessed repository, you will need to have already submitted 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/
Prerequisites:
-* `Python 2.5.4+ <http://www.python.org>`_
+* `Python 2.5.4+ <http://www.python.org/>`_
* `Django 1.3+ <http://www.djangoproject.com/>`_
* `django-mptt e734079+ <https://github.com/django-mptt/django-mptt/>`_
-* (Optional) `django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>`_
-* (Optional) `south 0.7.2+ <http://south.aeracode.org/>`_
-* (:mod:`philo.contrib.penfield`) `django-taggit 0.9.3+ <https://github.com/alex/django-taggit>`_
-* (:mod:`philo.contrib.waldo`, optional) `recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>`_
+* (optional) `django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>`_
+* (optional) `south 0.7.2+ <http://south.aeracode.org/>`_
+* (:mod:`philo.contrib.penfield`) `django-taggit 0.9.3+ <https://github.com/alex/django-taggit/>`_
+* (:mod:`philo.contrib.waldo`, optional) `recaptcha-django r6+ <http://code.google.com/p/recaptcha-django/>`_
Contents
++++++++
git.ithinksw.org / philo.git / commitdiff