summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-03-23 15:57:51 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-03-23 15:57:51 (GMT)
commitd1700a9360e55f05b2dec5654353bbd947ba19e8 (patch)
treea61d6564cc9bb5bbef6e72e9f66cfb9007c193a7 /Doc
parent1c3069aed6098804f3ce4c810e07dbd02fc797c8 (diff)
downloadcpython-d1700a9360e55f05b2dec5654353bbd947ba19e8.zip
cpython-d1700a9360e55f05b2dec5654353bbd947ba19e8.tar.gz
cpython-d1700a9360e55f05b2dec5654353bbd947ba19e8.tar.bz2
Fix typo in doc: avoid the french "& cie" :-)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/memory.rst2
-rw-r--r--Doc/using/cmdline.rst8
2 files changed, 5 insertions, 5 deletions
diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index c2e2442..bd0bc12 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -378,7 +378,7 @@ with a fixed size of 256 KB. 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_OBJ` domain
-(:c:func:`PyObject_Malloc` & cie).
+(ex: :c:func:`PyObject_Malloc`).
The arena allocator uses the following functions:
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 7ff9361..c1c700c 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -628,12 +628,12 @@ conflict.
Set the family of memory allocators used by Python:
* ``malloc``: use the :c:func:`malloc` function of the C library
- for all Python memory allocators (:c:func:`PyMem_RawMalloc`,
- :c:func:`PyMem_Malloc`, :c:func:`PyObject_Malloc` & cie).
+ for all Python memory allocators (ex: :c:func:`PyMem_RawMalloc`,
+ :c:func:`PyMem_Malloc` and :c:func:`PyObject_Malloc`).
* ``pymalloc``: :c:func:`PyObject_Malloc`, :c:func:`PyObject_Calloc` and
:c:func:`PyObject_Realloc` use the :ref:`pymalloc allocator <pymalloc>`.
- Other Python memory allocators (:c:func:`PyMem_RawMalloc`,
- :c:func:`PyMem_Malloc` & cie) use :c:func:`malloc`.
+ Other Python memory allocators (ex: :c:func:`PyMem_RawMalloc` and
+ :c:func:`PyMem_Malloc`) use :c:func:`malloc`.
Install debug hooks: