docs

diff --git a/docs/backends/lmdb.rst b/docs/backends/lmdb.rst
index 65dca9606b551483c4e0c9144813dc19b2a38339..0a2e5d1c84ad4b254789b217fc22f35a79341127 100644 (file)
--- a/docs/backends/lmdb.rst
+++ b/docs/backends/lmdb.rst
@@ -72,7 +72,7 @@ Default is 2 on 32 bits systems, and 64 on 64 bits systems.
 ``lmdb-schema-version``
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-Determines the maximum schema version LMDB is allowed to upgrade to. If the on disk LMDB database has a lower version that the current version of the LMDB schema the backend will not start, unless this setting allows it to upgrade the schema. If the version of the DB is already the same as the current schema version this setting is not checked and the backend starts normally.
+Determines the maximum schema version LMDB is allowed to upgrade to. If the on disk LMDB database has a lower version than the current version of the LMDB schema the backend will not start, unless this setting allows it to upgrade the schema. If the version of the DB is already the same as the current schema version this setting is not checked and the backend starts normally.
 
 The default value for this setting is the highest supported schema version for the version of PowerDNS you are starting. if you want to prevent automatic schema upgrades, explicitly set this setting to the current default before upgrading PowerDNS.
 
@@ -83,6 +83,7 @@ PowerDNS Version  LMDB Schema version
 4.3.x             2
 4.4.x to 4.6.x    3
 4.7.x and up      4
+4.8.x and up      5
 ================  ===================
 
 .. _settings-lmdb-random-ids:
@@ -110,6 +111,14 @@ Size, in megabytes, of each LMDB database.
 This number can be increased later, but never decreased.
 Defaults to 100 on 32 bit systems, and 16000 on 64 bit systems.
 
+.. _settings-lmdb-flag-deleted:
+``lmdb-flag-deleted``
+^^^^^^^^^^^^^^^^^^^^^
+
+  .. versionadded:: 4.8.0
+
+Instead of deleting items from the database, flag them as deleted in the item's [LightningStream](FIXME add link) header.
+
 LMDB Structure
 --------------
 

diff --git a/docs/upgrading.rst b/docs/upgrading.rst
index e68e9687dcd1126e22f4a8d428d73086b4fd3a78..d60ff6d20879ca527320a5e316d836e5ba8b0c5d 100644 (file)
--- a/docs/upgrading.rst
+++ b/docs/upgrading.rst
@@ -8,6 +8,19 @@ Please upgrade to the PowerDNS Authoritative Server 4.0.0 from 3.4.2+.
 See the `3.X <https://doc.powerdns.com/3/authoritative/upgrading/>`__
 upgrade notes if your version is older than 3.4.2.
 
+any version to 4.8.x
+--------------------
+
+LMDB backend
+^^^^^^^^^^^^
+
+Version 4.8.0-alpha1 ships a new version of the LMDB database schema (called version 5).
+This schema is somewhat experimental, and although we do intend to make databases portable/upgradeable to future releases in the 4.8 train, we currently make no promises.
+There is no downgrade process.
+If you upgrade your database (by starting 4.8.0 without `lmdb-schema-version=4`), you cannot go back.
+
+Upgrading is only supported from database schema versions 3 and 4, that is, databases created/upgraded by version 4.4 and up.
+
 4.6.0 to 4.7.0 or master
 ------------------------