diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-09-07 15:30:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 15:30:33 (GMT) |
| commit | 5e922658fb55734bf8b4c6246033ea93af172ff7 (patch) | |
| tree | b83f43142e5f66a389b5c611fbc7ea164ba6bcaa /Doc | |
| parent | 012f5b968a738b15ae9b40c499a1c0778b0615a9 (diff) | |
| download | cpython-5e922658fb55734bf8b4c6246033ea93af172ff7.zip cpython-5e922658fb55734bf8b4c6246033ea93af172ff7.tar.gz cpython-5e922658fb55734bf8b4c6246033ea93af172ff7.tar.bz2 | |
bpo-34605: Avoid master/slave terms (GH-9101)
* Replace "master process" with "parent process"
* Replace "master option mappings" with "main option mappings"
* Replace "master pattern object" with "main pattern object"
* ssl: replace "master" with "server"
* And some other similar changes
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/gc.rst | 2 | ||||
| -rw-r--r-- | Doc/library/multiprocessing.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/gc.rst b/Doc/library/gc.rst index 153d8fb..722a0e8 100644 --- a/Doc/library/gc.rst +++ b/Doc/library/gc.rst @@ -181,7 +181,7 @@ The :mod:`gc` module provides the following functions: fork() call to make the gc copy-on-write friendly or to speed up collection. Also collection before a POSIX fork() call may free pages for future allocation which can cause copy-on-write too so it's advised to disable gc - in master process and freeze before fork and enable gc in child process. + in parent process and freeze before fork and enable gc in child process. .. versionadded:: 3.7 diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 504f3a1..a7d26f9 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -435,7 +435,7 @@ process which created it. (If you try this it will actually output three full tracebacks interleaved in a semi-random fashion, and then you may have to - stop the master process somehow.) + stop the parent process somehow.) Reference |