aboutsummaryrefslogtreecommitdiffstats
path: root/docs/api-guide/settings.md
diff options
context:
space:
mode:
authorPhilip Douglas2013-08-16 07:15:09 -0700
committerPhilip Douglas2013-08-16 07:15:09 -0700
commitef7ce344865938bea285a408a7cc415a7b90a83c (patch)
tree1bfa78c86e422f81cf836319d91c626c763d5b24 /docs/api-guide/settings.md
parentc058ab36b13a6979c57760d9af2eb21ec3165e7d (diff)
parentc1ccd8b5b5aef1bd209862f9431c9c03e25ae755 (diff)
downloaddjango-rest-framework-ef7ce344865938bea285a408a7cc415a7b90a83c.tar.bz2
Merge pull request #3 from tomchristie/master
Update to latest
Diffstat (limited to 'docs/api-guide/settings.md')
-rw-r--r--docs/api-guide/settings.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md
index 7b114983..0be0eb24 100644
--- a/docs/api-guide/settings.md
+++ b/docs/api-guide/settings.md
@@ -28,7 +28,7 @@ you should use the `api_settings` object. For example.
print api_settings.DEFAULT_AUTHENTICATION_CLASSES
-The `api_settings` object will check for any user-defined settings, and otherwise fallback to the default values. Any setting that uses string import paths to refer to a class will automatically import and return the referenced class, instead of the string literal.
+The `api_settings` object will check for any user-defined settings, and otherwise fall back to the default values. Any setting that uses string import paths to refer to a class will automatically import and return the referenced class, instead of the string literal.
---
@@ -165,7 +165,7 @@ Default: `'multipart'`
The renderer classes that are supported when building test requests.
-The format of any of these renderer classes may be used when contructing a test request, for example: `client.post('/users', {'username': 'jamie'}, format='json')`
+The format of any of these renderer classes may be used when constructing a test request, for example: `client.post('/users', {'username': 'jamie'}, format='json')`
Default: