diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-11-05 21:42:45 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-11-05 21:42:45 (GMT) |
| commit | 65676e407cd4beecf9ea482ae68926bff8329049 (patch) | |
| tree | 935517a783edf601d253b2b98ca4f6d641e65d06 /Doc | |
| parent | bd587059a6270aa58f594cd9bbfebc7e2510602a (diff) | |
| download | cpython-65676e407cd4beecf9ea482ae68926bff8329049.zip cpython-65676e407cd4beecf9ea482ae68926bff8329049.tar.gz cpython-65676e407cd4beecf9ea482ae68926bff8329049.tar.bz2 | |
Merged revisions 67089,67091,67101 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67089 | benjamin.peterson | 2008-11-03 14:43:20 -0600 (Mon, 03 Nov 2008) | 1 line
clarify by splitting into multiple paragraphs
........
r67091 | benjamin.peterson | 2008-11-03 16:34:57 -0600 (Mon, 03 Nov 2008) | 1 line
move a FileIO test to test_fileio
........
r67101 | georg.brandl | 2008-11-04 14:49:35 -0600 (Tue, 04 Nov 2008) | 2 lines
#4167: fix markup glitches.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/select.rst | 8 | ||||
| -rw-r--r-- | Doc/library/socket.rst | 14 |
2 files changed, 13 insertions, 9 deletions
diff --git a/Doc/library/select.rst b/Doc/library/select.rst index 8b466cf..48e289a 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -355,7 +355,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2 Filter specific flags - *:const:`KQ_FILTER_READ` and :const:`KQ_FILTER_WRITE` filter flags* + :const:`KQ_FILTER_READ` and :const:`KQ_FILTER_WRITE` filter flags +----------------------------+--------------------------------------------+ | Constant | Meaning | @@ -364,7 +364,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2 +----------------------------+--------------------------------------------+ - *:const:`KQ_FILTER_VNODE` filter flags* + :const:`KQ_FILTER_VNODE` filter flags +----------------------------+--------------------------------------------+ | Constant | Meaning | @@ -385,7 +385,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2 +----------------------------+--------------------------------------------+ - *:const:`KQ_FILTER_PROC` filter flags* + :const:`KQ_FILTER_PROC` filter flags +----------------------------+--------------------------------------------+ | Constant | Meaning | @@ -408,7 +408,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2 | :const:`KQ_NOTE_TRACKERR` | unable to attach to a child | +----------------------------+--------------------------------------------+ - *:const:`KQ_FILTER_NETDEV` filter flags* [not available on Mac OS X] + :const:`KQ_FILTER_NETDEV` filter flags [not available on Mac OS X] +----------------------------+--------------------------------------------+ | Constant | Meaning | diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index 620d08e..536b3c5 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -260,11 +260,15 @@ The module :mod:`socket` exports the following constants and functions: .. function:: gethostname() Return a string containing the hostname of the machine where the Python - interpreter is currently executing. If you want to know the current machine's IP - address, you may want to use ``gethostbyname(gethostname())``. This operation - assumes that there is a valid address-to-host mapping for the host, and the - assumption does not always hold. Note: :func:`gethostname` doesn't always return - the fully qualified domain name; use ``getfqdn()`` (see above). + interpreter is currently executing. + + If you want to know the current machine's IP address, you may want to use + ``gethostbyname(gethostname())``. This operation assumes that there is a + valid address-to-host mapping for the host, and the assumption does not + always hold. + + Note: :func:`gethostname` doesn't always return the fully qualified domain + name; use ``getfqdn()`` (see above). .. function:: gethostbyaddr(ip_address) |