Skip to content

Commit

Permalink
Fixed #23097 -- Switched to new octal format in docs
Browse files Browse the repository at this point in the history
  • Loading branch information
David Hoffman authored and claudep committed Jul 26, 2014
1 parent 57d2b3f commit e1c8516
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/ref/django-admin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,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::

Expand Down
4 changes: 2 additions & 2 deletions docs/ref/settings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1281,13 +1281,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
Expand Down
2 changes: 1 addition & 1 deletion docs/releases/1.5-alpha-1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/releases/1.5-beta-1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/releases/1.5.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/topics/http/file-uploads.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e1c8516

Please sign in to comment.