Assorted doc fixes by Florent.
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index a69a0f8..c08c204 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -355,7 +355,7 @@
list comprehension
A compact way to process all or part of the elements in a sequence and
- return a list with the results. ``result = ["0x%02x" % x for x in
+ return a list with the results. ``result = ['{:#04x}'.format(x) for x in
range(256) if x % 2 == 0]`` generates a list of strings containing
even hex numbers (0x..) in the range from 0 to 255. The :keyword:`if`
clause is optional. If omitted, all elements in ``range(256)`` are
@@ -471,7 +471,7 @@
object drops to zero, it is deallocated. Reference counting is
generally not visible to Python code, but it is a key element of the
:term:`CPython` implementation. The :mod:`sys` module defines a
- :func:`getrefcount` function that programmers can call to return the
+ :func:`~sys.getrefcount` function that programmers can call to return the
reference count for a particular object.
__slots__
diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst
index c42f81f..2f7851a 100644
--- a/Doc/library/binascii.rst
+++ b/Doc/library/binascii.rst
@@ -109,11 +109,11 @@
use as a checksum algorithm, it is not suitable for use as a general hash
algorithm. Use as follows::
- print(binascii.crc32("hello world"))
+ print(binascii.crc32(b"hello world"))
# Or, in two pieces:
- crc = binascii.crc32("hello")
- crc = binascii.crc32(" world", crc) & 0xffffffff
- print('crc32 = 0x%08x' % crc)
+ crc = binascii.crc32(b"hello")
+ crc = binascii.crc32(b" world", crc) & 0xffffffff
+ print('crc32 = {:#010x}'.format(crc))
.. note::
To generate the same numeric value across all Python versions and
diff --git a/Doc/library/reprlib.rst b/Doc/library/reprlib.rst
index b529aca..056c5dc 100644
--- a/Doc/library/reprlib.rst
+++ b/Doc/library/reprlib.rst
@@ -129,5 +129,5 @@
return repr(obj)
aRepr = MyRepr()
- print aRepr.repr(sys.stdin) # prints '<stdin>'
+ print(aRepr.repr(sys.stdin)) # prints '<stdin>'
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index f43b71a..d2fb5f9 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1907,7 +1907,7 @@
.. describe:: iter(d)
Return an iterator over the keys of the dictionary. This is a shortcut
- for :meth:`iterkeys`.
+ for ``iter(d.keys())``.
.. method:: clear()