Update documentation now that LMDB is required

Remove references to viewname.nzf, and no longer use "if LMDB is used".

diff --git a/bin/named/server.c b/bin/named/server.c
index 14c8d48bc39e238f800e509b3808e7c5f01e6fab..0408cfc92f839b0b9ed9bd18ff39bfae5ac8284c 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8290,9 +8290,9 @@ apply_configuration(cfg_obj_t *effectiveconfig, cfg_obj_t *bindkeys,
        }
 
        /*
-        * If we're using LMDB, we may have created newzones databases
-        * as root, making it impossible to reopen them later after
-        * switching to a new userid. We close them now, and reopen
+        * We are using LMDB. This means we may have created newzones
+        * databases as root, making it impossible to reopen them later
+        * after switching to a new userid. We close them now, and reopen
         * after relinquishing privileges them.
         */
        if (first_time) {

diff --git a/bin/rndc/rndc.rst b/bin/rndc/rndc.rst
index c19fcfd4108447c9580925fc66c9aae9e720a489..6b45366e23b40c839cad49557b7aa357a7c68cb1 100644 (file)
--- a/bin/rndc/rndc.rst
+++ b/bin/rndc/rndc.rst
@@ -133,8 +133,7 @@ Currently supported commands are:
    string specified on the command line is the zone configuration text
    that would ordinarily be placed in :iscman:`named.conf`.
 
-   The configuration is saved in a file called ``viewname.nzf`` (or, if
-   :iscman:`named` is compiled with liblmdb, an LMDB database file called
+   The configuration is saved in an LMDB database file called
    ``viewname.nzd``). ``viewname`` is the name of the view, unless the view
    name contains characters that are incompatible with use as a file
    name, in which case a cryptographic hash of the view name is used

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index b3d746d5b1465409c94dddc617547b2e277dd3f5..96aafadd82705c9d787e4ea2bb70b181533ce5ab 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -1364,12 +1364,11 @@ default is used.
    :tags: server
    :short: Sets a maximum size for the memory map of the new-zone database in LMDB database format.
 
-   When :iscman:`named` is built with liblmdb, this option sets a maximum size
-   for the memory map of the new-zone database (NZD) in LMDB database
-   format. This database is used to store configuration information for
-   zones added using :option:`rndc addzone`. Note that this is not the NZD
-   database file size, but the largest size that the database may grow
-   to.
+   This option sets a maximum size for the memory map of the new-zone database
+   (NZD) in LMDB database format. This database is used to store configuration
+   information for zones added using :option:`rndc addzone`. Note that this is
+   not the NZD database file size, but the largest size that the database may
+   grow to.
 
    Because the database file is memory-mapped, its size is limited by
    the address space of the :iscman:`named` process. The default of 32 megabytes
@@ -1960,17 +1959,13 @@ Boolean Options
 
    Newly added zones' configuration parameters are stored so that they
    can persist after the server is restarted. The configuration
-   information is saved in a file called ``viewname.nzf`` (or, if
-   :iscman:`named` is compiled with liblmdb, in an LMDB database file called
-   ``viewname.nzd``). "viewname" is the name of the view, unless the view
-   name contains characters that are incompatible with use as a file
-   name, in which case a cryptographic hash of the view name is used
-   instead.
-
-   Configurations for zones added at runtime are stored either in
-   a new-zone file (NZF) or a new-zone database (NZD), depending on
-   whether :iscman:`named` was linked with liblmdb at compile time. See
-   :ref:`man_rndc` for further details about :option:`rndc addzone`.
+   information is saved in an LMDB database file called ``viewname.nzd``.
+   "viewname" is the name of the view, unless the view name contains
+   characters that are incompatible with use as a file name, in which case a
+   cryptographic hash of the view name is used instead.
+
+   Configurations for zones added at runtime are stored in a new-zone database
+   (NZD). See :ref:`man_rndc` for further details about :option:`rndc addzone`.
 
 .. namedconf:statement:: auth-nxdomain
    :tags: query