diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-04-24 00:42:52 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-04-24 00:42:52 (GMT) |
| commit | fbeb1a94681d9921e9169e991504584eef4501a9 (patch) | |
| tree | 63d9b157bb0b0783862c5f7da49d5eeff219fdf9 /Doc | |
| parent | cae1be85f5ac78a7ec73d129ca46cdfc5c5a5ad9 (diff) | |
| parent | 5348b63a91e3517116fcef2a9e7019b640aa6c9f (diff) | |
| download | cpython-fbeb1a94681d9921e9169e991504584eef4501a9.zip cpython-fbeb1a94681d9921e9169e991504584eef4501a9.tar.gz cpython-fbeb1a94681d9921e9169e991504584eef4501a9.tar.bz2 | |
Merge 3.1
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/distutils/examples.rst | 2 | ||||
| -rw-r--r-- | Doc/library/json.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst index e31ff72..b268486 100644 --- a/Doc/distutils/examples.rst +++ b/Doc/distutils/examples.rst @@ -279,7 +279,7 @@ For example, if the :file:`setup.py` script is changed like this:: Where the long description is broken, ``check`` will be able to detect it by using the :mod:`docutils` parser:: - $ pythontrunk setup.py check --restructuredtext + $ python setup.py check --restructuredtext running check warning: check: Title underline too short. (line 2) warning: check: Could not finish the parsing. diff --git a/Doc/library/json.rst b/Doc/library/json.rst index dcd6973..4ee17f2 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -34,7 +34,7 @@ Encoding basic Python object hierarchies:: Compact encoding:: >>> import json - >>> json.dumps([1,2,3,{'4': 5, '6': 7}], separators=(',',':')) + >>> json.dumps([1,2,3,{'4': 5, '6': 7}], separators=(',', ':')) '[1,2,3,{"4":5,"6":7}]' Pretty printing:: |