Cleaned up shipherd docs.

diff --git a/docs/contrib/shipherd.rst b/docs/contrib/shipherd.rst
index 7d2eaf7..9e03f67 100644 (file)
--- a/docs/contrib/shipherd.rst
+++ b/docs/contrib/shipherd.rst
@@ -31,18 +31,9 @@ Models
        :members: Navigation, NavigationItem, NavigationMapper
        :show-inheritance:
 
        :members: Navigation, NavigationItem, NavigationMapper
        :show-inheritance:
 

-Navigation caching
-------------------
-

 .. autoclass:: NavigationManager
        :members:
 
 .. autoclass:: NavigationManager
        :members:
 

-.. autoclass:: NavigationItemManager
-       :members:
-
-.. autoclass:: NavigationCacheQuerySet
-       :members:
-

 Template tags
 +++++++++++++
 
 Template tags
 +++++++++++++
 

diff --git a/philo/contrib/shipherd/templatetags/shipherd.py b/philo/contrib/shipherd/templatetags/shipherd.py
index 833a995..f522dfa 100644 (file)
--- a/philo/contrib/shipherd/templatetags/shipherd.py
+++ b/philo/contrib/shipherd/templatetags/shipherd.py
@@ -141,21 +141,10 @@ def recursenavigation(parser, token):
                    {% endrecursenavigation %}
                </ul>
        
                    {% endrecursenavigation %}
                </ul>
        

-       .. note:: {% recursenavigation %} requires that the current :class:`HttpRequest` be present in the context as ``request``. The simplest way to do this is with the `request context processor`_. If this is installed with just the default template context processors, the entry in your settings file will look like this::
-
-               TEMPLATE_CONTEXT_PROCESSORS = (
-                       # Defaults
-                       "django.contrib.auth.context_processors.auth",
-                       "django.core.context_processors.debug",
-                       "django.core.context_processors.i18n",
-                       "django.core.context_processors.media",
-                       "django.core.context_processors.static",
-                       "django.contrib.messages.context_processors.messages"
-                       ...
-                       "django.core.context_processors.request"
-               )
+       .. note:: {% recursenavigation %} requires that the current :class:`HttpRequest` be present in the context as ``request``. The simplest way to do this is with the `request context processor`_. Simply make sure that ``django.core.context_processors.request`` is included in your :setting:`TEMPLATE_CONTEXT_PROCESSORS` setting.

        
        .. _request context processor: https://docs.djangoproject.com/en/dev/ref/templates/api/#django-core-context-processors-request
        
        .. _request context processor: https://docs.djangoproject.com/en/dev/ref/templates/api/#django-core-context-processors-request

+       

        """
        bits = token.contents.split()
        if len(bits) != 3:
        """
        bits = token.contents.split()
        if len(bits) != 3: