Update copyright year to 2016

[gnus] / texi / sieve.texi

diff --git a/texi/sieve.texi b/texi/sieve.texi
index 532c964..0b794fb 100644 (file)
--- a/texi/sieve.texi
+++ b/texi/sieve.texi
@@ -1,7 +1,10 @@
 \input texinfo                  @c -*-texinfo-*-
 
-@setfilename sieve
+@include gnus-overrides.texi
+
+@setfilename sieve.info
 @settitle Emacs Sieve Manual
+@include docstyle.texi
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -9,30 +12,22 @@
 @copying
 This file documents the Emacs Sieve package, for server-side mail filtering.
 
-Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-Free Software Foundation, Inc.
+Copyright @copyright{} 2001--2016 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Sieve: (sieve).               Managing Sieve scripts in Emacs.
 @end direntry
@@ -42,7 +37,12 @@ license to the document, as described in section 6 of the license.
 @setchapternewpage odd
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Emacs Sieve Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Emacs Sieve Manual
+@end ifclear
 
 @author by Simon Josefsson
 @page
@@ -50,13 +50,13 @@ license to the document, as described in section 6 of the license.
 @insertcopying
 @end titlepage
 
+@summarycontents
+@contents
 
 @node Top
 @top Sieve Support for Emacs
 
-This manual documents the Emacs Sieve package.
-
-It is intended as a users manual for Sieve Mode and Manage Sieve, and
+This is intended as a users manual for Sieve Mode and Manage Sieve, and
 as a reference manual for the @samp{sieve-manage} protocol Emacs Lisp
 API.
 
@@ -64,7 +64,9 @@ Sieve is a language for server-side filtering of mail.  The language
 is documented in RFC 3028.  This manual does not attempt to document
 the language, so keep RFC 3028 around.
 
-A good online Sieve resources is @uref{http://www.cyrusoft.com/sieve/}.
+@ifnottex
+@insertcopying
+@end ifnottex
 
 @menu
 * Installation::          Getting ready to use the package.
@@ -148,7 +150,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.
@@ -158,7 +160,7 @@ press RET on <new script> to create a new script.
 @end example
 
 One of the scripts are highlighted, and standard point navigation
-commands (@kbd{<up>}, @kbd{<down>} etc) can be used to navigate the
+commands (@kbd{<up>}, @kbd{<down>} etc.)@: can be used to navigate the
 list.
 
 The following commands are available in the Manage Sieve buffer:
@@ -211,7 +213,12 @@ Bury the Manage Sieve buffer without closing the connection.
 @kindex ?
 @kindex h
 @findex sieve-help
-Displays help in the minibuffer. 
+Displays help in the minibuffer.
+
+@item Q
+@kindex Q
+@findex sieve-manage-quit
+Quit Manage Sieve and close the connection.
 
 @end table
 
@@ -232,7 +239,7 @@ the @code{fileinto} command.
 require "fileinto";
 
 if address "sender" "owner-w3-beta@@xemacs.org" @{
-       fileinto "INBOX.w3-beta";
+        fileinto "INBOX.w3-beta";
 @}
 @end example
 
@@ -243,7 +250,7 @@ required.
 
 @example
 if header :contains "Delivered-To" "auc-tex@@sunsite.dk" @{
-       fileinto "INBOX.auc-tex";
+        fileinto "INBOX.auc-tex";
 @}
 @end example
 
@@ -254,7 +261,7 @@ has been required.
 
 @example
 if address ["to", "cc"] "kerberos@@mit.edu" @{
-       fileinto "INBOX.kerberos";
+        fileinto "INBOX.kerberos";
 @}
 @end example
 
@@ -269,10 +276,6 @@ in the @code{sieve} group (@kbd{M-x customize-group RET sieve RET}):
 
 @table @code
 
-@item sieve-manage-default-user
-@vindex sieve-manage-default-user
-Sets the default username.
-
 @item sieve-manage-default-port
 @vindex sieve-manage-default-port
 Sets the default port to use, the suggested port number is @code{2000}.
@@ -345,7 +348,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
@@ -358,12 +361,6 @@ A Protocol for Remotely Managing Sieve Scripts
 @unnumbered Index
 @printindex cp
 
-@summarycontents
-@contents
 @bye
 
 @c End:
-
-@ignore
-   arch-tag: 6e3ad0af-2eaf-4f35-a081-d40f4a683ec3
-@end ignore