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:21:16 +0200
commit08e8e2137db9381d473f6c5b6b1d4240c47b7414 (patch)
tree4448b86ca0c2ff3b2dfa1fcf8f3c1d802ee22845 /docs
parentd1c08d4758998318eb1a881a3963b63bc89435b8 (diff)
[1.7.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.txt2
-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, 8 insertions, 8 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index cde99c037d..442ddad14d 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -826,7 +826,7 @@ Write stderr to the *FILE* file.
``umask=UMASK``
Umask to use when daemonizing. The value is interpreted as an octal number
-(default value is ``022``).
+(default value is ``0o22``).
Example usage::
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index a5acc69b12..8ea298e12d 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1310,13 +1310,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.
This setting also determines the default permissions for collected static files
diff --git a/docs/releases/1.5-alpha-1.txt b/docs/releases/1.5-alpha-1.txt
index ac539e1dd0..06a0c2728d 100644
--- a/docs/releases/1.5-alpha-1.txt
+++ b/docs/releases/1.5-alpha-1.txt
@@ -558,7 +558,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 :class:`F expressions <django.db.models.F>` supported bitwise operators
diff --git a/docs/releases/1.5-beta-1.txt b/docs/releases/1.5-beta-1.txt
index 89ca1a2b14..74f564c360 100644
--- a/docs/releases/1.5-beta-1.txt
+++ b/docs/releases/1.5-beta-1.txt
@@ -597,7 +597,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 :class:`F expressions <django.db.models.F>` supported bitwise operators by
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index 491f0463dc..54aff2104e 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -675,7 +675,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 :class:`F expressions <django.db.models.F>` supported bitwise operators by
diff --git a/docs/topics/http/file-uploads.txt b/docs/topics/http/file-uploads.txt
index 7e00af957c..81d7ba043d 100644
--- a/docs/topics/http/file-uploads.txt
+++ b/docs/topics/http/file-uploads.txt
@@ -185,13 +185,13 @@ There are a few settings which 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