diff options
| author | Tom Christie | 2012-10-02 19:54:24 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-10-02 19:54:24 +0100 |
| commit | e1518de68fa9ad4b2628894abf17924e386ccbda (patch) | |
| tree | b1d190f6bd08ce087cf0a2d3e8cd681b5e7e7d04 /docs/api-guide/settings.md | |
| parent | 31b06f1721f98730556dc56927b985e4032788c3 (diff) | |
| parent | d1b99f350aded62fe480f7dc4749cd63d52715d2 (diff) | |
| download | django-rest-framework-e1518de68fa9ad4b2628894abf17924e386ccbda.tar.bz2 | |
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
Diffstat (limited to 'docs/api-guide/settings.md')
| -rw-r--r-- | docs/api-guide/settings.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 0f66e85e..43be0d47 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -136,6 +136,10 @@ The name of a URL parameter that may be used to override the HTTP `Accept` heade If the value of this setting is `None` then URL accept overloading will be disabled. -Default: `'_accept'` +Default: `'accept'` + +## URL_FORMAT_OVERRIDE + +Default: `'format'` [cite]: http://www.python.org/dev/peps/pep-0020/ |