Use \verb for configure switches, because inside \code multiple dashes
are merged to a single hyphen. Delete forgotten CVS conflict marker
This commit is contained in:
parent
2cd712b812
commit
ced2366a05
@ -320,7 +320,7 @@ Schemenauer, with fixes from the Python Labs crew.}
|
|||||||
Python's Unicode support has been enhanced a bit in 2.2. Unicode
|
Python's Unicode support has been enhanced a bit in 2.2. Unicode
|
||||||
strings are usually stored as UCS-2, as 16-bit unsigned integers.
|
strings are usually stored as UCS-2, as 16-bit unsigned integers.
|
||||||
Python 2.2 can also be compiled to use UCS-4, 32-bit unsigned integers
|
Python 2.2 can also be compiled to use UCS-4, 32-bit unsigned integers
|
||||||
by supplying \code{--enable-unicode=ucs4} to the configure script.
|
by supplying \verb|--enable-unicode=ucs4| to the configure script.
|
||||||
|
|
||||||
XXX explain surrogates? I have to figure out what the changes mean to users.
|
XXX explain surrogates? I have to figure out what the changes mean to users.
|
||||||
|
|
||||||
@ -453,7 +453,6 @@ whose value should be accessed by \function{g()}.
|
|||||||
This shouldn't be much of a limitation, since \keyword{exec} is rarely
|
This shouldn't be much of a limitation, since \keyword{exec} is rarely
|
||||||
used in most Python code (and when it is used, it's often a sign of a
|
used in most Python code (and when it is used, it's often a sign of a
|
||||||
poor design anyway).
|
poor design anyway).
|
||||||
=======
|
|
||||||
%\end{seealso}
|
%\end{seealso}
|
||||||
|
|
||||||
\begin{seealso}
|
\begin{seealso}
|
||||||
@ -498,7 +497,7 @@ items = s.meerkat.getItems( {'channel': 4} )
|
|||||||
See \url{http://www.xmlrpc.com} for more information about XML-RPC.
|
See \url{http://www.xmlrpc.com} for more information about XML-RPC.
|
||||||
|
|
||||||
\item The \module{socket} module can be compiled to support IPv6;
|
\item The \module{socket} module can be compiled to support IPv6;
|
||||||
specify the \code{--enable-ipv6} option to Python's configure
|
specify the \code|--enable-ipv6| option to Python's configure
|
||||||
script. (Contributed by Jun-ichiro ``itojun'' Hagino.)
|
script. (Contributed by Jun-ichiro ``itojun'' Hagino.)
|
||||||
|
|
||||||
\item Two new format characters were added to the \module{struct}
|
\item Two new format characters were added to the \module{struct}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user