Skip to content

Commit

Permalink
updated docs
Browse files Browse the repository at this point in the history
  • Loading branch information
zbyte64 committed Apr 11, 2013
1 parent 722c5df commit 6558a20
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 2 deletions.
3 changes: 2 additions & 1 deletion README.rst
Expand Up @@ -28,7 +28,7 @@ Features
Supported Media Formats:

* application/text-html, text/html - provides HTML responses
* application/json - plain json serialization
* application/json - plain json serialization, uses datataps
* text/javascript - for jsonp
* application/vnd.Collection+JSON
* application/vnd.Collection.next+JSON
Expand All @@ -43,6 +43,7 @@ Requirements

* Python 2.6 or later
* Django 1.3 or later
* django-datatap


===============
Expand Down
1 change: 1 addition & 0 deletions doc_requirements.txt
@@ -1,3 +1,4 @@
mimeparse
django>=1.4
django-datatap

6 changes: 6 additions & 0 deletions docs/source/manual/content_types.rst
Expand Up @@ -2,6 +2,12 @@
Content Types
=============

Hyperadmin supports 3 different modes of content types:

* HTML - renders a response using the django template engine
* Hypermedia - renders a structured response representing a workflow and data (ie application/vnd.collection+json)
* Datatap - renders and loads fixtures (ie application/json)

Media Type Selection
====================

Expand Down
1 change: 1 addition & 0 deletions docs/source/manual/installation.rst
Expand Up @@ -7,6 +7,7 @@ Requirements

* Python 2.6 or later
* Django 1.3 or later
* django-datatap

--------
Settings
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
@@ -1,3 +1,3 @@
mimeparse
#django>=1.3
-e git+git://github.com/zbyte64/django-datatap.git#egg=django-datatap
django-datatap

0 comments on commit 6558a20

Please sign in to comment.