[New-bugs-announce] [issue1370] Doc changes left over after mega-merge from trunk

[Guido van Rossum]

New submission from Guido van Rossum:

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

----------
assignee: georg.brandl
components: Documentation
files: Doc.diff
messages: 57029
nosy: georg.brandl, gvanrossum
priority: urgent
severity: normal
status: open
title: Doc changes left over after mega-merge from trunk
versions: Python 3.0
Added file: http://bugs.python.org/file8673/Doc.diff

__________________________________
Tracker <report at bugs.python.org>
<http://bugs.python.org/issue1370>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Doc.diff
Type: text/x-patch
Size: 170279 bytes
Desc: not available
Url : http://mail.python.org/pipermail/new-bugs-announce/attachments/20071101/ac2a9c6f/attachment-0001.bin