Permalink
Browse files

[1.7.x] Fixed #23097 -- Switched to new octal format in docs

Backport of e1c8516 from master.
  • Loading branch information...
David Hoffman authored and claudep committed Jul 26, 2014
1 parent d1c08d4 commit 08e8e2137db9381d473f6c5b6b1d4240c47b7414
@@ -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::
View
@@ -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
@@ -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
@@ -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
View
@@ -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
@@ -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

0 comments on commit 08e8e21

Please sign in to comment.