--- rest25/library/gdbm.rst	2008-12-19 16:58:07.000000000 +0900
+++ rest262/library/gdbm.rst	2009-04-05 05:02:09.000000000 +0900
@@ -1,20 +1,24 @@
-
 :mod:`gdbm` --- GNU's reinterpretation of dbm
 =============================================
 
 .. module:: gdbm
    :platform: Unix
    :synopsis: GNU's reinterpretation of dbm.
 
+.. note::
+   The :mod:`gdbm` module has been renamed to :mod:`dbm.gnu` in Python 3.0.  The
+   :term:`2to3` tool will automatically adapt imports when converting your
+   sources to 3.0.
+
 
 .. index:: module: dbm
 
 This module is quite similar to the :mod:`dbm` module, but uses ``gdbm`` instead
 to provide some additional functionality.  Please note that the file formats
 created by ``gdbm`` and ``dbm`` are incompatible.
 
 The :mod:`gdbm` module provides an interface to the GNU DBM library.  ``gdbm``
 objects behave like mappings (dictionaries), except that keys and values are
 always strings. Printing a ``gdbm`` object doesn't print the keys and values,
 and the :meth:`items` and :meth:`values` methods are not supported.
 
@@ -23,42 +27,60 @@
 
 .. exception:: error
 
    Raised on ``gdbm``\ -specific errors, such as I/O errors. :exc:`KeyError` is
    raised for general mapping errors like specifying an incorrect key.
 
 
 .. function:: open(filename, [flag, [mode]])
 
    Open a ``gdbm`` database and return a ``gdbm`` object.  The *filename* argument
    is the name of the database file.
 
-   The optional *flag* argument can be ``'r'`` (to open an existing database for
-   reading only --- default), ``'w'`` (to open an existing database for reading and
-   writing), ``'c'`` (which creates the database if it doesn't exist), or ``'n'``
-   (which always creates a new empty database).
-
-   The following additional characters may be appended to the flag to control how
-   the database is opened:
-
-* ``'f'`` --- Open the database in fast mode.  Writes to the database will not
-     be synchronized.
-
-* ``'s'`` --- Synchronized mode. This will cause changes to the database will be
-     immediately written to the file.
+   The optional *flag* argument can be:
 
-* ``'u'`` --- Do not lock database.
+   +---------+-------------------------------------------+
+   | Value   | Meaning                                   |
+   +=========+===========================================+
+   | ``'r'`` | Open existing database for reading only   |
+   |         | (default)                                 |
+   +---------+-------------------------------------------+
+   | ``'w'`` | Open existing database for reading and    |
+   |         | writing                                   |
+   +---------+-------------------------------------------+
+   | ``'c'`` | Open database for reading and writing,    |
+   |         | creating it if it doesn't exist           |
+   +---------+-------------------------------------------+
+   | ``'n'`` | Always create a new, empty database, open |
+   |         | for reading and writing                   |
+   +---------+-------------------------------------------+
+
+   The following additional characters may be appended to the flag to control
+   how the database is opened:
+
+   +---------+--------------------------------------------+
+   | Value   | Meaning                                    |
+   +=========+============================================+
+   | ``'f'`` | Open the database in fast mode.  Writes    |
+   |         | to the database will not be synchronized.  |
+   +---------+--------------------------------------------+
+   | ``'s'`` | Synchronized mode. This will cause changes |
+   |         | to the database to be immediately written  |
+   |         | to the file.                               |
+   +---------+--------------------------------------------+
+   | ``'u'`` | Do not lock database.                      |
+   +---------+--------------------------------------------+
 
    Not all flags are valid for all versions of ``gdbm``.  The module constant
-   ``open_flags`` is a string of supported flag characters.  The exception
+   :const:`open_flags` is a string of supported flag characters.  The exception
    :exc:`error` is raised if an invalid flag is specified.
 
    The optional *mode* argument is the Unix mode of the file, used only when the
    database has to be created.  It defaults to octal ``0666``.
 
 In addition to the dictionary-like methods, ``gdbm`` objects have the following
 methods:
 
 
 .. function:: firstkey()
 
    It's possible to loop over every key in the database using this method  and the
