From 2630cafc86bf6cc86ec8b47f0074b42f45b1f944 Mon Sep 17 00:00:00 2001 From: David Hoffman Date: Fri, 25 Jul 2014 21:34:13 -0400 Subject: [PATCH] [1.6.x] Fixed #23097 -- Switched to new octal format in docs Backport of e1c85167a3 from master. --- docs/ref/django-admin.txt | 4 ++-- docs/ref/settings.txt | 4 ++-- docs/releases/1.5-alpha-1.txt | 2 +- docs/releases/1.5-beta-1.txt | 2 +- docs/releases/1.5.txt | 2 +- docs/topics/http/file-uploads.txt | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 1ae6f4e176e..fe530598cdf 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 5b477fc5250..7452801276e 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 2588b853067..f77b11fbe52 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 ` supported bitwise operators by diff --git a/docs/releases/1.5-beta-1.txt b/docs/releases/1.5-beta-1.txt index 57b13ea6cea..31b6542ea59 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 ` supported bitwise operators by diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt index 79358b8c137..120ad431682 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 ` supported bitwise operators by diff --git a/docs/topics/http/file-uploads.txt b/docs/topics/http/file-uploads.txt index 58e16be42c7..331fbcf1255 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