diff options
| author | Tom Christie | 2012-08-24 16:06:23 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-08-24 16:06:23 +0100 |
| commit | 7557777c668e6b8eaa85b07971b94115a33c9358 (patch) | |
| tree | 6bd152248eb1e535b86fbc4396fe16fa644a0d2f /docs | |
| parent | 2d2e2f95b0268c3282edfca5c047bdc831133016 (diff) | |
| parent | db7d15d5d136a9b4dcf759f9d588006244bd4e91 (diff) | |
| download | django-rest-framework-7557777c668e6b8eaa85b07971b94115a33c9358.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/alternativeframeworks.rst | 2 | ||||
| -rw-r--r-- | docs/requirements.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/howto/alternativeframeworks.rst b/docs/howto/alternativeframeworks.rst index dc8d1ea6..0f668335 100644 --- a/docs/howto/alternativeframeworks.rst +++ b/docs/howto/alternativeframeworks.rst @@ -7,7 +7,7 @@ Alternative frameworks There are a number of alternative REST frameworks for Django: * `django-piston <https://bitbucket.org/jespern/django-piston/wiki/Home>`_ is very mature, and has a large community behind it. This project was originally based on piston code in parts. -* `django-tasypie <https://github.com/toastdriven/django-tastypie>`_ is also very good, and has a very active and helpful developer community and maintainers. +* `django-tastypie <https://github.com/toastdriven/django-tastypie>`_ is also very good, and has a very active and helpful developer community and maintainers. * Other interesting projects include `dagny <https://github.com/zacharyvoase/dagny>`_ and `dj-webmachine <http://benoitc.github.com/dj-webmachine/>`_ diff --git a/docs/requirements.txt b/docs/requirements.txt index 77cdf485..46a67149 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ # Documentation requires Django & Sphinx, and their dependencies... -Django==1.2.4 +Django>=1.2.4 Jinja2==2.5.5 Pygments==1.4 Sphinx==1.0.7 |