mirror of
				https://github.com/django/django.git
				synced 2025-10-28 16:16:12 +00:00 
			
		
		
		
	[1.6.x] Fixed #23097 -- Switched to new octal format in docs
Backport of e1c85167a3 from master.
			
			
This commit is contained in:
		
				
					committed by
					
						 Claude Paroz
						Claude Paroz
					
				
			
			
				
	
			
			
			
						parent
						
							ae5a4668be
						
					
				
				
					commit
					2630cafc86
				
			| @@ -687,8 +687,8 @@ Write stderr to the *FILE* file. | |||||||
|  |  | ||||||
| ``umask=UMASK`` | ``umask=UMASK`` | ||||||
|  |  | ||||||
| Umask to use when daemonizing. The value is interpeted as an octal number | Umask to use when daemonizing. The value is interpreted as an octal number | ||||||
| (default value is ``022``). | (default value is ``0o22``). | ||||||
|  |  | ||||||
| Example usage:: | Example usage:: | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1114,13 +1114,13 @@ FILE_UPLOAD_PERMISSIONS | |||||||
|  |  | ||||||
| Default: ``None`` | 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 | more information about what these modes mean, see the documentation for | ||||||
| :func:`os.chmod`. | :func:`os.chmod`. | ||||||
|  |  | ||||||
| If this isn't given or is ``None``, you'll get operating-system | If this isn't given or is ``None``, you'll get operating-system | ||||||
| dependent behavior. On most platforms, temporary files will have a mode | 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. | system's standard umask. | ||||||
|  |  | ||||||
| .. warning:: | .. warning:: | ||||||
|   | |||||||
| @@ -559,7 +559,7 @@ Miscellaneous | |||||||
|  |  | ||||||
| * Uploaded files are no longer created as executable by default. If you need | * Uploaded files are no longer created as executable by default. If you need | ||||||
|   them to be executable change :setting:`FILE_UPLOAD_PERMISSIONS` to your |   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. |   is first masked out. | ||||||
|  |  | ||||||
| * The :ref:`F() expressions <query-expressions>` supported bitwise operators by | * The :ref:`F() expressions <query-expressions>` supported bitwise operators by | ||||||
|   | |||||||
| @@ -598,7 +598,7 @@ Miscellaneous | |||||||
|  |  | ||||||
| * Uploaded files are no longer created as executable by default. If you need | * Uploaded files are no longer created as executable by default. If you need | ||||||
|   them to be executable change :setting:`FILE_UPLOAD_PERMISSIONS` to your |   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. |   is first masked out. | ||||||
|  |  | ||||||
| * The :ref:`F() expressions <query-expressions>` supported bitwise operators by | * The :ref:`F() expressions <query-expressions>` supported bitwise operators by | ||||||
|   | |||||||
| @@ -676,7 +676,7 @@ Miscellaneous | |||||||
|  |  | ||||||
| * Uploaded files are no longer created as executable by default. If you need | * Uploaded files are no longer created as executable by default. If you need | ||||||
|   them to be executable change :setting:`FILE_UPLOAD_PERMISSIONS` to your |   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. |   is first masked out. | ||||||
|  |  | ||||||
| * The :ref:`F() expressions <query-expressions>` supported bitwise operators by | * The :ref:`F() expressions <query-expressions>` supported bitwise operators by | ||||||
|   | |||||||
| @@ -155,13 +155,13 @@ Three settings control Django's file upload behavior: | |||||||
|     most Unix-like systems). |     most Unix-like systems). | ||||||
|  |  | ||||||
| :setting:`FILE_UPLOAD_PERMISSIONS` | :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 |     more information about what these modes mean, see the documentation for | ||||||
|     :func:`os.chmod`. |     :func:`os.chmod`. | ||||||
|  |  | ||||||
|     If this isn't given or is ``None``, you'll get operating-system |     If this isn't given or is ``None``, you'll get operating-system | ||||||
|     dependent behavior. On most platforms, temporary files will have a mode |     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. |     system's standard umask. | ||||||
|  |  | ||||||
|     For security reasons, these permissions aren't applied to the temporary |     For security reasons, these permissions aren't applied to the temporary | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user