diff options
| author | Tom Christie | 2014-08-19 10:11:10 +0100 | 
|---|---|---|
| committer | Tom Christie | 2014-08-19 10:11:10 +0100 | 
| commit | e385a7b8eb6e538698f28128e43fe8bfaefd4e97 (patch) | |
| tree | 3f1cac50c40ec77a0bc5537f1a04628901a4d2ce /rest_framework/urls.py | |
| parent | 2aad8e4b35c3552a065347d7eccad8bd51938783 (diff) | |
| parent | 48b66ec2a2b744f170034adbdaaa1588e6c14e11 (diff) | |
| download | django-rest-framework-e385a7b8eb6e538698f28128e43fe8bfaefd4e97.tar.bz2 | |
Merge master
Diffstat (limited to 'rest_framework/urls.py')
| -rw-r--r-- | rest_framework/urls.py | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/rest_framework/urls.py b/rest_framework/urls.py index 87ec0f0a..eed4bd14 100644 --- a/rest_framework/urls.py +++ b/rest_framework/urls.py @@ -2,15 +2,15 @@  Login and logout views for the browsable API.  Add these to your root URLconf if you're using the browsable API and -your API requires authentication. - -The urls must be namespaced as 'rest_framework', and you should make sure -your authentication settings include `SessionAuthentication`. +your API requires authentication:      urlpatterns = patterns('',          ...          url(r'^auth', include('rest_framework.urls', namespace='rest_framework'))      ) +     +The urls must be namespaced as 'rest_framework', and you should make sure +your authentication settings include `SessionAuthentication`.  """  from __future__ import unicode_literals  from django.conf.urls import patterns, url | 
