Thu Aug 2 11:30:44 CEST 2007

Author: georg.brandl
Date: Thu Aug  2 11:30:42 2007
New Revision: 56664

Added:
   doctools/trunk/Doc-26/library/email-examples.rst
Modified:
   doctools/trunk/Doc-26/TODO
   doctools/trunk/Doc-26/library/email.charset.rst
   doctools/trunk/Doc-26/library/email.encoders.rst
   doctools/trunk/Doc-26/library/email.errors.rst
   doctools/trunk/Doc-26/library/email.generator.rst
   doctools/trunk/Doc-26/library/email.header.rst
   doctools/trunk/Doc-26/library/email.iterators.rst
   doctools/trunk/Doc-26/library/email.message.rst
   doctools/trunk/Doc-26/library/email.mime.rst
   doctools/trunk/Doc-26/library/email.parser.rst
   doctools/trunk/Doc-26/library/email.rst
   doctools/trunk/Doc-26/library/email.util.rst
   doctools/trunk/Doc-3k/TODO
   doctools/trunk/Doc-3k/library/email.charset.rst
   doctools/trunk/Doc-3k/library/email.encoders.rst
   doctools/trunk/Doc-3k/library/email.errors.rst
   doctools/trunk/Doc-3k/library/email.generator.rst
   doctools/trunk/Doc-3k/library/email.header.rst
   doctools/trunk/Doc-3k/library/email.iterators.rst
   doctools/trunk/Doc-3k/library/email.message.rst
   doctools/trunk/Doc-3k/library/email.mime.rst
   doctools/trunk/Doc-3k/library/email.parser.rst
   doctools/trunk/Doc-3k/library/email.rst
   doctools/trunk/Doc-3k/library/email.util.rst
Log:
Add the email package toctree.


Modified: doctools/trunk/Doc-26/TODO
==============================================================================

--- doctools/trunk/Doc-26/TODO	(original)
+++ doctools/trunk/Doc-26/TODO	Thu Aug  2 11:30:42 2007
@@ -5,7 +5,6 @@
 * adjust all literal include paths
 * remove all non-literal includes
 * fix all duplicate labels and undefined label references
-* fix the email package docs: add a toctree
 * split very large files and add toctrees
 * integrate standalone HOWTOs
 * find out which files get "comments disabled" metadata

Added: doctools/trunk/Doc-26/library/email-examples.rst
==============================================================================
--- (empty file)
+++ doctools/trunk/Doc-26/library/email-examples.rst	Thu Aug  2 11:30:42 2007
@@ -0,0 +1,38 @@
+:mod:`email`: Examples
+----------------------
+
+Here are a few examples of how to use the :mod:`email` package to read, write,
+and send simple email messages, as well as more complex MIME messages.
+
+First, let's see how to create and send a simple text message:
+
+
+.. include:: ../includes/email-simple.py
+   :literal:
+
+Here's an example of how to send a MIME message containing a bunch of family
+pictures that may be residing in a directory:
+
+
+.. include:: ../includes/email-mime.py
+   :literal:
+
+Here's an example of how to send the entire contents of a directory as an email
+message:  [#]_
+
+
+.. include:: ../includes/email-dir.py
+   :literal:
+
+And finally, here's an example of how to unpack a MIME message like the one
+above, into a directory of files:
+
+
+.. include:: ../includes/email-unpack.py
+   :literal:
+
+
+.. rubric:: Footnotes
+
+.. [#] Thanks to Matthew Dixon Cowles for the original inspiration and examples.
+

Modified: doctools/trunk/Doc-26/library/email.charset.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.charset.rst	(original)
+++ doctools/trunk/Doc-26/library/email.charset.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Representing character sets
+-----------------------------------------
+
 .. module:: email.charset
    :synopsis: Character Sets
 

Modified: doctools/trunk/Doc-26/library/email.encoders.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.encoders.rst	(original)
+++ doctools/trunk/Doc-26/library/email.encoders.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Encoders
+----------------------
+
 .. module:: email.encoders
    :synopsis: Encoders for email message payloads.
 

Modified: doctools/trunk/Doc-26/library/email.errors.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.errors.rst	(original)
+++ doctools/trunk/Doc-26/library/email.errors.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Exception and Defect classes
+------------------------------------------
+
 .. module:: email.errors
    :synopsis: The exception classes used by the email package.
 

Modified: doctools/trunk/Doc-26/library/email.generator.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.generator.rst	(original)
+++ doctools/trunk/Doc-26/library/email.generator.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Generating MIME documents
+---------------------------------------
+
 .. module:: email.generator
    :synopsis: Generate flat text email messages from a message structure.
 

Modified: doctools/trunk/Doc-26/library/email.header.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.header.rst	(original)
+++ doctools/trunk/Doc-26/library/email.header.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Internationalized headers
+---------------------------------------
+
 .. module:: email.header
    :synopsis: Representing non-ASCII headers
 

Modified: doctools/trunk/Doc-26/library/email.iterators.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.iterators.rst	(original)
+++ doctools/trunk/Doc-26/library/email.iterators.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Iterators
+-----------------------
+
 .. module:: email.iterators
    :synopsis: Iterate over a  message object tree.
 

Modified: doctools/trunk/Doc-26/library/email.message.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.message.rst	(original)
+++ doctools/trunk/Doc-26/library/email.message.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Representing an email message
+-------------------------------------------
+
 .. module:: email.message
    :synopsis: The base class representing email messages.
 

Modified: doctools/trunk/Doc-26/library/email.mime.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.mime.rst	(original)
+++ doctools/trunk/Doc-26/library/email.mime.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Creating email and MIME objects from scratch
+----------------------------------------------------------
+
 .. module:: email.mime.text
 
 

Modified: doctools/trunk/Doc-26/library/email.parser.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.parser.rst	(original)
+++ doctools/trunk/Doc-26/library/email.parser.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Parsing email messages
+------------------------------------
+
 .. module:: email.parser
    :synopsis: Parse flat text email messages to produce a message object structure.
 

Modified: doctools/trunk/Doc-26/library/email.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.rst	(original)
+++ doctools/trunk/Doc-26/library/email.rst	Thu Aug  2 11:30:42 2007
@@ -52,6 +52,22 @@
 examples.  For users of the older :mod:`mimelib` package, or previous versions
 of the :mod:`email` package, a section on differences and porting is provided.
 
+Contents of the :mod:`email` package documentation:
+
+.. toctree::
+
+   email.message.rst
+   email.parser.rst
+   email.generator.rst
+   email.mime.rst
+   email.header.rst
+   email.charset.rst
+   email.encoders.rst
+   email.errors.rst
+   email.util.rst
+   email.iterators.rst
+   email-examples.rst
+
 
 .. seealso::
 
@@ -62,76 +78,6 @@
       NNTP protocol client
 
 
-Representing an email message
------------------------------
-
-
-.. include:: email.message.rst
-
-
-Parsing email messages
-----------------------
-
-
-.. include:: email.parser.rst
-
-
-Generating MIME documents
--------------------------
-
-
-.. include:: email.generator.rst
-
-
-Creating email and MIME objects from scratch
---------------------------------------------
-
-
-.. include:: email.mime.rst
-
-
-Internationalized headers
--------------------------
-
-
-.. include:: email.header.rst
-
-
-Representing character sets
----------------------------
-
-
-.. include:: email.charset.rst
-
-
-Encoders
---------
-
-
-.. include:: email.encoders.rst
-
-
-Exception and Defect classes
-----------------------------
-
-
-.. include:: email.errors.rst
-
-
-Miscellaneous utilities
------------------------
-
-
-.. include:: email.util.rst
-
-
-Iterators
----------
-
-
-.. include:: email.iterators.rst
-
-
 .. _email-pkg-history:
 
 Package History
@@ -373,43 +319,6 @@
 closely supported in the :func:`body_line_iterator` function in the
 :mod:`email.iterators` module.
 
-
-Examples
---------
-
-Here are a few examples of how to use the :mod:`email` package to read, write,
-and send simple email messages, as well as more complex MIME messages.
-
-First, let's see how to create and send a simple text message:
-
-
-.. include:: ../includes/email-simple.py
-   :literal:
-
-Here's an example of how to send a MIME message containing a bunch of family
-pictures that may be residing in a directory:
-
-
-.. include:: ../includes/email-mime.py
-   :literal:
-
-Here's an example of how to send the entire contents of a directory as an email
-message:  [#]_
-
-
-.. include:: ../includes/email-dir.py
-   :literal:
-
-And finally, here's an example of how to unpack a MIME message like the one
-above, into a directory of files:
-
-
-.. include:: ../includes/email-unpack.py
-   :literal:
-
 .. rubric:: Footnotes
 
 .. [#] Delivery Status Notifications (DSN) are defined in :rfc:`1894`.
-
-.. [#] Thanks to Matthew Dixon Cowles for the original inspiration and examples.
-

Modified: doctools/trunk/Doc-26/library/email.util.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.util.rst	(original)
+++ doctools/trunk/Doc-26/library/email.util.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Miscellaneous utilities
+-------------------------------------
+
 .. module:: email.utils
    :synopsis: Miscellaneous email package utilities.
 

Modified: doctools/trunk/Doc-3k/TODO
==============================================================================
--- doctools/trunk/Doc-3k/TODO	(original)
+++ doctools/trunk/Doc-3k/TODO	Thu Aug  2 11:30:42 2007
@@ -5,7 +5,6 @@
 * adjust all literal include paths
 * remove all non-literal includes
 * fix all duplicate labels and undefined label references
-* fix the email package docs: add a toctree
 * split very large files and add toctrees
 * integrate standalone HOWTOs
 * find out which files get "comments disabled" metadata
@@ -14,5 +13,4 @@
 * write "About these documents"
 * finish "Documenting Python"
 * extend copyright.rst
-* fix the "quadruple" index term
-* fix :file: and |version| in install
\ No newline at end of file
+* fix :file: and |version| in install

Modified: doctools/trunk/Doc-3k/library/email.charset.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.charset.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.charset.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Representing character sets
+-----------------------------------------
+
 .. module:: email.charset
    :synopsis: Character Sets
 

Modified: doctools/trunk/Doc-3k/library/email.encoders.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.encoders.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.encoders.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Encoders
+----------------------
+
 .. module:: email.encoders
    :synopsis: Encoders for email message payloads.
 

Modified: doctools/trunk/Doc-3k/library/email.errors.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.errors.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.errors.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Exception and Defect classes
+------------------------------------------
+
 .. module:: email.errors
    :synopsis: The exception classes used by the email package.
 

Modified: doctools/trunk/Doc-3k/library/email.generator.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.generator.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.generator.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Generating MIME documents
+---------------------------------------
+
 .. module:: email.generator
    :synopsis: Generate flat text email messages from a message structure.
 

Modified: doctools/trunk/Doc-3k/library/email.header.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.header.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.header.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Internationalized headers
+---------------------------------------
+
 .. module:: email.header
    :synopsis: Representing non-ASCII headers
 

Modified: doctools/trunk/Doc-3k/library/email.iterators.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.iterators.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.iterators.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Iterators
+-----------------------
+
 .. module:: email.iterators
    :synopsis: Iterate over a  message object tree.
 

Modified: doctools/trunk/Doc-3k/library/email.message.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.message.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.message.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Representing an email message
+-------------------------------------------
+
 .. module:: email.message
    :synopsis: The base class representing email messages.
 

Modified: doctools/trunk/Doc-3k/library/email.mime.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.mime.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.mime.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Creating email and MIME objects from scratch
+----------------------------------------------------------
+
 .. module:: email.mime.text
 
 

Modified: doctools/trunk/Doc-3k/library/email.parser.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.parser.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.parser.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Parsing email messages
+------------------------------------
+
 .. module:: email.parser
    :synopsis: Parse flat text email messages to produce a message object structure.
 

Modified: doctools/trunk/Doc-3k/library/email.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.rst	Thu Aug  2 11:30:42 2007
@@ -52,6 +52,22 @@
 examples.  For users of the older :mod:`mimelib` package, or previous versions
 of the :mod:`email` package, a section on differences and porting is provided.
 
+Contents of the :mod:`email` package documentation:
+
+.. toctree::
+
+   email.message.rst
+   email.parser.rst
+   email.generator.rst
+   email.mime.rst
+   email.header.rst
+   email.charset.rst
+   email.encoders.rst
+   email.errors.rst
+   email.util.rst
+   email.iterators.rst
+   email-examples.rst
+
 
 .. seealso::
 
@@ -62,76 +78,6 @@
       NNTP protocol client
 
 
-Representing an email message
------------------------------
-
-
-.. include:: email.message.rst
-
-
-Parsing email messages
-----------------------
-
-
-.. include:: email.parser.rst
-
-
-Generating MIME documents
--------------------------
-
-
-.. include:: email.generator.rst
-
-
-Creating email and MIME objects from scratch
---------------------------------------------
-
-
-.. include:: email.mime.rst
-
-
-Internationalized headers
--------------------------
-
-
-.. include:: email.header.rst
-
-
-Representing character sets
----------------------------
-
-
-.. include:: email.charset.rst
-
-
-Encoders
---------
-
-
-.. include:: email.encoders.rst
-
-
-Exception and Defect classes
-----------------------------
-
-
-.. include:: email.errors.rst
-
-
-Miscellaneous utilities
------------------------
-
-
-.. include:: email.util.rst
-
-
-Iterators
----------
-
-
-.. include:: email.iterators.rst
-
-
 .. _email-pkg-history:
 
 Package History
@@ -373,43 +319,6 @@
 closely supported in the :func:`body_line_iterator` function in the
 :mod:`email.iterators` module.
 
-
-Examples
---------
-
-Here are a few examples of how to use the :mod:`email` package to read, write,
-and send simple email messages, as well as more complex MIME messages.
-
-First, let's see how to create and send a simple text message:
-
-
-.. include:: ../includes/email-simple.py
-   :literal:
-
-Here's an example of how to send a MIME message containing a bunch of family
-pictures that may be residing in a directory:
-
-
-.. include:: ../includes/email-mime.py
-   :literal:
-
-Here's an example of how to send the entire contents of a directory as an email
-message:  [#]_
-
-
-.. include:: ../includes/email-dir.py
-   :literal:
-
-And finally, here's an example of how to unpack a MIME message like the one
-above, into a directory of files:
-
-
-.. include:: ../includes/email-unpack.py
-   :literal:
-
 .. rubric:: Footnotes
 
 .. [#] Delivery Status Notifications (DSN) are defined in :rfc:`1894`.
-
-.. [#] Thanks to Matthew Dixon Cowles for the original inspiration and examples.
-

Modified: doctools/trunk/Doc-3k/library/email.util.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.util.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.util.rst	Thu Aug  2 11:30:42 2007
@@ -1,3 +1,6 @@
+:mod:`email`: Miscellaneous utilities
+-------------------------------------
+
 .. module:: email.utils
    :synopsis: Miscellaneous email package utilities.
 
