aboutsummaryrefslogtreecommitdiffstats
path: root/docs/index.md
diff options
context:
space:
mode:
authorTom Christie2013-12-09 07:45:45 +0000
committerTom Christie2013-12-09 07:45:45 +0000
commit80ef2685e522fc87bd8af9767aa7b231c9991ea4 (patch)
tree4be3191af2eec42ffea97443c9e9f11ee5631ca7 /docs/index.md
parent4e9385e709bcee87456a99839841ecf6b56f337a (diff)
parent175b4d233d578b5964db72f91a96bb3b4a0f3e99 (diff)
downloaddjango-rest-framework-80ef2685e522fc87bd8af9767aa7b231c9991ea4.tar.bz2
Merge master
Diffstat (limited to 'docs/index.md')
-rw-r--r--docs/index.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/index.md b/docs/index.md
index 775fae62..badd6f60 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -100,7 +100,7 @@ Don't forget to make sure you've also added `rest_framework` to your `INSTALLED_
We're ready to create our API now.
Here's our project's root `urls.py` module:
- from django.conf.urls.defaults import url, patterns, include
+ from django.conf.urls import url, patterns, include
from django.contrib.auth.models import User, Group
from rest_framework import viewsets, routers
@@ -177,6 +177,7 @@ General guides to using REST framework.
* [Browser enhancements][browser-enhancements]
* [The Browsable API][browsableapi]
* [REST, Hypermedia & HATEOAS][rest-hypermedia-hateoas]
+* [Contributing to REST framework][contributing]
* [2.0 Announcement][rest-framework-2-announcement]
* [2.2 Announcement][2.2-announcement]
* [2.3 Announcement][2.3-announcement]