Author gvanrossum
Recipients georg.brandl, gvanrossum
Date 2007-11-01.19:48:08
SpamBayes Score 0.355075
Marked as misclassified No
Message-id <1193946491.89.0.831882388568.issue1370@psf.upfronthosting.co.za>
In-reply-to
Content
When merging the trunk into py3k, a large number of Doc changes
appeared, many of which were conflicts.  I checked in the non-Doc
changes, and hope that someone else (Georg?) will do the honors of
sorting through the doc changes.  Here are the diffs of what I left
unsubmitted, with conflict markers intact.  These files have conflicts:

C      Doc/c-api/newtypes.rst
C      Doc/c-api/abstract.rst
C      Doc/reference/compound_stmts.rst
C      Doc/reference/expressions.rst
C      Doc/tutorial/controlflow.rst
C      Doc/tutorial/classes.rst
C      Doc/library/inspect.rst
C      Doc/library/difflib.rst
C      Doc/library/sqlite3.rst
C      Doc/library/xmlrpclib.rst
C      Doc/library/dis.rst
C      Doc/library/stdtypes.rst
C      Doc/library/collections.rst
C      Doc/library/functions.rst
C      Doc/library/exceptions.rst
C      Doc/glossary.rst
Files
File name Uploaded
Doc.diff gvanrossum, 2007-11-01.19:48:11
History
Date User Action Args
2007-11-01 19:48:14gvanrossumsetspambayes_score: 0.355075 -> 0.355075
recipients: + gvanrossum, georg.brandl
2007-11-01 19:48:13gvanrossumsetspambayes_score: 0.355075 -> 0.355075
messageid: <1193946491.89.0.831882388568.issue1370@psf.upfronthosting.co.za>
2007-11-01 19:48:11gvanrossumlinkissue1370 messages
2007-11-01 19:48:11gvanrossumcreate