aboutsummaryrefslogtreecommitdiffstats
path: root/docs/api-guide/settings.md
diff options
context:
space:
mode:
authorTom Christie2013-03-05 20:57:35 +0000
committerTom Christie2013-03-05 20:57:35 +0000
commit4f7b028a0a983b79ebca63b2ba48ce97e7a06175 (patch)
tree85be479d5680399f7b5a27cddbb13c67b10ac6cf /docs/api-guide/settings.md
parentc20ebe95f6707d63373d9c583e90bcbc6e021899 (diff)
downloaddjango-rest-framework-4f7b028a0a983b79ebca63b2ba48ce97e7a06175.tar.bz2
Updating docs
Diffstat (limited to 'docs/api-guide/settings.md')
-rw-r--r--docs/api-guide/settings.md36
1 files changed, 24 insertions, 12 deletions
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md
index 04569f44..82730225 100644
--- a/docs/api-guide/settings.md
+++ b/docs/api-guide/settings.md
@@ -174,28 +174,40 @@ The name of a parameter in the URL conf that may be used to provide a format suf
Default: `'format'`
-## DATE_INPUT_FORMATS
-
-Default: `ISO8601`
+## DATETIME_FORMAT
-## DATE_OUTPUT_FORMAT
+A format string that should be used by default for `DateTimeField` serializer fields.
-Default: `ISO8601`
+Default: `'iso8601'`
## DATETIME_INPUT_FORMATS
-Default: `ISO8601`
+A list of format strings that should be used by default for parsing inputs to `DateTimeField` serializer fields.
-## DATETIME_OUTPUT_FORMAT
+Default: `['iso8601']`
-Default: `ISO8601`
+## DATE_FORMAT
-## TIME_INPUT_FORMATS
+A format string that should be used by default for `DateField` serializer fields.
+
+Default: `'iso8601'`
+
+## DATE_INPUT_FORMATS
-Default: `ISO8601`
+A list of format strings that should be used by default for parsing inputs to `DateField` serializer fields.
+
+Default: `['iso8601']`
+
+## TIME_FORMAT
+
+A format string that should be used by default for `TimeField` serializer fields.
+
+Default: `'iso8601'`
+
+## TIME_INPUT_FORMATS
-## TIME_OUTPUT_FORMAT
+A list of format strings that should be used by default for parsing inputs to `TimeField` serializer fields.
-Default: `ISO8601`
+Default: `['iso8601']`
[cite]: http://www.python.org/dev/peps/pep-0020/