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

I saw the merge commit and that it missed Doc/, and I feared this. :D

But, having caused most of this mess, I'll sort it out right now.

Okay, resolved and committed in r58752.

Hm, what happened to Doc/using? Should that perhaps also be submitted?

I noted that too, should be in the repos now.

On 11/1/07, Georg Brandl <report@bugs.python.org> wrote:
>
> Georg Brandl added the comment:
>
> I noted that too, should be in the repos now.

Thanks! And thanks for fixing up my mess so quickly!!