[Py-howto-checkins] CVS: pyhowto python-22.tex,1.6,1.7

[A.M. K. <aku...@us...>]

Update of /cvsroot/py-howto/pyhowto
In directory usw-pr-cvs1:/tmp/cvs-serv28776

Modified Files:
	python-22.tex 
Log Message:
Use \verb for configure switches, because inside \code multiple dashes
   are merged to a single hyphen.
Delete forgotten CVS conflict marker


Index: python-22.tex
===================================================================
RCS file: /cvsroot/py-howto/pyhowto/python-22.tex,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** python-22.tex	2001/07/16 13:39:08	1.6
--- python-22.tex	2001/07/16 13:45:31	1.7
***************
*** 321,325 ****
  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
! by supplying \code{--enable-unicode=ucs4} to the configure script.
  
  XXX explain surrogates?  I have to figure out what the changes mean to users.
--- 321,325 ----
  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
! by supplying \verb|--enable-unicode=ucs4| to the configure script.
  
  XXX explain surrogates?  I have to figure out what the changes mean to users.
***************
*** 454,458 ****
  used in most Python code (and when it is used, it's often a sign of a
  poor design anyway).
- =======
  %\end{seealso}
  
--- 454,457 ----
***************
*** 499,503 ****
  
    \item The \module{socket} module can be compiled to support IPv6;
!   specify the \code{--enable-ipv6} option to Python's configure
    script.  (Contributed by Jun-ichiro ``itojun'' Hagino.)
  
--- 498,502 ----
  
    \item The \module{socket} module can be compiled to support IPv6;
!   specify the \code|--enable-ipv6| option to Python's configure
    script.  (Contributed by Jun-ichiro ``itojun'' Hagino.)