diff options
| author | Éric Araujo <merwok@netwok.org> | 2010-12-16 03:16:29 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2010-12-16 03:16:29 (GMT) |
| commit | 3efdf0630b9c809dd775039917fb2556a82d14f2 (patch) | |
| tree | f9be5b3fb8fbe85946d20b8130e0d5318a6514c5 /Doc/library/codecs.rst | |
| parent | b7ae2095d0e3589f470116b613133d4cf4425068 (diff) | |
| download | cpython-3efdf0630b9c809dd775039917fb2556a82d14f2.zip cpython-3efdf0630b9c809dd775039917fb2556a82d14f2.tar.gz cpython-3efdf0630b9c809dd775039917fb2556a82d14f2.tar.bz2 | |
Merged revisions 86521,86632,86823-86824,87294,87296,87300,87302 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86521 | eric.araujo | 2010-11-18 17:38:46 +0100 (jeu., 18 nov. 2010) | 17 lines
Fix usage of :option: in the docs (#9312).
:option: is used to create a link to an option of python, not to mark
up any instance of any arbitrary command-line option. These were
changed to ````.
For modules which do have a command-line interface, lists of options
have been properly marked up with the program/cmdoption directives
combo. Options defined in such blocks can be linked to with :option:
later in the same file, they won’t link to an option of python.
Finally, the markup of command-line fragments in optparse.rst has
been cleaned to use ``x`` instead of ``"x"``, keeping that latter
form for actual Python strings.
Patch by Eli Bendersky and Éric Araujo.
........
r86632 | eric.araujo | 2010-11-21 04:09:17 +0100 (dim., 21 nov. 2010) | 2 lines
Style edits in followup to r86521 (#9312)
........
r86823 | eric.araujo | 2010-11-27 00:31:07 +0100 (sam., 27 nov. 2010) | 2 lines
Use link-generating markup (see #9312)
........
r86824 | eric.araujo | 2010-11-27 00:46:18 +0100 (sam., 27 nov. 2010) | 2 lines
Rewrap long lines + minor edits
........
r87294 | eric.araujo | 2010-12-16 01:07:01 +0100 (jeu., 16 déc. 2010) | 2 lines
No need to generate a link for something that’s just above.
........
r87296 | eric.araujo | 2010-12-16 01:23:30 +0100 (jeu., 16 déc. 2010) | 2 lines
Advertise “python -m” instead of direct filename.
........
r87300 | eric.araujo | 2010-12-16 02:40:26 +0100 (jeu., 16 déc. 2010) | 2 lines
Advertise “python -m test” over test.regrtest (r87296 followup)
........
r87302 | eric.araujo | 2010-12-16 03:10:11 +0100 (jeu., 16 déc. 2010) | 2 lines
Add versionadded directive missing from r78983.
........
Diffstat (limited to 'Doc/library/codecs.rst')
| -rw-r--r-- | Doc/library/codecs.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index b495c6f..8a93f3a 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -788,7 +788,7 @@ Encodings and Unicode Strings are stored internally as sequences of codepoints (to be precise as :ctype:`Py_UNICODE` arrays). Depending on the way Python is compiled (either -via :option:`--without-wide-unicode` or :option:`--with-wide-unicode`, with the +via ``--without-wide-unicode`` or ``--with-wide-unicode``, with the former being the default) :ctype:`Py_UNICODE` is either a 16-bit or 32-bit data type. Once a string object is used outside of CPU and memory, CPU endianness and how these arrays are stored as bytes become an issue. Transforming a |