From e1c85167a3de7adf51105d5f0751b39fa0d49ba7 Mon Sep 17 00:00:00 2001 From: David Hoffman Date: Fri, 25 Jul 2014 21:34:13 -0400 Subject: [PATCH] Fixed #23097 -- Switched to new octal format in docs --- docs/ref/django-admin.txt | 2 +- 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, 8 insertions(+), 8 deletions(-) diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index b2d2f443668..7d40347079e 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -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:: diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index cf64015d04e..c0f69096ee9 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -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 diff --git a/docs/releases/1.5-alpha-1.txt b/docs/releases/1.5-alpha-1.txt index ac539e1dd0b..06a0c2728d4 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 ` supported bitwise operators diff --git a/docs/releases/1.5-beta-1.txt b/docs/releases/1.5-beta-1.txt index 89ca1a2b141..74f564c3602 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 ` supported bitwise operators by diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt index 491f0463dc3..54aff2104ed 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 ` supported bitwise operators by diff --git a/docs/topics/http/file-uploads.txt b/docs/topics/http/file-uploads.txt index 7e00af957cc..81d7ba043dc 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