From 6a7b5e5bb683ee134caf8f103a509382f37b395a Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 17 Jan 2024 15:11:54 -0500
Subject: [PATCH] global: Add names for passdb/userdb { .. }

---
 .../debugging/debugging_rawlog.rst            |  2 +-
 .../authentication/allow_nets.rst             |  2 +-
 .../authentication_via_remote_imap_server.rst |  2 +-
 .../authentication/caching.rst                |  2 +-
 .../authentication/dict.rst                   | 14 ++++++------
 .../authentication/domain_lost.rst            | 10 ++++-----
 .../authentication/kerberos.rst               |  8 +++----
 .../authentication/ldap.rst                   |  6 ++---
 .../authentication/ldap_authentication.rst    |  6 ++---
 .../authentication/ldap_bind.rst              |  4 ++--
 .../authentication/ldap_userdb.rst            |  4 ++--
 .../lua_based_authentication.rst              |  6 ++---
 .../authentication/master_users.rst           | 22 +++++++++----------
 .../multiple_authentication_databases.rst     |  8 +++----
 .../authentication/nss.rst                    |  2 +-
 .../authentication/oauth2.rst                 |  8 +++----
 .../authentication/pam.rst                    | 20 ++++++++---------
 .../authentication/passwd.rst                 |  4 ++--
 .../authentication/passwd_file.rst            | 10 ++++-----
 .../authentication/prefetch_userdb.rst        | 12 +++++-----
 .../authentication/proxies.rst                |  4 ++--
 .../authentication/restrict_access.rst        |  4 ++--
 .../authentication/shadow.rst                 |  4 ++--
 .../authentication/sql.rst                    |  2 +-
 .../static_password_database.rst              |  2 +-
 .../authentication/static_user_database.rst   |  4 ++--
 .../howto/director_with_lua.rst               |  6 ++---
 .../howto/dovecot_postgresql.rst              |  4 ++--
 .../configuration_manual/howto/rootless.rst   |  4 ++--
 .../howto/simple_virtual_install.rst          |  4 ++--
 .../howto/virtual_user_flat_files_postfix.rst |  4 ++--
 .../mail_crypt_plugin.rst                     |  2 +-
 .../configuration_manual/namespace/index.rst  |  2 +-
 .../quick_configuration.rst                   |  4 ++--
 .../cluster_setup_example.rst                 |  8 +++----
 source/configuration_manual/virtual_users.rst |  8 +++----
 .../upgrading/from-2.2-to-2.3.rst             |  2 +-
 source/man/doveadm-user.1.rst.in              |  2 +-
 38 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/source/admin_manual/debugging/debugging_rawlog.rst b/source/admin_manual/debugging/debugging_rawlog.rst
index 9d12cd4009..9e0f0b7d79 100644
--- a/source/admin_manual/debugging/debugging_rawlog.rst
+++ b/source/admin_manual/debugging/debugging_rawlog.rst
@@ -94,7 +94,7 @@ If your userdb can't return a home directory directly, with v2.1+ you can add:
 
 .. code-block:: none
 
-   userdb {
+   userdb db1 {
       # ...
       default_fields = home=/home/%u
       # or temporarily even e.g. default_fields = home=/tmp/temp-home
diff --git a/source/configuration_manual/authentication/allow_nets.rst b/source/configuration_manual/authentication/allow_nets.rst
index 5899af8f49..2ea3282f39 100644
--- a/source/configuration_manual/authentication/allow_nets.rst
+++ b/source/configuration_manual/authentication/allow_nets.rst
@@ -35,7 +35,7 @@ Postfix to verify the email account:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = static
     args = password=test allow_nets=local,127.0.0.1/32
   }
diff --git a/source/configuration_manual/authentication/authentication_via_remote_imap_server.rst b/source/configuration_manual/authentication/authentication_via_remote_imap_server.rst
index 580264387e..ed19939b8e 100644
--- a/source/configuration_manual/authentication/authentication_via_remote_imap_server.rst
+++ b/source/configuration_manual/authentication/authentication_via_remote_imap_server.rst
@@ -28,7 +28,7 @@ Authenticates users against remote IMAP server in IP address 192.168.1.123:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = imap
     args = host=192.168.1.123
   }
diff --git a/source/configuration_manual/authentication/caching.rst b/source/configuration_manual/authentication/caching.rst
index 05d14e2fd6..629d6fd783 100644
--- a/source/configuration_manual/authentication/caching.rst
+++ b/source/configuration_manual/authentication/caching.rst
@@ -82,7 +82,7 @@ use:
 
 ::
 
-   passdb {
+   passdb db1 {
      driver = pam
      args = cache_key=%s%u *
    }
diff --git a/source/configuration_manual/authentication/dict.rst b/source/configuration_manual/authentication/dict.rst
index 4d56a3c4c6..57e348aff7 100644
--- a/source/configuration_manual/authentication/dict.rst
+++ b/source/configuration_manual/authentication/dict.rst
@@ -19,11 +19,11 @@ Auth configuration
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = dict
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
-  userdb {
+  userdb db1 {
     driver = dict
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
@@ -221,12 +221,12 @@ Auth configuration
     auth = cdb:/etc/dovecot/auth.cdb
   }
 
-  passdb {
+  passdb db1 {
     driver = dict
     args = /etc/dovecot/dovecot-cdb.conf
   }
 
-  userdb {
+  userdb db1 {
     driver = dict
     args = /etc/dovecot/dovecot-cdb.conf
   }
@@ -275,15 +275,15 @@ Auth configuration
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = dict
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
-  userdb {
+  userdb db1 {
     # optional
     driver = prefetch
   }
-  userdb {
+  userdb db2 {
     driver = dict
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
diff --git a/source/configuration_manual/authentication/domain_lost.rst b/source/configuration_manual/authentication/domain_lost.rst
index 78aa19b32d..0db7915944 100644
--- a/source/configuration_manual/authentication/domain_lost.rst
+++ b/source/configuration_manual/authentication/domain_lost.rst
@@ -74,27 +74,27 @@ user lookup.
 ::
 
    ## Your virtual passdb
-   passdb {
+   passdb db1 {
       driver = ldap
       args = /path/to/ldap/config
    }
 
-   passdb {
+   passdb db2 {
       driver = static
       args = user=%Ld noauthenticate
       skip = authenticated
    }
 
-   passdb {
+   passdb db3 {
       driver = pam
       skip = authenticated
    }
 
-   userdb {
+   userdb db1 {
       driver = ldap
       args = /path/to/ldap/config
    }
 
-   userdb {
+   userdb db2 {
       driver = passwd
    }
diff --git a/source/configuration_manual/authentication/kerberos.rst b/source/configuration_manual/authentication/kerberos.rst
index 286937eb77..b203b20c94 100644
--- a/source/configuration_manual/authentication/kerberos.rst
+++ b/source/configuration_manual/authentication/kerberos.rst
@@ -87,7 +87,7 @@ If you only want to use Kerberos ticket-based authentication:
    auth_mechanisms = gssapi
    auth_krb5_keytab = /etc/dovecot/dovecot.keytab
 
-   userdb {
+   userdb db1 {
      driver = static
      args = uid=vmail gid=vmail home=/var/vmail/%u
    }
@@ -104,10 +104,10 @@ ticket-based authentication, you will need something like:
    auth_gssapi_hostname = "$ALL"
    auth_mechanisms = gssapi
    auth_krb5_keytab = /etc/dovecot/dovecot.keytab
-   passdb {
+   passdb db1 {
      driver = pam
    }
-   userdb {
+   userdb db1 {
      driver = passwd
    }
 
@@ -131,7 +131,7 @@ Then enable PAM passdb:
 
 ::
 
-   passdb {
+   passdb db1 {
      driver = pam
    }
 
diff --git a/source/configuration_manual/authentication/ldap.rst b/source/configuration_manual/authentication/ldap.rst
index eba68c4cc1..0ed459323b 100644
--- a/source/configuration_manual/authentication/ldap.rst
+++ b/source/configuration_manual/authentication/ldap.rst
@@ -84,7 +84,7 @@ LDAP Backend Configuration
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     args = /etc/dovecot/dovecot-ldap.conf.ext
     driver = ldap
   }
@@ -256,12 +256,12 @@ dovecot.conf:
 
 .. code-block:: none
 
-   userdb {
+   userdb db1 {
      driver = ldap
      args = /etc/dovecot/dovecot-users-ldap.conf.ext
      result_success = continue-ok
    }
-   userdb {
+   userdb db2 {
      driver = ldap
      args = /etc/dovecot/dovecot-class-ldap.conf.ext
      skip = notfound
diff --git a/source/configuration_manual/authentication/ldap_authentication.rst b/source/configuration_manual/authentication/ldap_authentication.rst
index 5defe000b1..62da357c8e 100644
--- a/source/configuration_manual/authentication/ldap_authentication.rst
+++ b/source/configuration_manual/authentication/ldap_authentication.rst
@@ -8,14 +8,14 @@ See :ref:`LDAP <authentication-ldap>` for more details.
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     args = /etc/dovecot/dovecot-ldap.conf.ext
     driver = ldap
   }
-  userdb {
+  userdb db1 {
     driver = prefetch
   }
-  userdb {
+  userdb db2 {
     args = /etc/dovecot/dovecot-ldap.conf.ext
     driver = ldap
   }
diff --git a/source/configuration_manual/authentication/ldap_bind.rst b/source/configuration_manual/authentication/ldap_bind.rst
index d47b55b303..745f90947c 100644
--- a/source/configuration_manual/authentication/ldap_bind.rst
+++ b/source/configuration_manual/authentication/ldap_bind.rst
@@ -76,11 +76,11 @@ symlink to the first one. For example:
 
 ::
 
-   passdb {
+   passdb db1 {
      driver = ldap
      args = /etc/dovecot/dovecot-ldap.conf.ext
    }
-   userdb {
+   userdb db1 {
      driver = ldap
      args = /etc/dovecot/dovecot-ldap-userdb.conf.ext
    }
diff --git a/source/configuration_manual/authentication/ldap_userdb.rst b/source/configuration_manual/authentication/ldap_userdb.rst
index 285c4a5e37..4e7620e3c9 100644
--- a/source/configuration_manual/authentication/ldap_userdb.rst
+++ b/source/configuration_manual/authentication/ldap_userdb.rst
@@ -135,12 +135,12 @@ dovecot.conf:
 
 ::
 
-   userdb {
+   userdb db1 {
      driver = ldap
      args = /etc/dovecot/dovecot-users-ldap.conf.ext
      result_success = continue-ok
    }
-   userdb {
+   userdb db2 {
      driver = ldap
      args = /etc/dovecot/dovecot-class-ldap.conf.ext
      skip = notfound
diff --git a/source/configuration_manual/authentication/lua_based_authentication.rst b/source/configuration_manual/authentication/lua_based_authentication.rst
index 15043e0594..e86440c964 100644
--- a/source/configuration_manual/authentication/lua_based_authentication.rst
+++ b/source/configuration_manual/authentication/lua_based_authentication.rst
@@ -59,7 +59,7 @@ Example
 
 .. code:: none
 
-  passdb {
+  passdb db1 {
     driver = lua
     args = file=/etc/dovecot/auth.lua password={PLAIN}test
   }
@@ -184,7 +184,7 @@ To configure passdb in dovecot, use
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = lua
     args = file=/path/to/lua blocking=yes # default is yes
   }
@@ -218,7 +218,7 @@ To configure userdb in dovecot, use
 
 .. code-block:: none
 
-  userdb {
+  userdb db1 {
     driver = lua
     args = file=/path/to/lua blocking=yes # default is yes
   }
diff --git a/source/configuration_manual/authentication/master_users.rst b/source/configuration_manual/authentication/master_users.rst
index 6cfa9576f8..99fd8168db 100644
--- a/source/configuration_manual/authentication/master_users.rst
+++ b/source/configuration_manual/authentication/master_users.rst
@@ -72,13 +72,13 @@ Example configuration:
 .. code-block:: none
 
   auth_master_user_separator = *
-  passdb {
+  passdb db1 {
     driver = passwd-file
     args = /etc/dovecot/passwd.masterusers
     master = yes
     result_success = continue
   }
-  userdb {
+  userdb db1 {
     driver = passwd
   }
 
@@ -112,17 +112,17 @@ well:
 .. code-block:: none
 
   auth_master_user_separator = *
-  passdb {
+  passdb db1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql-master.conf.ext
     master = yes
     result_success = continue
   }
-  passdb {
+  passdb db2 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
-  userdb {
+  userdb db1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
@@ -155,13 +155,13 @@ exists and get other extra fields.
 .. code-block:: none
 
    # master password passdb
-   passdb {
+   passdb db1 {
       driver = static
       args = password=master-password
       result_success = continue
    }
    # primary passdb
-   passdb {
+   passdb db2 {
       driver = pam
    }
 
@@ -201,27 +201,27 @@ The dovecot.conf file for all 3 master user configurations will be as follows:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = sql
     args = /etc/dovecot/ownership-sql.conf
     master = yes
     result_success = continue
   }
 
-  passdb {
+  passdb db2 {
     driver = sql
     args = /etc/dovecot/domain-owner-sql.conf
     master = yes
     result_success = continue
   }
 
-  passdb {
+  passdb db3 {
     driver = sql
     args = /etc/dovecot/masteradmin-sql.conf
     master = yes
     result_success = continue
   }
-  passdb {
+  passdb db4 {
     args = /etc/dovecot/sql.conf
     driver = sql
   }
diff --git a/source/configuration_manual/authentication/multiple_authentication_databases.rst b/source/configuration_manual/authentication/multiple_authentication_databases.rst
index 4df6cb692a..894a53f66c 100644
--- a/source/configuration_manual/authentication/multiple_authentication_databases.rst
+++ b/source/configuration_manual/authentication/multiple_authentication_databases.rst
@@ -43,22 +43,22 @@ dovecot.conf:
   mail_path = ~/Maildir
 
   # try to authenticate using SQL database first
-  passdb {
+  passdb db1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
   # fallback to PAM
-  passdb {
+  passdb db2 {
     driver = pam
   }
 
   # look up users from SQL first (even if authentication was done using PAM!)
-  userdb {
+  userdb db1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
   # if not found, fallback to /etc/passwd
-  userdb {
+  userdb db2 {
     driver = passwd
   }
 
diff --git a/source/configuration_manual/authentication/nss.rst b/source/configuration_manual/authentication/nss.rst
index a0fd4bea84..81194972f5 100644
--- a/source/configuration_manual/authentication/nss.rst
+++ b/source/configuration_manual/authentication/nss.rst
@@ -33,7 +33,7 @@ Example
 
 .. code-block:: none
 
-  userdb {
+  userdb db1 {
     driver = nss
     args = service=ldap
   }
diff --git a/source/configuration_manual/authentication/oauth2.rst b/source/configuration_manual/authentication/oauth2.rst
index 60dfe10691..98d7e91c20 100644
--- a/source/configuration_manual/authentication/oauth2.rst
+++ b/source/configuration_manual/authentication/oauth2.rst
@@ -25,7 +25,7 @@ In ``dovecot.conf`` put
     xoauth2 = yes
   }
 
-  passdb {
+  passdb db1 {
     driver = oauth2
     mechanisms = xoauth2 oauthbearer
     args = /etc/dovecot/dovecot-oauth2.conf.ext
@@ -75,7 +75,7 @@ Without proxy authentication
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = static
     args = nopassword=y proxy=y proxy_mech=%m ...
   }
@@ -98,13 +98,13 @@ passdb settings
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = oauth2
     mechanisms = oauthbearer xoauth2
     args = /usr/local/etc/dovecot/dovecot-oauth2.token.conf.ext
   }
 
-  passdb {
+  passdb db2 {
     driver = oauth2
     mechanisms = plain login
     args = /usr/local/etc/dovecot/dovecot-oauth2.plain.conf.ext
diff --git a/source/configuration_manual/authentication/pam.rst b/source/configuration_manual/authentication/pam.rst
index 54dc728239..b3b596e1d8 100644
--- a/source/configuration_manual/authentication/pam.rst
+++ b/source/configuration_manual/authentication/pam.rst
@@ -34,7 +34,7 @@ Here are a few examples:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = pam
     args = %s
   }
@@ -43,7 +43,7 @@ Here are a few examples:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = pam
     args = mail
   }
@@ -58,7 +58,7 @@ like this:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = pam
     args = session=yes dovecot
   }
@@ -82,7 +82,7 @@ lookups done by the auth worker process before it dies:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = pam
     args = max_requests=100
   }
@@ -102,7 +102,7 @@ reply by setting:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = pam
     args = failure_show_msg=yes
   }
@@ -122,7 +122,7 @@ You can restrict the IP-Addresses allowed to connect via PAM:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = pam
     override_fields = allow_nets=10.1.100.0/23,2001:db8:a0b:12f0::/64
   }
@@ -151,7 +151,7 @@ Examples:
 
   # 1MB auth cache size
   auth_cache_size = 1024
-  passdb {
+  passdb db1 {
     driver = pam
     # username and service
     args = cache_key=%u%s *
@@ -161,7 +161,7 @@ Examples:
 
   # 1MB auth cache size
   auth_cache_size = 1024
-  passdb {
+  passdb db1 {
     driver = pam
     # username, remote IP and local IP
     args = cache_key=%u%r%l dovecot
@@ -218,7 +218,7 @@ the on that OS:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = pam
     args = login
   }
@@ -231,6 +231,6 @@ homedir mail storage, without resorting to a single virtual mail user or LDAP:
 
 .. code-block:: none
 
-  userdb {
+  userdb db1 {
     driver = passwd
   }
diff --git a/source/configuration_manual/authentication/passwd.rst b/source/configuration_manual/authentication/passwd.rst
index bc2b9af6ba..ef2bf498c0 100644
--- a/source/configuration_manual/authentication/passwd.rst
+++ b/source/configuration_manual/authentication/passwd.rst
@@ -17,7 +17,7 @@ disabling it:
 
 .. code-block:: none
 
-  userdb {
+  userdb db1 {
     driver = passwd
     args = blocking=no
   }
@@ -32,7 +32,7 @@ For example:
 
 .. code-block:: none
 
-  userdb {
+  userdb db1 {
     driver = passwd
     # Pre-v2.1:
     #args = home=/var/mail/%u mail=maildir:/var/mail/%u/Maildir
diff --git a/source/configuration_manual/authentication/passwd_file.rst b/source/configuration_manual/authentication/passwd_file.rst
index 65cecf6966..c2d09d3a55 100644
--- a/source/configuration_manual/authentication/passwd_file.rst
+++ b/source/configuration_manual/authentication/passwd_file.rst
@@ -46,7 +46,7 @@ passwd-file filenames, for example:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = passwd-file
     # Each domain has a separate passwd-file:
     args = /etc/auth/%d/passwd
@@ -66,11 +66,11 @@ Examples
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = passwd-file
     args = scheme=plain-md5 username_format=%n /etc/imap.passwd
   }
-  userdb {
+  userdb db1 {
     driver = passwd-file
     args = username_format=%n /etc/imap.passwd
     default_fields = uid=vmail gid=vmail home=/home/vmail/%u
@@ -141,11 +141,11 @@ other ``userdb`` and ``passdb`` sections
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = passwd-file
     args = username_format=%n /path/to/file-with-encrypted-passwords
   }
-  userdb {
+  userdb db1 {
     driver = passwd-file
     args = username_format=%n /path/to/file-with-encrypted-passwords
   }
diff --git a/source/configuration_manual/authentication/prefetch_userdb.rst b/source/configuration_manual/authentication/prefetch_userdb.rst
index cf39718129..f35a64dcff 100644
--- a/source/configuration_manual/authentication/prefetch_userdb.rst
+++ b/source/configuration_manual/authentication/prefetch_userdb.rst
@@ -32,15 +32,15 @@ SQL example
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
-  userdb {
+  userdb db1 {
     driver = prefetch
   }
   # The userdb below is used only by lda.
-  userdb {
+  userdb db2 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
@@ -64,15 +64,15 @@ LDAP example
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = ldap
     args = /etc/dovecot/dovecot-ldap.conf.ext
   }
-  userdb {
+  userdb db1 {
     driver = prefetch
   }
   # The userdb below is used only by LDA.
-  userdb {
+  userdb db2 {
     driver = ldap
     args = /etc/dovecot/dovecot-ldap.conf.ext
   }
diff --git a/source/configuration_manual/authentication/proxies.rst b/source/configuration_manual/authentication/proxies.rst
index 2d04de473f..1800f483bb 100644
--- a/source/configuration_manual/authentication/proxies.rst
+++ b/source/configuration_manual/authentication/proxies.rst
@@ -294,7 +294,7 @@ The important parts of ``dovecot.conf``:
   auth_cache_size = 4096
 
   auth_mechanisms = plain
-  passdb {
+  passdb db1 {
     driver = sql
     args = /usr/local/etc/dovecot/dovecot-sql.conf.ext
   }
@@ -333,7 +333,7 @@ The important parts of ``dovecot.conf``:
 
   auth_mechanisms = plain
 
-  passdb {
+  passdb db1 {
     driver = sql
     args = /usr/local/etc/dovecot/dovecot-sql.conf.ext
   }
diff --git a/source/configuration_manual/authentication/restrict_access.rst b/source/configuration_manual/authentication/restrict_access.rst
index da10eec4dc..6203f25bf3 100644
--- a/source/configuration_manual/authentication/restrict_access.rst
+++ b/source/configuration_manual/authentication/restrict_access.rst
@@ -14,7 +14,7 @@ Set PAM service name to ``%s``, ie.:
 
 ::
 
-   passdb {
+   passdb db1 {
      driver = pam
      args = %s
    }
@@ -59,7 +59,7 @@ You can create a deny passwd-file based on the service:
 
 ::
 
-   passdb {
+   passdb db1 {
      driver = passwd-file
      args = /etc/dovecot/deny.%s
      deny = yes
diff --git a/source/configuration_manual/authentication/shadow.rst b/source/configuration_manual/authentication/shadow.rst
index 6d08b8168d..62dbc4c9cf 100644
--- a/source/configuration_manual/authentication/shadow.rst
+++ b/source/configuration_manual/authentication/shadow.rst
@@ -15,7 +15,7 @@ This uses auth-worker processes:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = shadow
   }
 
@@ -37,7 +37,7 @@ really no need to use auth-workers. You can disable them with:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = shadow
     args = blocking=no
   }
diff --git a/source/configuration_manual/authentication/sql.rst b/source/configuration_manual/authentication/sql.rst
index 8c5ae0a22a..2327eafb8b 100644
--- a/source/configuration_manual/authentication/sql.rst
+++ b/source/configuration_manual/authentication/sql.rst
@@ -17,7 +17,7 @@ Dovecot configuration
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
diff --git a/source/configuration_manual/authentication/static_password_database.rst b/source/configuration_manual/authentication/static_password_database.rst
index b018e899cd..0c7e1ca050 100644
--- a/source/configuration_manual/authentication/static_password_database.rst
+++ b/source/configuration_manual/authentication/static_password_database.rst
@@ -18,7 +18,7 @@ Example:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = static
     args = nopassword=y
     default_fields = proxy=y host=127.0.0.1
diff --git a/source/configuration_manual/authentication/static_user_database.rst b/source/configuration_manual/authentication/static_user_database.rst
index 7aa62c6483..c84648f0cd 100644
--- a/source/configuration_manual/authentication/static_user_database.rst
+++ b/source/configuration_manual/authentication/static_user_database.rst
@@ -8,7 +8,7 @@ Static user database can be used when you want to use only single UID and GID va
 
 .. code-block:: none
 
- userdb {
+ userdb db1 {
   driver = static
   args = uid=<uid> gid=<gid> home=<dir template>
  }
@@ -25,7 +25,7 @@ Example
 
 .. code-block:: none 
 
- userdb {
+ userdb db1 {
   driver = static
   args = uid=500 gid=500 home=/home/%u
  }
diff --git a/source/configuration_manual/howto/director_with_lua.rst b/source/configuration_manual/howto/director_with_lua.rst
index 840820ae76..94e87578fd 100644
--- a/source/configuration_manual/howto/director_with_lua.rst
+++ b/source/configuration_manual/howto/director_with_lua.rst
@@ -77,7 +77,7 @@ First, and the most simple, is drop-in replacement for director with no authenti
 
 .. code::
 
-  passdb {
+  passdb db1 {
     driver = lua
     args = file=/etc/dovecot/director.lua nopassword
     # or password=masterpass
@@ -89,12 +89,12 @@ If you wish to do authentication, you can do
 
 .. code::
 
-  passdb {
+  passdb db1 {
     driver = pam
     result_success = continue-ok
   }
 
-  passdb {
+  passdb db2 {
     skip = unauthenticated
     driver = lua
     args = file=/etc/dovecot/director.lua noauthenticate
diff --git a/source/configuration_manual/howto/dovecot_postgresql.rst b/source/configuration_manual/howto/dovecot_postgresql.rst
index 10f9ea1bc9..55917cb3c8 100644
--- a/source/configuration_manual/howto/dovecot_postgresql.rst
+++ b/source/configuration_manual/howto/dovecot_postgresql.rst
@@ -300,12 +300,12 @@ In dovecot.conf, set:
    mail_driver = maildir
    mail_path = ~/
 
-   passdb {
+   passdb db1 {
       driver = sql
       args = /usr/local/etc/dovecot-sql.conf 
    }
 
-   userdb {
+   userdb db1 {
       driver = sql
       args = /usr/local/etc/dovecot-sql.conf
    }
diff --git a/source/configuration_manual/howto/rootless.rst b/source/configuration_manual/howto/rootless.rst
index eaa4095b8a..26c3a6370e 100644
--- a/source/configuration_manual/howto/rootless.rst
+++ b/source/configuration_manual/howto/rootless.rst
@@ -132,11 +132,11 @@ The important settings to change for rootless installation are:
 
    ::
 
-      passdb {
+      passdb db1 {
         driver = passwd-file
         args = /home/user/dovecot/etc/passwd
       }
-      userdb {
+      userdb db1 {
         driver = passwd
       }
 
diff --git a/source/configuration_manual/howto/simple_virtual_install.rst b/source/configuration_manual/howto/simple_virtual_install.rst
index 98462f584e..2fcf30ae6d 100644
--- a/source/configuration_manual/howto/simple_virtual_install.rst
+++ b/source/configuration_manual/howto/simple_virtual_install.rst
@@ -52,11 +52,11 @@ If you want to configure SSL, see :ref:`SSL <ssl>`.
    # Authentication configuration:
    auth_verbose = yes
    auth_mechanisms = plain
-   passdb {
+   passdb db1 {
      driver = passwd-file
      args = /etc/dovecot/passwd
    }
-   userdb {
+   userdb db1 {
      driver = static
      args = uid=vmail gid=vmail home=/home/vmail/%u
    }
diff --git a/source/configuration_manual/howto/virtual_user_flat_files_postfix.rst b/source/configuration_manual/howto/virtual_user_flat_files_postfix.rst
index 98bfafca4d..9f398bdcc1 100644
--- a/source/configuration_manual/howto/virtual_user_flat_files_postfix.rst
+++ b/source/configuration_manual/howto/virtual_user_flat_files_postfix.rst
@@ -75,11 +75,11 @@ or mailbox formats.
 ::
 
    auth_mechanisms = plain
-   passdb {
+   passdb db1 {
      driver = passwd-file
      args = username_format=%u /var/vmail/auth.d/%d/passwd
    }
-   userdb {
+   userdb db1 {
      driver = passwd-file
      args = username_format=%u /var/vmail/auth.d/%d/passwd
    }
diff --git a/source/configuration_manual/mail_crypt_plugin.rst b/source/configuration_manual/mail_crypt_plugin.rst
index a56cfc2e33..daadf9b0c0 100644
--- a/source/configuration_manual/mail_crypt_plugin.rst
+++ b/source/configuration_manual/mail_crypt_plugin.rst
@@ -325,7 +325,7 @@ Hence, this is possible:
     # create the filter, but leave its settings empty
   }
 
-  passdb {
+  passdb db1 {
     driver = static
     args = password=pass crypt_global_public_key=<content of ecpubkey.pem> crypt_global_private_key/main/private_key=<content of ecprivkey.pem>
   }
diff --git a/source/configuration_manual/namespace/index.rst b/source/configuration_manual/namespace/index.rst
index 4c8e2fc5cd..e53752138e 100644
--- a/source/configuration_manual/namespace/index.rst
+++ b/source/configuration_manual/namespace/index.rst
@@ -305,7 +305,7 @@ currently no way to simply add a namespace.
 
 ::
 
-  userdb {
+  userdb db1 {
     driver = static
     args = namespace=inbox,special namespace/special/mail_path=/var/special/%u namespace/special/prefix=special/
   }
diff --git a/source/configuration_manual/quick_configuration.rst b/source/configuration_manual/quick_configuration.rst
index 39b9979b75..2e4a98e2d4 100644
--- a/source/configuration_manual/quick_configuration.rst
+++ b/source/configuration_manual/quick_configuration.rst
@@ -30,11 +30,11 @@ You need to create group vmail and user vmail.
   #first_valid_uid = uid-of-vmail-user
 
   # if you want to use system users
-  passdb {
+  passdb db1 {
     driver = pam
   }
 
-  userdb {
+  userdb db1 {
     driver = passwd
     args = blocking=no
     override_fields = uid=vmail gid=vmail
diff --git a/source/configuration_manual/shared_mailboxes/cluster_setup_example.rst b/source/configuration_manual/shared_mailboxes/cluster_setup_example.rst
index 1d6a519b58..b42d42c1b1 100644
--- a/source/configuration_manual/shared_mailboxes/cluster_setup_example.rst
+++ b/source/configuration_manual/shared_mailboxes/cluster_setup_example.rst
@@ -15,14 +15,14 @@ Dovecot Proxy configuration snippet
 
 .. code-block::
 
-        passdb {
+        passdb db1 {
           driver = static
           master = yes
           default_fields = proxy=y
           args = password=imapcpass
         }
 
-        passdb {
+        passdb db2 {
           driver = static
           args = proxy=y password=masterpass
         }
@@ -58,13 +58,13 @@ Dovecot Backend configuration snippet
           inbox = yes
         }
 
-        passdb {
+        passdb db1 {
           # masterpass is the normal users master password
           args = password=masterpass userdb_imapc_master_user=%{user}
           driver = static
         }
 
-        passdb {
+        passdb db2 {
           driver = static
           master = yes
           # imapcpass is the master password used for master logins (via imapc)
diff --git a/source/configuration_manual/virtual_users.rst b/source/configuration_manual/virtual_users.rst
index 75996391d3..9f24df0fab 100644
--- a/source/configuration_manual/virtual_users.rst
+++ b/source/configuration_manual/virtual_users.rst
@@ -227,11 +227,11 @@ Note that the default :dovecot_core:ref:`auth_username_format` is ``%Lu``.
 
    mail_driver = maildir
    mail_path = /home/%d/%n/Maildir
-   passdb {
+   passdb db1 {
      driver = passwd-file
      args = username_format=%n /home/%d/etc/shadow
    }
-   userdb {
+   userdb db1 {
      driver = passwd-file
      args = username_format=%n /home/%d/etc/passwd
    }
@@ -247,10 +247,10 @@ get Dovecot running is to use the :ref:`static userdb <authentication-static_use
 
    mail_driver = maildir
    mail_path = ~/Maildir
-   passdb {
+   passdb db1 {
      driver = pam
    }
-   userdb {
+   userdb db1 {
      driver = static
      args = uid=vmail gid=vmail home=/var/mail/virtual/%d/%n
    }
diff --git a/source/installation_guide/upgrading/from-2.2-to-2.3.rst b/source/installation_guide/upgrading/from-2.2-to-2.3.rst
index 48b36ec0e2..5e9ad419be 100644
--- a/source/installation_guide/upgrading/from-2.2-to-2.3.rst
+++ b/source/installation_guide/upgrading/from-2.2-to-2.3.rst
@@ -61,7 +61,7 @@ Dovecot no longer disables auth penalty waits for clients connecting from localh
 
 If the old behavior is still wanted, it's possible to do nowadays even more generically with e.g. setting following as the first passdb::
 
-   passdb {
+   passdb db1 {
     driver = passwd-file
     args = username_format=%{rip} /etc/dovecot/passdb
     default_fields = noauthenticate=y
diff --git a/source/man/doveadm-user.1.rst.in b/source/man/doveadm-user.1.rst.in
index acdc6a9841..ac933d623d 100644
--- a/source/man/doveadm-user.1.rst.in
+++ b/source/man/doveadm-user.1.rst.in
@@ -28,7 +28,7 @@ like this:
 
 .. parsed-literal::
 
-   userdb {
+   userdb db1 {
      driver = passwd-file
      args = /etc/%s.passwd
    }