remove some more bsddb references

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index d2d4f4750fcd5dfa72db81cb7d409ba31af60f85..94b6726d05440d9aa156cf909b037cad746e69c0 100644 (file)
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -23,9 +23,6 @@ be useful when inheriting directly from :class:`dict` or
 The specialized containers provided in this module provide alternatives
 to Python's general purpose built-in containers, :class:`dict`,
 :class:`list`, :class:`set`, and :class:`tuple`.
-Besides the containers provided here, the optional :mod:`bsddb`
-module offers the ability to create in-memory or file based ordered
-dictionaries with string keys using the :meth:`bsddb.btopen` method.
 
 In addition to containers, the collections module provides some ABCs
 (abstract base classes) that can be used to test whether a class

diff --git a/Doc/library/dbm.rst b/Doc/library/dbm.rst
index 09069e8dd4296515623b168b57a9b4cb11ac60b4..932c2a7fd4496ba04f8e5d6be630ba40663285f5 100644 (file)
--- a/Doc/library/dbm.rst
+++ b/Doc/library/dbm.rst
@@ -268,9 +268,9 @@ to simplify building this module.
    database modules.
 
 The :mod:`dbm.dumb` module provides a persistent dictionary-like interface which
-is written entirely in Python.  Unlike other modules such as :mod:`gdbm` and
-:mod:`bsddb`, no external library is required.  As with other persistent
-mappings, the keys and values must always be strings.
+is written entirely in Python.  Unlike other modules such as :mod:`gdbm` no
+external library is required.  As with other persistent mappings, the keys and
+values must always be strings.
 
 The module defines the following:
 

diff --git a/Doc/library/shelve.rst b/Doc/library/shelve.rst
index 2dee026ff34f6a2f455e72f735049913b45db0de..1c35f4781cdae6278514226eaf5f80a81bf4f3dd 100644 (file)
--- a/Doc/library/shelve.rst
+++ b/Doc/library/shelve.rst
@@ -55,15 +55,14 @@ Restrictions
   .. index::
      module: dbm.ndbm
      module: dbm.gnu
-     module: bsddb
 
-* The choice of which database package will be used (such as :mod:`dbm.ndbm`,
-  :mod:`dbm.gnu` or :mod:`bsddb`) depends on which interface is available.  Therefore
-  it is not safe to open the database directly using :mod:`dbm`.  The database is
-  also (unfortunately) subject to the limitations of :mod:`dbm`, if it is used ---
+* The choice of which database package will be used (such as :mod:`dbm.ndbm` or
+  :mod:`dbm.gnu`) depends on which interface is available.  Therefore it is not
+  safe to open the database directly using :mod:`dbm`.  The database is also
+  (unfortunately) subject to the limitations of :mod:`dbm`, if it is used ---
   this means that (the pickled representation of) the objects stored in the
-  database should be fairly small, and in rare cases key collisions may cause the
-  database to refuse updates.
+  database should be fairly small, and in rare cases key collisions may cause
+  the database to refuse updates.
 
 * Depending on the implementation, closing a persistent dictionary may or may
   not be necessary to flush changes to disk.  The :meth:`__del__` method of the
@@ -155,9 +154,6 @@ object)::
    Module :mod:`dbm`
       Generic interface to ``dbm``-style databases.
 
-   Module :mod:`bsddb`
-      BSD ``db`` database interface.
-
    Module :mod:`pickle`
       Object serialization used by :mod:`shelve`.
 

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 00516d1adc7ccb6d3d249a78433889352050f27b..ddc605b8bb8edec365141a9256138778e756f16a 100644 (file)
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -405,10 +405,9 @@ Mappings
       .. index::
          module: dbm.ndbm
          module: dbm.gnu
-         module: bsddb
 
-      The extension modules :mod:`dbm.ndbm`, :mod:`dbm.gnu`, and :mod:`bsddb`
-      provide additional examples of mapping types, as does the :mod:`collections`
+      The extension modules :mod:`dbm.ndbm` and :mod:`dbm.gnu` provide
+      additional examples of mapping types, as does the :mod:`collections`
       module.
 
 Callable types