From 9b46a5730268f6f22e13cd0a99adada2932f062b Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 18 Mar 2016 15:10:43 +0100 Subject: [PATCH] Doc: fix typos, patch written by Stefan Behnel --- Doc/c-api/memory.rst | 2 +- Doc/using/cmdline.rst | 8 ++++---- Doc/whatsnew/3.6.rst | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst index 17872924801..c2e244202cd 100644 --- a/Doc/c-api/memory.rst +++ b/Doc/c-api/memory.rst @@ -363,7 +363,7 @@ Customize Memory Allocators This function now also works on Python compiled in release mode. On error, the debug hooks now use :mod:`tracemalloc` to get the traceback where a memory block was allocated. The debug hooks now also check - if the GIL is hold when functions of :c:data:`PYMEM_DOMAIN_OBJ` and + if the GIL is held when functions of :c:data:`PYMEM_DOMAIN_OBJ` and :c:data:`PYMEM_DOMAIN_MEM` domains are called. diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 45559825b45..7ff9361ce02 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -639,11 +639,11 @@ conflict. * ``debug``: install debug hooks on top of the default memory allocator * ``malloc_debug``: same as ``malloc`` but also install debug hooks - * ``pymalloc_debug``: same as ``pyalloc`` but also install debug hooks + * ``pymalloc_debug``: same as ``pymalloc`` but also install debug hooks - When is compiled in release mode, the default is ``pymalloc``. When Python - is compiled in debug mode, the default is ``pymalloc_debug``: debug hooks - are installed. + When Python is compiled in release mode, the default is ``pymalloc``. When + compiled in debug mode, the default is ``pymalloc_debug`` and the debug hooks + are used automatically. If Python is configured without ``pymalloc`` support, ``pymalloc`` and ``pymalloc_debug`` are not available, the default is ``malloc`` in release diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index 411332fe17b..cc635892d41 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -121,7 +121,7 @@ compiled in release mode using ``PYTHONMALLOC=debug``. Effects of debug hooks: functions of :c:data:`PYMEM_DOMAIN_OBJ` (ex: :c:func:`PyObject_Malloc`) and :c:data:`PYMEM_DOMAIN_MEM` (ex: :c:func:`PyMem_Malloc`) domains are called. -Checking if the GIL is hold is also a new feature of Python 3.6. +Checking if the GIL is held is also a new feature of Python 3.6. See the :c:func:`PyMem_SetupDebugHooks` function for debug hooks on Python memory allocators.