From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Thu, 2 Feb 2012 07:04:52 +0000 (-0500)
Subject: Merge branch 'develop' into gilbert-ext4
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/refs/heads/gilbert-ext4?hp=-c

Merge branch 'develop' into gilbert-ext4

* develop:
  Fixed a few bugs with the documentation, and links to the documentation from the README. Sphinx can now build the documentation reliably due to conf.py explicitly adding the docs directory to the path. Added a link to the Bitbucket mirror, extending the set currently consisting of GitHub and Gitorious.
  Bumped version number and wrote release notes for 0.9.2 in preparation for release.
  Fixed an exception with JSONAttributes using DateField or DateTimeField as their field template when the stored value is None. Fixes #178.
  Updated copyright date range to end in 2012 instead of 2011.
---

5c919ea0dec366d8d78fee8944577c454f335b2a
diff --combined README
index abf3a35,19977cd..2bdca5f
--- a/README
+++ b/README
@@@ -15,6 -15,5 +15,6 @@@ After installing philo and mptt on you
  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.
 +5. (philo.contrib.gilbert) Add 'django.core.context_processors.request' to settings.TEMPLATE_CONTEXT_PROCESSORS.
  
- 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 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/contributing.html>.
diff --combined README.markdown
index 30856dc,2653f52..6cb84d1
--- a/README.markdown
+++ b/README.markdown
@@@ -16,6 -16,5 +16,6 @@@ After installing philo and mptt on you
  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.
 +5. (philo.contrib.gilbert) Add 'django.core.context_processors.request' to settings.TEMPLATE_CONTEXT_PROCESSORS.
  
- 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 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/contributing.html).