diff options
| author | Stephan Groß | 2013-03-01 16:35:27 +0100 | 
|---|---|---|
| committer | Stephan Groß | 2013-03-01 16:50:18 +0100 | 
| commit | 4a2788a7be6541811977fbe7ae31af41bf9545a4 (patch) | |
| tree | c995fd2885994446150be88e2c3c212ed1b3587d /docs/api-guide/settings.md | |
| parent | 9c964cf37b6936e907d250306e15c3f116591e7c (diff) | |
| download | django-rest-framework-4a2788a7be6541811977fbe7ae31af41bf9545a4.tar.bz2 | |
Update docs
Diffstat (limited to 'docs/api-guide/settings.md')
| -rw-r--r-- | docs/api-guide/settings.md | 29 | 
1 files changed, 9 insertions, 20 deletions
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 9080cacb..04569f44 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -176,37 +176,26 @@ Default: `'format'`  ## DATE_INPUT_FORMATS -Default: - -    ( -        '%Y-%m-%d',     # '1984-07-31' -    ) +Default: `ISO8601`  ## DATE_OUTPUT_FORMAT +Default: `ISO8601` +  ## 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' -    ) +Default: `ISO8601`  ## DATETIME_OUTPUT_FORMAT +Default: `ISO8601` +  ## TIME_INPUT_FORMATS -Default: - -    ( -        '%H:%M',        # '04:31' -        '%H:%M:%S',     # '04:31:59' -        '%H:%M:%S.%f',  # '04:31:59.000200' -    ) +Default: `ISO8601`  ## TIME_OUTPUT_FORMAT +Default: `ISO8601` +  [cite]: http://www.python.org/dev/peps/pep-0020/  | 
