summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDavid Hoffman <dhoffman34@icloud.com>2014-07-25 21:34:13 -0400
committerClaude Paroz <claude@2xlibre.net>2014-07-26 11:24:04 +0200
commit2630cafc86bf6cc86ec8b47f0074b42f45b1f944 (patch)
tree39fd7f8bb0150b3f06fa4c000e4183d402de2165 /docs
parentae5a4668beceb7d90c9855d383f18fb5aad834a6 (diff)
[1.6.x] Fixed #23097 -- Switched to new octal format in docs
Backport of e1c85167a3 from master.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt4
-rw-r--r--docs/ref/settings.txt4
-rw-r--r--docs/releases/1.5-alpha-1.txt2
-rw-r--r--docs/releases/1.5-beta-1.txt2
-rw-r--r--docs/releases/1.5.txt2
-rw-r--r--docs/topics/http/file-uploads.txt4
6 files changed, 9 insertions, 9 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 1ae6f4e176..fe530598cd 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -687,8 +687,8 @@ Write stderr to the *FILE* file.
``umask=UMASK``
-Umask to use when daemonizing. The value is interpeted as an octal number
-(default value is ``022``).
+Umask to use when daemonizing. The value is interpreted as an octal number
+(default value is ``0o22``).
Example usage::
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 5b477fc525..7452801276 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1114,13 +1114,13 @@ FILE_UPLOAD_PERMISSIONS
Default: ``None``
-The numeric mode (i.e. ``0644``) to set newly uploaded files to. For
+The numeric mode (i.e. ``0o644``) to set newly uploaded files to. For
more information about what these modes mean, see the documentation for
:func:`os.chmod`.
If this isn't given or is ``None``, you'll get operating-system
dependent behavior. On most platforms, temporary files will have a mode
-of ``0600``, and files saved from memory will be saved using the
+of ``0o600``, and files saved from memory will be saved using the
system's standard umask.
.. warning::
diff --git a/docs/releases/1.5-alpha-1.txt b/docs/releases/1.5-alpha-1.txt
index 2588b85306..f77b11fbe5 100644
--- a/docs/releases/1.5-alpha-1.txt
+++ b/docs/releases/1.5-alpha-1.txt
@@ -559,7 +559,7 @@ Miscellaneous
* Uploaded files are no longer created as executable by default. If you need
them to be executable change :setting:`FILE_UPLOAD_PERMISSIONS` to your
- needs. The new default value is ``0666`` (octal) and the current umask value
+ needs. The new default value is ``0o666`` (octal) and the current umask value
is first masked out.
* The :ref:`F() expressions <query-expressions>` supported bitwise operators by
diff --git a/docs/releases/1.5-beta-1.txt b/docs/releases/1.5-beta-1.txt
index 57b13ea6ce..31b6542ea5 100644
--- a/docs/releases/1.5-beta-1.txt
+++ b/docs/releases/1.5-beta-1.txt
@@ -598,7 +598,7 @@ Miscellaneous
* Uploaded files are no longer created as executable by default. If you need
them to be executable change :setting:`FILE_UPLOAD_PERMISSIONS` to your
- needs. The new default value is ``0666`` (octal) and the current umask value
+ needs. The new default value is ``0o666`` (octal) and the current umask value
is first masked out.
* The :ref:`F() expressions <query-expressions>` supported bitwise operators by
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index 79358b8c13..120ad43168 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -676,7 +676,7 @@ Miscellaneous
* Uploaded files are no longer created as executable by default. If you need
them to be executable change :setting:`FILE_UPLOAD_PERMISSIONS` to your
- needs. The new default value is ``0666`` (octal) and the current umask value
+ needs. The new default value is ``0o666`` (octal) and the current umask value
is first masked out.
* The :ref:`F() expressions <query-expressions>` supported bitwise operators by
diff --git a/docs/topics/http/file-uploads.txt b/docs/topics/http/file-uploads.txt
index 58e16be42c..331fbcf125 100644
--- a/docs/topics/http/file-uploads.txt
+++ b/docs/topics/http/file-uploads.txt
@@ -155,13 +155,13 @@ Three settings control Django's file upload behavior:
most Unix-like systems).
:setting:`FILE_UPLOAD_PERMISSIONS`
- The numeric mode (i.e. ``0644``) to set newly uploaded files to. For
+ The numeric mode (i.e. ``0o644``) to set newly uploaded files to. For
more information about what these modes mean, see the documentation for
:func:`os.chmod`.
If this isn't given or is ``None``, you'll get operating-system
dependent behavior. On most platforms, temporary files will have a mode
- of ``0600``, and files saved from memory will be saved using the
+ of ``0o600``, and files saved from memory will be saved using the
system's standard umask.
For security reasons, these permissions aren't applied to the temporary