diff options
| author | Tom Christie | 2014-12-19 11:53:05 +0000 | 
|---|---|---|
| committer | Tom Christie | 2014-12-19 11:53:05 +0000 | 
| commit | 435aef77384759d5a29129cdb0cbe47b3de6df93 (patch) | |
| tree | db9c284bd530b111dae553f5310fba14cd7b7638 /docs/index.md | |
| parent | 4ea140291635bde9f5e9d271d5101ec6624e51bb (diff) | |
| parent | e0096fe80c95d932dad0490ef2838756e7be6bf7 (diff) | |
| download | django-rest-framework-435aef77384759d5a29129cdb0cbe47b3de6df93.tar.bz2 | |
Merge branch 'master' into version-3.1
Diffstat (limited to 'docs/index.md')
| -rw-r--r-- | docs/index.md | 4 | 
1 files changed, 4 insertions, 0 deletions
| diff --git a/docs/index.md b/docs/index.md index 14cf30ac..f7b3ed2a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -177,6 +177,7 @@ The API guide is your complete reference manual to all the functionality provide  * [Pagination][pagination]  * [Versioning][versioning]  * [Content negotiation][contentnegotiation] +* [Metadata][metadata]  * [Format suffixes][formatsuffixes]  * [Returning URLs][reverse]  * [Exceptions][exceptions] @@ -195,6 +196,7 @@ General guides to using REST framework.  * [REST, Hypermedia & HATEOAS][rest-hypermedia-hateoas]  * [Third Party Resources][third-party-resources]  * [Contributing to REST framework][contributing] +* [Project management][project-management]  * [2.0 Announcement][rest-framework-2-announcement]  * [2.2 Announcement][2.2-announcement]  * [2.3 Announcement][2.3-announcement] @@ -297,6 +299,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  [pagination]: api-guide/pagination.md  [versioning]: api-guide/versioning.md  [contentnegotiation]: api-guide/content-negotiation.md +[metadata]: api-guide/metadata.md  [formatsuffixes]: api-guide/format-suffixes.md  [reverse]: api-guide/reverse.md  [exceptions]: api-guide/exceptions.md @@ -310,6 +313,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  [browsableapi]: topics/browsable-api.md  [rest-hypermedia-hateoas]: topics/rest-hypermedia-hateoas.md  [contributing]: topics/contributing.md +[project-management]: topics/project-management.md  [third-party-resources]: topics/third-party-resources.md  [rest-framework-2-announcement]: topics/rest-framework-2-announcement.md  [2.2-announcement]: topics/2.2-announcement.md | 
