From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Wed, 22 Jun 2011 17:07:51 +0000 (-0400)
Subject: Merge branch 'develop' of git://github.com/melinath/philo into develop
X-Git-Tag: philo-0.9.1^2~8
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/2a3bb0d2d5fff8c3c373af2f493d2f9da8c8a35c?ds=inline;hp=-c

Merge branch 'develop' of git://github.com/melinath/philo into develop

* 'develop' of git://github.com/melinath/philo:
  Added winer doc file. Improved the docstrings for FeedView from the penfield version.
  Renamed syndication to winer.
  Added information about request context processor to shipherd docs. See issue #160.
  Minor correction to shipherd howto.
  Moved a migration after the master migrations.
  Tweaked FeedView to more correctly generate links vs feed urls.
  Improved penfield docstrings. Added urlpatterns and support for all registered feed types. Resolves issue #141.
  Initial implementation of a separate syndication contrib app based on penfield's FeedView, updated to use a registry instead of a dict.
  Moved sobol's search registry into core as a generic registry utility. Added support for RegistryIterators directly to SlugMultipleChoiceField since it is a common use case.
  Made views optional on nodes; nodes without views will raise a 404 when rendering and will return False for accepting and handling subpaths. Implements feature #131.
---

2a3bb0d2d5fff8c3c373af2f493d2f9da8c8a35c