aboutsummaryrefslogtreecommitdiffstats
path: root/docs/api-guide/settings.md
diff options
context:
space:
mode:
authorStephan Groß2013-03-01 15:03:27 +0100
committerStephan Groß2013-03-01 15:03:27 +0100
commit7e702439eb4a82fe2ef45911fbb176e95d5f0bce (patch)
treece51ee02c9755f2e99246a73692fb046dafc4c4c /docs/api-guide/settings.md
parent876a58e8bf566b9f05a1f6c921660cf3512ae3af (diff)
downloaddjango-rest-framework-7e702439eb4a82fe2ef45911fbb176e95d5f0bce.tar.bz2
Add docs update - part 1
Diffstat (limited to 'docs/api-guide/settings.md')
-rw-r--r--docs/api-guide/settings.md35
1 files changed, 35 insertions, 0 deletions
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md
index e103fbab..9080cacb 100644
--- a/docs/api-guide/settings.md
+++ b/docs/api-guide/settings.md
@@ -174,4 +174,39 @@ The name of a parameter in the URL conf that may be used to provide a format suf
Default: `'format'`
+## DATE_INPUT_FORMATS
+
+Default:
+
+ (
+ '%Y-%m-%d', # '1984-07-31'
+ )
+
+## DATE_OUTPUT_FORMAT
+
+## DATETIME_INPUT_FORMATS
+
+Default:
+
+ (
+ '%Y-%m-%d', # '1984-07-31'
+ '%Y-%m-%d %H:%M', # '1984-07-31 04:31'
+ '%Y-%m-%d %H:%M:%S', # '1984-07-31 04:31:59'
+ '%Y-%m-%d %H:%M:%S.%f', # '1984-07-31 04:31:59.000200'
+ )
+
+## DATETIME_OUTPUT_FORMAT
+
+## TIME_INPUT_FORMATS
+
+Default:
+
+ (
+ '%H:%M', # '04:31'
+ '%H:%M:%S', # '04:31:59'
+ '%H:%M:%S.%f', # '04:31:59.000200'
+ )
+
+## TIME_OUTPUT_FORMAT
+
[cite]: http://www.python.org/dev/peps/pep-0020/