Merge branch 'jave-xwidget' into xwidget

2 files changed, 14 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4cae3d0a478..0837c8e06f2 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-13  Albert Krewinkel  <tarleb@moltkeplatz.de>
+
+        * sieve.texi: (Managing Sieve): Fix port in example, fix documentation
+        for keys q and Q.
+        (Standards): Reference RFC5804 as the defining document of the
+        managesieve protocol.
+
 2013-06-10  Aidan Gauland  <aidalgol@amuri.net>
 
         * eshell.texi (Input/Output): Expand to cover new visual-command
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index b84c3047ec1..f69e2b9b948 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -149,7 +149,7 @@ When a server has been successfully contacted, the Manage Sieve buffer
 looks something like:
 
 @example
-Server  : mailserver:2000
+Server  : mailserver:sieve
 
 2 scripts on server, press RET on a script name edits it, or
 press RET on <new script> to create a new script.
@@ -214,6 +214,11 @@ Bury the Manage Sieve buffer without closing the connection.
 @findex sieve-help
 Displays help in the minibuffer.
 
+@item Q
+@kindex Q
+@findex sieve-manage-quit
+Quit Manage Sieve and close the connection.
+
 @end table
 
 @node Examples
@@ -342,7 +347,7 @@ lists the relevant ones.  They can all be fetched from
 @item RFC3028
 Sieve: A Mail Filtering Language.
 
-@item draft-martin-managesieve-03
+@item RFC5804
 A Protocol for Remotely Managing Sieve Scripts
 
 @end table