Merge remote branch 'ithinksw/master' into release

[philo.git] / docs / index.rst

diff --git a/docs/index.rst b/docs/index.rst
index 76e779d..666e3ee 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,15 +3,27 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 

+.. module:: philo
+

 Welcome to Philo's documentation!
 =================================
 
 Contents:
 
 .. toctree::
 Welcome to Philo's documentation!
 =================================
 
 Contents:
 
 .. toctree::

-   :maxdepth: 2
-   
-   intro
+       :maxdepth: 2
+       
+       intro
+       models/intro
+       exceptions
+       handling_requests
+       signals
+       validators
+       utilities
+       templatetags
+       forms
+       loaders
+       contrib/intro

 
 Indices and tables
 ==================
 
 Indices and tables
 ==================


@@ -34,4 +46,4 @@ Prerequisites:
 * (Optional) `south 0.7.2+ <http://south.aeracode.org/>`_
 * (Optional) `recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>`_
 
 * (Optional) `south 0.7.2+ <http://south.aeracode.org/>`_
 * (Optional) `recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>`_
 

-To contribute, please visit the `project website <http://philo.ithinksw.org/>`_ or make a fork of the `git repository <http://github.com/ithinksw/philo/>`_. Feel free to join us on IRC at `irc://irc.oftc.net/#philo <irc://irc.oftc.net/#philo>`_.
+To contribute, please visit the `project website <http://philocms.org/>`_ 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>`_.