[Python-checkins] r56770 - doctools/trunk/Doc-3k/library/collections.rst doctools/trunk/Doc-3k/library/stdtypes.rst doctools/trunk/Doc-3k/library/string.rst doctools/trunk/Doc-3k/library/strings.rst

[georg.brandl]

Author: georg.brandl
Date: Mon Aug  6 18:29:32 2007
New Revision: 56770

Modified:
   doctools/trunk/Doc-3k/library/collections.rst
   doctools/trunk/Doc-3k/library/stdtypes.rst
   doctools/trunk/Doc-3k/library/string.rst
   doctools/trunk/Doc-3k/library/strings.rst
Log:
Port rev. 56767f.


Modified: doctools/trunk/Doc-3k/library/collections.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/collections.rst	(original)
+++ doctools/trunk/Doc-3k/library/collections.rst	Mon Aug  6 18:29:32 2007
@@ -10,10 +10,16 @@
 
 .. versionadded:: 2.4
 
-This module implements high-performance container datatypes.  Currently, there
-are two datatypes, deque and defaultdict, and one datatype factory function,
-:func:`NamedTuple`. Future additions may include balanced trees and ordered
-dictionaries.
+This module implements high-performance container datatypes.  Currently,
+there are two datatypes, :class:`deque` and :class:`defaultdict`, and
+one datatype factory function, :func:`NamedTuple`. Python already
+includes built-in containers, :func:`dict`, :func:`list`, and
+:func:`tuple`. The optional :mod:`bsddb` module has a :meth:`btopen`
+method that can be used to create in-memory or file based ordered
+dictionaries with string keys.
+
+Future editions of the standard library may include balanced trees and
+ordered dictionaries.
 
 .. versionchanged:: 2.5
    Added defaultdict.

Modified: doctools/trunk/Doc-3k/library/stdtypes.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/stdtypes.rst	(original)
+++ doctools/trunk/Doc-3k/library/stdtypes.rst	Mon Aug  6 18:29:32 2007
@@ -650,9 +650,13 @@
 
 .. index:: pair: string; methods
 
-These are the string methods which both 8-bit strings and Unicode objects
-support:
-
+Below are listed the string methods which both 8-bit strings and Unicode
+objects support. In addition, Python's strings support the 
+sequence type methods described in the
+:ref:`typesseq` section (above). To output formatted strings use
+template strings or the ``%`` operator described in the
+:ref:`typesseq-strings` section (below). Also, see the :mod:`re` module for
+string functions based on regular expressions.
 
 .. method:: str.capitalize()
 
@@ -1728,11 +1732,12 @@
    module: os
    module: socket
 
-File objects are implemented using C's ``stdio`` package and can be created with
-the built-in constructor :func:`file` described in section
-:ref:`built-in-funcs`. [#]_ File objects are also returned by some other
-built-in functions and methods, such as :func:`os.popen` and :func:`os.fdopen`
-and the :meth:`makefile` method of socket objects.
+File objects are implemented using C's ``stdio`` package and can be
+created with the built-in :func:`file` and (more usually) :func:`open`
+constructors described in the :ref:`built-in-funcs` section. [#]_ File
+objects are also returned by some other built-in functions and methods,
+such as :func:`os.popen` and :func:`os.fdopen` and the :meth:`makefile`
+method of socket objects.
 
 When a file operation fails for an I/O-related reason, the exception
 :exc:`IOError` is raised.  This includes situations where the operation is not

Modified: doctools/trunk/Doc-3k/library/string.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/string.rst	(original)
+++ doctools/trunk/Doc-3k/library/string.rst	Mon Aug  6 18:29:32 2007
@@ -8,10 +8,15 @@
 
 .. index:: module: re
 
-The :mod:`string` module contains a number of useful constants and classes, as
-well as some deprecated legacy functions that are also available as methods on
-strings.  See the module :mod:`re` for string functions based on regular
-expressions.
+The :mod:`string` module contains a number of useful constants and
+classes, as well as some deprecated legacy functions that are also
+available as methods on strings. In addition, Python's built-in string
+classes support the sequence type methods described in the
+:ref:`typesseq` section, and also the string-specific methods described
+in the :ref:`string-methods` section. To output formatted strings use
+template strings or the ``%`` operator described in the
+:ref:`typesseq-strings` section. Also, see the :mod:`re` module for
+string functions based on regular expressions.
 
 
 String constants

Modified: doctools/trunk/Doc-3k/library/strings.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/strings.rst	(original)
+++ doctools/trunk/Doc-3k/library/strings.rst	Mon Aug  6 18:29:32 2007
@@ -12,7 +12,8 @@
 methods described in the :ref:`typesseq` section, and also the
 string-specific methods described in the :ref:`string-methods` section.
 To output formatted strings use template strings or the ``%`` operator
-described in the :ref:`typesseq-strings` section.
+described in the :ref:`typesseq-strings` section. Also, see the
+:mod:`re` module for string functions based on regular expressions.
 
 
 .. toctree::