diff options
| author | Tom Christie | 2014-11-20 11:51:42 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-11-20 11:51:42 +0000 |
| commit | 096c58b784faee6b3c71201ad8b2708f7ccd5f7f (patch) | |
| tree | a03ce1bb5c884a08ec2bc7aec48655c8196837c7 /docs | |
| parent | bc83dfece460b6639d915bd8fb42b3701cd91172 (diff) | |
| parent | 37312eed216d6f8a048a32c7ae7e0cd248528550 (diff) | |
| download | django-rest-framework-096c58b784faee6b3c71201ad8b2708f7ccd5f7f.tar.bz2 | |
Merge branch 'master' into 3.0-beta
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/tutorial/5-relationships-and-hyperlinked-apis.md | 1 | ||||
| -rw-r--r-- | docs/tutorial/quickstart.md | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 36473ce9..50552616 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -6,7 +6,6 @@ At the moment relationships within our API are represented by using primary keys Right now we have endpoints for 'snippets' and 'users', but we don't have a single entry point to our API. To create one, we'll use a regular function-based view and the `@api_view` decorator we introduced earlier. In your `snippets/views.py` add: - from rest_framework import renderers from rest_framework.decorators import api_view from rest_framework.response import Response from rest_framework.reverse import reverse diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index c2dc4bea..1c398c1f 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -19,7 +19,7 @@ Create a new Django project named `tutorial`, then start a new app called `quick pip install djangorestframework # Set up a new project with a single application - django-admin.py startproject tutorial . + django-admin.py startproject tutorial cd tutorial django-admin.py startapp quickstart cd .. |