diff options
| author | Georg Brandl <georg@python.org> | 2013-03-28 13:28:55 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-03-28 13:28:55 +0100 |
| commit | 1bab7134a8d2e431ccca11a45ba4acb4203db495 (patch) | |
| tree | 0d65ff15a549ddf8d5a815c7c66b7e1f1f58263d /Doc/reference | |
| parent | 8cb15bf6ff32b6d9faee29efaae43334fe019360 (diff) | |
| parent | 44ea77bd817c0b50e01344b7e8758995aaeebb63 (diff) | |
| download | cpython-git-1bab7134a8d2e431ccca11a45ba4acb4203db495.tar.gz | |
Merge with 3.3.
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/datamodel.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/expressions.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/import.rst | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 9a39eb416a..4f9b8b0915 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -448,6 +448,8 @@ Callable types Special attributes: + .. tabularcolumns:: |l|L|l| + +-------------------------+-------------------------------+-----------+ | Attribute | Meaning | | +=========================+===============================+===========+ diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index f88709efe4..c866f8493d 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -1335,7 +1335,7 @@ groups from right to left). | :keyword:`not` ``x`` | Boolean NOT | +-----------------------------------------------+-------------------------------------+ | :keyword:`in`, :keyword:`not in`, | Comparisons, including membership | -| :keyword:`is`, :keyword:`is not`, ``<``, | tests and identity tests, | +| :keyword:`is`, :keyword:`is not`, ``<``, | tests and identity tests | | ``<=``, ``>``, ``>=``, ``!=``, ``==`` | | +-----------------------------------------------+-------------------------------------+ | ``|`` | Bitwise OR | diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst index ee1538feb4..4ad44901ad 100644 --- a/Doc/reference/import.rst +++ b/Doc/reference/import.rst @@ -687,8 +687,7 @@ proposed ``__name__`` for semantics :pep:`366` would eventually specify for :pep:`338` defines executing modules as scripts. -Footnotes -========= +.. rubric:: Footnotes .. [#fnmo] See :class:`types.ModuleType`. |