diff options
| author | Georg Brandl <georg@python.org> | 2012-08-11 06:43:59 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-08-11 06:43:59 (GMT) |
| commit | a81b481e3a49fe34ed9bfa0c03a39b2c522ecebc (patch) | |
| tree | 486491d675db018983fbc7882ff72e562bb0ff6e /Doc | |
| parent | 80dd1af4e0ee07b2f65833835754f0a27bf48975 (diff) | |
| download | cpython-a81b481e3a49fe34ed9bfa0c03a39b2c522ecebc.zip cpython-a81b481e3a49fe34ed9bfa0c03a39b2c522ecebc.tar.gz cpython-a81b481e3a49fe34ed9bfa0c03a39b2c522ecebc.tar.bz2 | |
Fix markup errors and update pydoc topics.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/reference/import.rst | 2 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/susp-ignored.csv | 18 | ||||
| -rw-r--r-- | Doc/whatsnew/3.3.rst | 2 |
3 files changed, 20 insertions, 2 deletions
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst index 9eb093c..a7daa18 100644 --- a/Doc/reference/import.rst +++ b/Doc/reference/import.rst @@ -358,7 +358,7 @@ Loaders must satisfy the following requirements: iterable, but may be empty if ``__path__`` has no further significance to the importer. If ``__path__`` is not empty, it must produce strings when iterated over. More details on the semantics of ``__path__`` are - given :ref`below <package-path-rules>`. + given :ref:`below <package-path-rules>`. * The ``__loader__`` attribute must be set to the loader object that loaded the module. This is mostly for introspection and reloading, but can be diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv index 8ce478a..703e539 100644 --- a/Doc/tools/sphinxext/susp-ignored.csv +++ b/Doc/tools/sphinxext/susp-ignored.csv @@ -64,6 +64,10 @@ howto/ipaddress,,:ffff,IPv6Address('::ffff:ffff') howto/ipaddress,,::,IPv6Address('2001::1') howto/ipaddress,,::,IPv6Address('2001::ffff:ffff') howto/ipaddress,,:ffff,IPv6Address('2001::ffff:ffff') +howto/ipaddress,,:db8,'2001:db8::' +howto/ipaddress,,::,'2001:db8::' +howto/ipaddress,,:db8,'2001:db8::/96' +howto/ipaddress,,::,'2001:db8::/96' howto/logging,,:And,"WARNING:And this, too" howto/logging,,:And,"WARNING:root:And this, too" howto/logging,,:Doing,INFO:root:Doing something @@ -151,6 +155,20 @@ library/ipaddress,,:ffff,IPv6Address('ffff:ffff:ffff:ffff:ffff:ffff::') library/ipaddress,,::,IPv6Address('ffff:ffff:ffff:ffff:ffff:ffff::') library/ipaddress,,:db8,">>> ipaddress.IPv6Network('2001:db8::1000/96', strict=False)" library/ipaddress,,::,">>> ipaddress.IPv6Network('2001:db8::1000/96', strict=False)" +library/ipaddress,,::,"""::abc:7:def""" +library/ipaddress,,:def,"""::abc:7:def""" +library/ipaddress,,::,::FFFF/96 +library/ipaddress,,::,2002::/16 +library/ipaddress,,::,2001::/32 +library/ipaddress,,::,>>> str(ipaddress.IPv6Address('::1')) +library/ipaddress,,::,'::1' +library/ipaddress,,::,>>> int(ipaddress.IPv6Address('::1')) +library/ipaddress,,:ff00,ffff:ff00:: +library/ipaddress,,:db00,2001:db00::0/24 +library/ipaddress,,::,2001:db00::0/24 +library/ipaddress,,:db00,2001:db00::0/ffff:ff00:: +library/ipaddress,,::,2001:db00::0/ffff:ff00:: +library/ipaddress,,:ff00,2001:db00::0/ffff:ff00:: library/itertools,,:step,elements from seq[start:stop:step] library/itertools,,:stop,elements from seq[start:stop:step] library/linecache,,:sys,"sys:x:3:3:sys:/dev:/bin/sh" diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst index a64424d..17f8fde 100644 --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1135,7 +1135,7 @@ gc -- It is now possible to register callbacks invoked by the garbage collector -before and after collection using the new :`data:`~gc.callbacks` list. +before and after collection using the new :data:`~gc.callbacks` list. hmac |