mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-27 16:57:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 83160-83161,83166,83169,83171 via svnmerge from

Browse source 
svn+ssh://svn.python.org/python/branches/py3k

........
  r83160 | georg.brandl | 2010-07-26 10:51:42 +0200 (Mo, 26 Jul 2010) | 1 line

  #9381: fix markup.
........
  r83161 | georg.brandl | 2010-07-26 11:33:12 +0200 (Mo, 26 Jul 2010) | 1 line

  Add Brian Quinlan.
........
  r83166 | georg.brandl | 2010-07-26 17:11:49 +0200 (Mo, 26 Jul 2010) | 1 line

  Fix grammar.
........
  r83169 | georg.brandl | 2010-07-26 19:09:32 +0200 (Mo, 26 Jul 2010) | 1 line

  Add Reid.
........
  r83171 | georg.brandl | 2010-07-26 23:12:13 +0200 (Mo, 26 Jul 2010) | 1 line

  Clarify.
........
This commit is contained in:
Georg Brandl 2010-08-01 21:23:10 +00:00
parent 80ff50a35d
commit ec18c395ea
4 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/c-api/unicode.rst
View file

@ -358,7 +358,7 @@ To encode and decode file names and other environment strings,
:cdata:`Py_FileSystemEncoding` should be used as the encoding, and
``"surrogateescape"`` should be used as the error handler (:pep:`383`). To
encode file names during argument parsing, the ``"O&"`` converter should be
used, passsing :func:PyUnicode_FSConverter as the conversion function:
used, passsing :func:`PyUnicode_FSConverter` as the conversion function:
.. cfunction:: int PyUnicode_FSConverter(PyObject* obj, void* result)

4
Doc/documenting/markup.rst
View file

@ -200,8 +200,8 @@ The directives are:
.. describe:: cmdoption
Describes a command line option or switch. Option argument names should be
enclosed in angle brackets. Example::
Describes a Python command line option or switch. Option argument names
should be enclosed in angle brackets. Example::
.. cmdoption:: -m <module>

4
Doc/install/index.rst
View file

@ -314,8 +314,8 @@ The idea behind the "home scheme" is that you build and maintain a personal
stash of Python modules. This scheme's name is derived from the idea of a
"home" directory on Unix, since it's not unusual for a Unix user to make their
home directory have a layout similar to :file:`/usr/` or :file:`/usr/local/`.
This scheme can be used by anyone, regardless of the operating system their
installing for.
This scheme can be used by anyone, regardless of the operating system they
are installing for.
Installing a new module distribution is as simple as ::