From 9e93a502b273a79ce6856fce1466b7cfaa0723a3 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Sun, 17 Jan 2016 20:08:32 +0100
Subject: [PATCH] Fixed the document name of the vnd.dovecot.environment
 specification.

---
 .../spec-bosch-sieve-dovecot-environment.txt  | 122 +++++-------------
 .../spec-bosch-sieve-dovecot-environment.xml  |   4 +-
 2 files changed, 35 insertions(+), 91 deletions(-)

diff --git a/doc/rfc/spec-bosch-sieve-dovecot-environment.txt b/doc/rfc/spec-bosch-sieve-dovecot-environment.txt
index 86b15f536..e2cfbf4c3 100644
--- a/doc/rfc/spec-bosch-sieve-dovecot-environment.txt
+++ b/doc/rfc/spec-bosch-sieve-dovecot-environment.txt
@@ -1,61 +1,30 @@
 
 
 
-Pigeonhole Project                                              S. Bosch
-                                                      September 23, 2015
 
+                                                                S. Bosch
 
-             Sieve Email Filtering: Logging Debug Messages
+                                                        January 17, 2016
+
+
+          Sieve Email Filtering: Dovecot Environment Extension
+                  spec-bosch-sieve-dovecot-environment
 
 Abstract
 
    This document defines new vendor-defined items for the "environment"
    extension of the Sieve mail filtering language.
 
-
 Table of Contents
 
-   1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . . . 2
-   2.  Conventions Used in This Document . . . . . . . . . . . . . . . 2
-   3.  Dovecot Environment Items . . . . . . . . . . . . . . . . . . . 2
-   4.  Variables Namespace env . . . . . . . . . . . . . . . . . . . . 2
-   5.  Sieve Capability Strings  . . . . . . . . . . . . . . . . . . . 3
-   6.  Security Considerations . . . . . . . . . . . . . . . . . . . . 3
-   7.  Normative References  . . . . . . . . . . . . . . . . . . . . . 3
-   Author's Address  . . . . . . . . . . . . . . . . . . . . . . . . . 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bosch                                                           [Page 1]
-
-                          Sieve: Debug Logging            September 2015
-
+   1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . .   1
+   2.  Conventions Used in This Document . . . . . . . . . . . . . .   1
+   3.  Dovecot Environment Items . . . . . . . . . . . . . . . . . .   2
+   4.  Variables Namespace env . . . . . . . . . . . . . . . . . . .   2
+   5.  Sieve Capability Strings  . . . . . . . . . . . . . . . . . .   2
+   6.  Security Considerations . . . . . . . . . . . . . . . . . . .   3
+   7.  Normative References  . . . . . . . . . . . . . . . . . . . .   3
+   Author's Address  . . . . . . . . . . . . . . . . . . . . . . . .   3
 
 1.  Introduction
 
@@ -73,18 +42,26 @@ Bosch                                                           [Page 1]
    the Dovecot Secure IMAP server.  It will therefore most likely not be
    supported by web interfaces and GUI-based Sieve editors.
 
-
 2.  Conventions Used in This Document
 
    The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
    "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
    document are to be interpreted as described in [KEYWORDS].
 
+
+
+
+
+
+Bosch                     Expires July 20, 2016                 [Page 1]
+
+                       Sieve: Dovecot Environment           January 2016
+
+
    Conventions for notations are as in [SIEVE] Section 1.1, including
    use of the "Usage:" label for the definition of action and tagged
    arguments syntax.
 
-
 3.  Dovecot Environment Items
 
    The set of Dovecot-specific environment items is as follows:
@@ -98,21 +75,12 @@ Bosch                                                           [Page 1]
          The username of the recipient for this particular message
          delivery.
 
-
 4.  Variables Namespace env
 
    This document defines the variables namespace "env", in accordance
    with the "variables" extension document [VARIABLES], Section 3.  It
    makes environment items directly available as variables.  Since
    environment items are always read-only, variables in the "env"
-
-
-
-Bosch                                                           [Page 2]
-
-                          Sieve: Debug Logging            September 2015
-
-
    namespace can never be modified.
 
    Basically, the variable name for an environment item is composed of
@@ -133,16 +101,22 @@ Bosch                                                           [Page 2]
    fileinto :create "User\${env.vnd.dovecot.username}";
 
 
-
 5.  Sieve Capability Strings
 
    A Sieve implementation that supports the Dovecot-specific environment
    items outlined in this document will advertise the capability string
    "vnd.dovecot.environment".  Note that "vnd.dovecot.environment"
+
+
+
+Bosch                     Expires July 20, 2016                 [Page 2]
+
+                       Sieve: Dovecot Environment           January 2016
+
+
    implies "environment", and a script with "vnd.dovecot.environment" in
    a "require" list can omit "environment" from that list.
 
-
 6.  Security Considerations
 
    All of the security considerations given in the base Sieve
@@ -152,7 +126,6 @@ Bosch                                                           [Page 2]
    than the standard ones, so enabling this extension should be
    considered carefully.
 
-
 7.  Normative References
 
    [ENVIRONMENT]
@@ -161,14 +134,6 @@ Bosch                                                           [Page 2]
               <http://www.rfc-editor.org/info/rfc5183>.
 
    [KEYWORDS]
-
-
-
-Bosch                                                           [Page 3]
-
-                          Sieve: Debug Logging            September 2015
-
-
               Bradner, S., "Key words for use in RFCs to Indicate
               Requirement Levels", BCP 14, RFC 2119, March 1997.
 
@@ -179,7 +144,6 @@ Bosch                                                           [Page 3]
               Homme, K., "Sieve Email Filtering: Variables Extension",
               RFC 5229, January 2008.
 
-
 Author's Address
 
    Stephan Bosch
@@ -201,24 +165,4 @@ Author's Address
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bosch                                                           [Page 4]
-
+Bosch                     Expires July 20, 2016                 [Page 3]
diff --git a/doc/rfc/xml/spec-bosch-sieve-dovecot-environment.xml b/doc/rfc/xml/spec-bosch-sieve-dovecot-environment.xml
index 12ef1462e..a952c0617 100644
--- a/doc/rfc/xml/spec-bosch-sieve-dovecot-environment.xml
+++ b/doc/rfc/xml/spec-bosch-sieve-dovecot-environment.xml
@@ -17,8 +17,8 @@
 <!-- ***** FRONT MATTER ***** -->
 
 <front>
-<title abbrev="Sieve: Debug Logging">
-Sieve Email Filtering: Logging Debug Messages
+<title abbrev="Sieve: Dovecot Environment">
+Sieve Email Filtering: Dovecot Environment Extension
 </title>
 
 <author fullname="Stephan Bosch" initials="S." surname="Bosch">
-- 
GitLab