diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
index 65c827fab..18d612d1a 100644
--- a/.github/actions/spelling/patterns.txt
+++ b/.github/actions/spelling/patterns.txt
@@ -106,7 +106,7 @@ BBAAAAAAAAAAAAAAAAAAAAAAB
 d88ff1001d4bf753a1b800001accfe22
 &U,BTFw-
 &ZeVnLIqe-
--adnPNSx
+-adnPNx
 F=DFMPhnu9,
 SPfne
 \bAPPEND(?:ed|s)
diff --git a/docs/core/man/doveconf.1.md b/docs/core/man/doveconf.1.md
index efce8b58a..a4a9d247e 100644
--- a/docs/core/man/doveconf.1.md
+++ b/docs/core/man/doveconf.1.md
@@ -9,7 +9,7 @@ dovecotComponent: core
 ## SYNOPSIS
 
 **doveconf**
-  [**-adnPNSx**]
+  [**-adnPNx**]
   [**-c** *config-file*]
   [**-f** *filter*]
 
@@ -54,24 +54,27 @@ configuration in easy human readable output.
     **-f** option can be supplied multiple times.
 
     Possible names for the *filter* are:
-    :   **lname**
-        :   The local hostname, e.g. mail.example.com.
+    :   **protocol**
+        :   The protocol, e.g. imap or pop3
+
+    :   **local_name**
+        :   The local hostname for TLS SNI matching, e.g. mail.example.com.
 
-            This will only match hostnames which were configured like:
+            This matches filters which were configured like:
             :   **local_name mail.example.com { # special settings }**
 
     :   **local**
-        :   The server's hostname or IP address.
-
-            This will also match hostnames which were configured like:
-            :   **local imap.example.net { # special settings }**
+        :   The local hostname or IP address.
 
-    :   **protocol, service**
-        :   The protocol, e.g. imap or pop3
+            This matches filters which were configured like:
+            :   **local 1.2.3.0/24 { # special settings }**
 
     :   **remote**
         :   The client's hostname or IP address.
 
+            This matches filters which were configured like:
+            :   **remote 1.2.3.0/24 { # special settings }**
+
 **-h**
 :   Hide the setting's name, show only the setting's value.
 
@@ -82,9 +85,6 @@ configuration in easy human readable output.
 **-N**
 :   Show settings with non-default values and explicitly set default values.
 
-**-S**
-:   Dump settings in simplified machine parsable/readable format.
-
 **-s**
 :   Show also hidden settings. The hidden settings should not be changed
     normally.
@@ -111,7 +111,7 @@ networks/subnets it is possible to show which settings will be applied
 for a specific connection.
 
 ```sh
-doveconf -f local=10.0.0.110 -f remote=10.11.1.2 -f service=pop3 -n
+doveconf -f local=10.0.0.110 -f remote=10.11.1.2 -f protocol=pop3 -n
 ```
 
 **doveconf** can be also used to convert v1.x configuration files into
@@ -134,10 +134,10 @@ Ask **doveconf** for a protocol specific setting. Uses the **-h**
 option, in order to hide the setting's name:
 
 ```sh
-doveconf -h -f protocol=imap mail_plugins
+doveconf -h -f protocol=imap login_greeting
 ```
 ```
-quota imap_quota
+Dovecot ready.
 ```
 
 Dump a whole configuration section: