diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-06-03 07:47:38 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-06-03 07:47:38 (GMT) |
| commit | fde75ae020ec73917aa0ce8c1dfa9768ecbdf364 (patch) | |
| tree | ef3939d063293534d98e1fb985e7c9447d65fd08 | |
| parent | 93ac7ae7d35ad59c4d25cec895edbc81aa5d6239 (diff) | |
| parent | 7ee91942b4c68d0d0ca9db9aace40d4bc918195b (diff) | |
| download | cpython-fde75ae020ec73917aa0ce8c1dfa9768ecbdf364.zip cpython-fde75ae020ec73917aa0ce8c1dfa9768ecbdf364.tar.gz cpython-fde75ae020ec73917aa0ce8c1dfa9768ecbdf364.tar.bz2 | |
Merge heads
| -rw-r--r-- | Doc/library/fcntl.rst | 4 | ||||
| -rw-r--r-- | Doc/library/sqlite3.rst | 5 | ||||
| -rw-r--r-- | Doc/library/termios.rst | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/Doc/library/fcntl.rst b/Doc/library/fcntl.rst index 22f0f25..508c4a5 100644 --- a/Doc/library/fcntl.rst +++ b/Doc/library/fcntl.rst @@ -12,7 +12,9 @@ pair: UNIX; I/O control This module performs file control and I/O control on file descriptors. It is an -interface to the :c:func:`fcntl` and :c:func:`ioctl` Unix routines. +interface to the :c:func:`fcntl` and :c:func:`ioctl` Unix routines. For a +complete description of these calls, see :manpage:`fcntl(2)` and +:manpage:`ioctl(2)` Unix manual pages. All functions in this module take a file descriptor *fd* as their first argument. This can be an integer file descriptor, such as returned by diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst index f6e5384..996e93e 100644 --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -190,6 +190,11 @@ Module functions and constants any combination of :const:`PARSE_DECLTYPES` and :const:`PARSE_COLNAMES` to turn type detection on. + By default, *check_same_thread* is :const:`True` and only the creating thread may + use the connection. If set :const:`False`, the returned connection may be shared + across multiple threads. When using multiple threads with the same connection + writing operations should be serialized by the user to avoid data corruption. + By default, the :mod:`sqlite3` module uses its :class:`Connection` class for the connect call. You can, however, subclass the :class:`Connection` class and make :func:`connect` use your class instead by providing your class for the *factory* diff --git a/Doc/library/termios.rst b/Doc/library/termios.rst index a90a825..d225d94 100644 --- a/Doc/library/termios.rst +++ b/Doc/library/termios.rst @@ -10,10 +10,10 @@ pair: POSIX; I/O control pair: tty; I/O control -This module provides an interface to the POSIX calls for tty I/O control. For a -complete description of these calls, see the POSIX or Unix manual pages. It is -only available for those Unix versions that support POSIX *termios* style tty -I/O control (and then only if configured at installation time). +This module provides an interface to the POSIX calls for tty I/O control. For a +complete description of these calls, see :manpage:`termios(2)` Unix manual +page. It is only available for those Unix versions that support POSIX +*termios* style tty I/O control configured during installation. All functions in this module take a file descriptor *fd* as their first argument. This can be an integer file descriptor, such as returned by |