diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/c-api/memory.rst | 2 | ||||
| -rw-r--r-- | Doc/library/hashlib.rst | 2 | ||||
| -rw-r--r-- | Doc/library/locale.rst | 2 | ||||
| -rw-r--r-- | Doc/library/multiprocessing.rst | 4 | ||||
| -rw-r--r-- | Doc/tools/templates/download.html | 18 |
5 files changed, 14 insertions, 14 deletions
diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst index 0a5b0ef44b..4b1e666ef3 100644 --- a/Doc/c-api/memory.rst +++ b/Doc/c-api/memory.rst @@ -450,7 +450,7 @@ The pymalloc allocator Python has a *pymalloc* allocator optimized for small objects (smaller or equal to 512 bytes) with a short lifetime. It uses memory mappings called "arenas" -with a fixed size of 256 KB. It falls back to :c:func:`PyMem_RawMalloc` and +with a fixed size of 256 KiB. It falls back to :c:func:`PyMem_RawMalloc` and :c:func:`PyMem_RawRealloc` for allocations larger than 512 bytes. *pymalloc* is the default allocator of the :c:data:`PYMEM_DOMAIN_MEM` (ex: diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index 3a27a5b566..452705f4d2 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -267,7 +267,7 @@ include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_. should be about 16 or more bytes from a proper source, e.g. :func:`os.urandom`. *n* is the CPU/Memory cost factor, *r* the block size, *p* parallelization - factor and *maxmem* limits memory (OpenSSL 1.1.0 defaults to 32 MB). + factor and *maxmem* limits memory (OpenSSL 1.1.0 defaults to 32 MiB). *dklen* is the length of the derived key. Availability: OpenSSL 1.1+ diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst index f423d704ca..e8567a7b65 100644 --- a/Doc/library/locale.rst +++ b/Doc/library/locale.rst @@ -373,7 +373,7 @@ The :mod:`locale` module defines the following exception and functions: Please note that this function works like :meth:`format_string` but will only work for exactly one ``%char`` specifier. For example, ``'%f'`` and - ``'%.0f'`` are both valid specifiers, but ``'%f kB'`` is not. + ``'%.0f'`` are both valid specifiers, but ``'%f KiB'`` is not. For whole format strings, use :func:`format_string`. diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 80a87b8590..3619cccfe6 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -1034,7 +1034,7 @@ Connection objects are usually created using :func:`Pipe` -- see also Send an object to the other end of the connection which should be read using :meth:`recv`. - The object must be picklable. Very large pickles (approximately 32 MB+, + The object must be picklable. Very large pickles (approximately 32 MiB+, though it depends on the OS) may raise a :exc:`ValueError` exception. .. method:: recv() @@ -1071,7 +1071,7 @@ Connection objects are usually created using :func:`Pipe` -- see also If *offset* is given then data is read from that position in *buffer*. If *size* is given then that many bytes will be read from buffer. Very large - buffers (approximately 32 MB+, though it depends on the OS) may raise a + buffers (approximately 32 MiB+, though it depends on the OS) may raise a :exc:`ValueError` exception .. method:: recv_bytes([maxlength]) diff --git a/Doc/tools/templates/download.html b/Doc/tools/templates/download.html index d49ebdd14b..1a99b18bbb 100644 --- a/Doc/tools/templates/download.html +++ b/Doc/tools/templates/download.html @@ -18,23 +18,23 @@ in the table are the size of the download files in megabytes.</p> <table class="docutils"> <tr><th>Format</th><th>Packed as .zip</th><th>Packed as .tar.bz2</th></tr> <tr><td>PDF (US-Letter paper size)</td> - <td><a href="{{ dlbase }}/python-{{ release }}-docs-pdf-letter.zip">Download</a> (ca. 13 MB)</td> - <td><a href="{{ dlbase }}/python-{{ release }}-docs-pdf-letter.tar.bz2">Download</a> (ca. 13 MB)</td> + <td><a href="{{ dlbase }}/python-{{ release }}-docs-pdf-letter.zip">Download</a> (ca. 13 MiB)</td> + <td><a href="{{ dlbase }}/python-{{ release }}-docs-pdf-letter.tar.bz2">Download</a> (ca. 13 MiB)</td> </tr> <tr><td>PDF (A4 paper size)</td> - <td><a href="{{ dlbase }}/python-{{ release }}-docs-pdf-a4.zip">Download</a> (ca. 13 MB)</td> - <td><a href="{{ dlbase }}/python-{{ release }}-docs-pdf-a4.tar.bz2">Download</a> (ca. 13 MB)</td> + <td><a href="{{ dlbase }}/python-{{ release }}-docs-pdf-a4.zip">Download</a> (ca. 13 MiB)</td> + <td><a href="{{ dlbase }}/python-{{ release }}-docs-pdf-a4.tar.bz2">Download</a> (ca. 13 MiB)</td> </tr> <tr><td>HTML</td> - <td><a href="{{ dlbase }}/python-{{ release }}-docs-html.zip">Download</a> (ca. 9 MB)</td> - <td><a href="{{ dlbase }}/python-{{ release }}-docs-html.tar.bz2">Download</a> (ca. 6 MB)</td> + <td><a href="{{ dlbase }}/python-{{ release }}-docs-html.zip">Download</a> (ca. 9 MiB)</td> + <td><a href="{{ dlbase }}/python-{{ release }}-docs-html.tar.bz2">Download</a> (ca. 6 MiB)</td> </tr> <tr><td>Plain Text</td> - <td><a href="{{ dlbase }}/python-{{ release }}-docs-text.zip">Download</a> (ca. 3 MB)</td> - <td><a href="{{ dlbase }}/python-{{ release }}-docs-text.tar.bz2">Download</a> (ca. 2 MB)</td> + <td><a href="{{ dlbase }}/python-{{ release }}-docs-text.zip">Download</a> (ca. 3 MiB)</td> + <td><a href="{{ dlbase }}/python-{{ release }}-docs-text.tar.bz2">Download</a> (ca. 2 MiB)</td> </tr> <tr><td>EPUB</td> - <td><a href="{{ dlbase }}/python-{{ release }}-docs.epub">Download</a> (ca. 5.5 MB)</td> + <td><a href="{{ dlbase }}/python-{{ release }}-docs.epub">Download</a> (ca. 5 MiB)</td> <td></td> </tr> </table> |