From 5c1a66942861ec635b894a7a14430d0749bb5856 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sun, 27 Mar 2022 22:28:55 +0200
Subject: [PATCH] doc: Remove all mention of deprecated Sieve extensions.
---
doc/example-config/conf.d/90-sieve.conf | 14 +++++++-------
doc/extensions/duplicate.txt | 5 +----
doc/man/sieve-dump.1.in | 6 +++---
doc/man/sieve-filter.1.in | 6 +++---
doc/man/sieve-test.1.in | 6 +++---
doc/man/sievec.1.in | 6 +++---
6 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/doc/example-config/conf.d/90-sieve.conf b/doc/example-config/conf.d/90-sieve.conf
index 238bcf46a..532a77645 100644
--- a/doc/example-config/conf.d/90-sieve.conf
+++ b/doc/example-config/conf.d/90-sieve.conf
@@ -86,13 +86,13 @@ plugin {
# Which Sieve language extensions are available to users. By default, all
# supported extensions are available, except for deprecated extensions or
- # those that are still under development. Some system administrators may want
- # to disable certain Sieve extensions or enable those that are not available
- # by default. This setting can use '+' and '-' to specify differences relative
- # to the default. For example `sieve_extensions = +imapflags' will enable the
- # deprecated imapflags extension in addition to all extensions were already
- # enabled by default.
- #sieve_extensions = +notify +imapflags
+ # those that can be dangerous or are still under development. Some system
+ # administrators may want to disable certain Sieve extensions or enable those
+ # that are not available by default. This setting can use '+' and '-' to
+ # specify differences relative to the default. For example
+ # `sieve_extensions = +editheader' will enable the editheader extension in
+ # addition to all extensions were already enabled by default.
+ #sieve_extensions = +editheader
# Which Sieve language extensions are ONLY available in global scripts. This
# can be used to restrict the use of certain Sieve extensions to administrator
diff --git a/doc/extensions/duplicate.txt b/doc/extensions/duplicate.txt
index 962e69e8d..1c815a817 100644
--- a/doc/extensions/duplicate.txt
+++ b/doc/extensions/duplicate.txt
@@ -18,10 +18,7 @@ IDs from previously delivered messages. For more complex applications, the
parts of the message.
Refer to doc/rfc/duplicate.rfc7352.txt for a specification of the Sieve language
-extension. Previously, this extension was Dovecot-specific and available under
-the name "vnd.dovecot.duplicate". That implementation differs significantly from
-what is now published as an RFC, but for backwards compatibility the original
-extension is still supported.
+extension.
Configuration
=============
diff --git a/doc/man/sieve-dump.1.in b/doc/man/sieve-dump.1.in
index 7a79c6824..f9e23aa20 100644
--- a/doc/man/sieve-dump.1.in
+++ b/doc/man/sieve-dump.1.in
@@ -71,9 +71,9 @@ of active extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only
those extensions that are explicitly listed will be enabled. Unknown extensions
are ignored and a warning is produced.
-For example \fB\-x\fP \(dq+imapflags \-enotify\(dq will enable the deprecated
-imapflags extension and disable the enotify extension. The rest of the active
-extensions depends on the \fIsieve_extensions\fP and
+For example \fB\-x\fP \(dq+editheader \-enotify\(dq will enable the editheader
+extension and disable the enotify extension. The rest of the active extensions
+depends on the \fIsieve_extensions\fP and
\fIsieve_global_extensions\fP settings. By default, i.e.
when \fIsieve_extensions\fP and \fIsieve_global_extensions\fP remain
unconfigured, all supported extensions are available, except for deprecated
diff --git a/doc/man/sieve-filter.1.in b/doc/man/sieve-filter.1.in
index 1ce804b61..79ea11aa6 100644
--- a/doc/man/sieve-filter.1.in
+++ b/doc/man/sieve-filter.1.in
@@ -147,9 +147,9 @@ of active extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only
those extensions that are explicitly listed will be enabled. Unknown extensions
are ignored and a warning is produced.
-For example \fB\-x\fP \(dq+imapflags \-enotify\(dq will enable the deprecated
-imapflags extension and disable the enotify extension. The rest of the active
-extensions depends on the \fIsieve_extensions\fP and
+For example \fB\-x\fP \(dq+editheader \-enotify\(dq will enable the editheader
+extension and disable the enotify extension. The rest of the active extensions
+depends on the \fIsieve_extensions\fP and
\fIsieve_global_extensions\fP settings. By default, i.e.
when \fIsieve_extensions\fP and \fIsieve_global_extensions\fP remain
unconfigured, all supported extensions are available, except for deprecated
diff --git a/doc/man/sieve-test.1.in b/doc/man/sieve-test.1.in
index 65e5230dd..c7d6bd4cc 100644
--- a/doc/man/sieve-test.1.in
+++ b/doc/man/sieve-test.1.in
@@ -133,9 +133,9 @@ of active extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only
those extensions that are explicitly listed will be enabled. Unknown extensions
are ignored and a warning is produced.
-For example \fB\-x\fP \(dq+imapflags \-enotify\(dq will enable the deprecated
-imapflags extension and disable the enotify extension. The rest of the active
-extensions depends on the \fIsieve_extensions\fP and
+For example \fB\-x\fP \(dq+editheader \-enotify\(dq will enable the editheader
+extension and disable the enotify extension. The rest of the active extensions
+depends on the \fIsieve_extensions\fP and
\fIsieve_global_extensions\fP settings. By default, i.e.
when \fIsieve_extensions\fP and \fIsieve_global_extensions\fP remain
unconfigured, all supported extensions are available, except for deprecated
diff --git a/doc/man/sievec.1.in b/doc/man/sievec.1.in
index 548bcca0c..74aae05c4 100644
--- a/doc/man/sievec.1.in
+++ b/doc/man/sievec.1.in
@@ -84,9 +84,9 @@ of active extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only
those extensions that are explicitly listed will be enabled. Unknown extensions
are ignored and a warning is produced.
-For example \fB\-x\fP \(dq+imapflags \-enotify\(dq will enable the deprecated
-imapflags extension and disable the enotify extension. The rest of the active
-extensions depends on the \fIsieve_extensions\fP and
+For example \fB\-x\fP \(dq+editheader \-enotify\(dq will enable the editheader
+extension and disable the enotify extension. The rest of the active extensions
+depends on the \fIsieve_extensions\fP and
\fIsieve_global_extensions\fP settings. By default, i.e.
when \fIsieve_extensions\fP and \fIsieve_global_extensions\fP remain
unconfigured, all supported extensions are available, except for deprecated
--
GitLab