<<< Date Index >>>     <<< Thread Index >>>

[PATCH] manual: "set" means "yes", not "ask-yes" etc



Now I resend this patch as you all look
more active than last year.

Many trivial corrections in the manual.

-- 
tamo
Index: init.h
===================================================================
RCS file: /home/roessler/cvs/mutt/init.h,v
retrieving revision 3.60
diff -u -r3.60 init.h
--- init.h      27 Jan 2005 18:54:24 -0000      3.60
+++ init.h      4 Feb 2005 08:29:44 -0000
@@ -1192,9 +1192,10 @@
   { "move",            DT_QUAD, R_NONE, OPT_MOVE, M_ASKNO },
   /*
   ** .pp
-  ** Controls whether you will be asked to confirm moving read messages
+  ** Controls whether or not Mutt will move read messages
   ** from your spool mailbox to your ``$$mbox'' mailbox, or as a result of
-  ** a ``$mbox-hook'' command.
+  ** a ``$mbox-hook'' command. You will be asked to confirm moving
+  ** them if this option is set to either \fIask-yes\fP or \fIask-no\fP.
   */
   { "message_format",  DT_STR,  R_NONE, UL &MsgFmt, UL "%s" },
   /*
@@ -2006,7 +2007,7 @@
   /*
   ** .pp
   ** Controls whether or not messages are saved in the ``$$postponed''
-  ** mailbox when you elect not to send immediately.
+  ** mailbox when you select not to send immediately.
   */
   { "postponed",       DT_PATH, R_NONE, UL &Postponed, UL "~/postponed" },
   /*
@@ -2038,7 +2039,7 @@
   { "print",           DT_QUAD, R_NONE, OPT_PRINT, M_ASKNO },
   /*
   ** .pp
-  ** Controls whether or not Mutt asks for confirmation before printing.
+  ** When set to \fIask-yes\fP or \fIask-no\fP, Mutt asks for confirmation 
before printing.
   ** This is useful for people (like me) who accidentally hit ``p'' often.
   */
   { "print_command",   DT_PATH, R_NONE, UL &PrintCmd, UL "lpr" },
@@ -2140,8 +2141,9 @@
   { "recall",          DT_QUAD, R_NONE, OPT_RECALL, M_ASKYES },
   /*
   ** .pp
-  ** Controls whether or not you are prompted to recall postponed messages
-  ** when composing a new message.  Also see ``$$postponed''.
+  ** Controls whether or not Mutt recalls postponed messages
+  ** when composing a new message. If this option is set to \fIask-yes\fP
+  ** or \fIask-no\fP, you are prompted. Also see ``$$postponed''.
   ** .pp
   ** Setting this variable to ``yes'' is not generally useful, and thus not
   ** recommended.
@@ -2174,7 +2176,8 @@
   { "reply_to",                DT_QUAD, R_NONE, OPT_REPLYTO, M_ASKYES },
   /*
   ** .pp
-  ** If set, Mutt will ask you if you want to use the address listed in the
+  ** If set to \fIask-yes\fP or \fIask-no\fP, Mutt will ask you if you want
+  ** to use the address listed in the
   ** Reply-To: header field when replying to a message.  If you answer no,
   ** it will use the address in the From: header field instead.  This
   ** option is useful for reading a mailing list that sets the Reply-To:
@@ -2540,7 +2543,7 @@
   ** .dt %m  .dd the number of messages in the mailbox *
   ** .dt %M  .dd the number of messages shown (i.e., which match the current 
limit) *
   ** .dt %n  .dd number of new messages in the mailbox *
-  ** .dt %o  .dd number of old unread messages
+  ** .dt %o  .dd number of old unread messages *
   ** .dt %p  .dd number of postponed messages *
   ** .dt %P  .dd percentage of the way through the index
   ** .dt %r  .dd modified/read-only/won't-write/attach-message indicator,
@@ -2567,7 +2570,7 @@
   ** .pp
   ** where \fIsequence_char\fP is a character from the table above, and
   ** \fIoptional_string\fP is the string you would like printed if
-  ** \fIstatus_char\fP is nonzero.  \fIoptional_string\fP \fBmay\fP contain
+  ** \fIsequence_char\fP is nonzero.  \fIoptional_string\fP \fBmay\fP contain
   ** other sequence as well as normal text, but you may \fBnot\fP nest
   ** optional strings.
   ** .pp
@@ -2751,7 +2754,7 @@
   { "weed",            DT_BOOL, R_NONE, OPTWEED, 1 },
   /*
   ** .pp
-  ** When set, mutt will weed headers when when displaying, forwarding,
+  ** When set, mutt will weed headers when displaying, forwarding,
   ** printing, or replying to messages.
   */
   { "wrap_search",     DT_BOOL, R_NONE, OPTWRAPSEARCH, 1 },
@@ -2781,7 +2784,7 @@
   /*
   ** .pp
   ** Controls whether mutt writes out the Bcc header when preparing
-  ** messages to be sent.  Exim users may wish to use this.
+  ** messages to be sent.  Exim users may wish to unset this.
   */
   /*--*/
   { NULL }
Index: doc/manual.sgml.head
===================================================================
RCS file: /home/roessler/cvs/mutt/doc/manual.sgml.head,v
retrieving revision 3.35
diff -u -r3.35 manual.sgml.head
--- doc/manual.sgml.head        15 Jan 2005 07:36:37 -0000      3.35
+++ doc/manual.sgml.head        4 Feb 2005 08:29:45 -0000
@@ -56,8 +56,8 @@
 <sect1>IRC
 <p>
 Visit channel <em/#mutt/ on <htmlurl
-url="http://www.openprojects.net"; name="OpenProjects.Net
-(www.openprojects.net)"> to chat with other people interested in Mutt.
+url="http://www.freenode.net/"; name="irc.freenode.net
+(www.freenode.net)"> to chat with other people interested in Mutt.
 
 <sect1>USENET
 <p>
@@ -411,7 +411,7 @@
 <p><bf/list-reply/<label id="list-reply"> (default: L)<newline>
 
 Reply to the current or tagged message(s) by extracting any addresses which
-match the addresses given by the <ref id="lists" name="lists or subscribe">
+match the regular expressions given by the <ref id="lists" name="lists or 
subscribe">
 commands, but also honor any <tt/Mail-Followup-To/ header(s) if the
 <ref id="honor_followup_to" name="&dollar;honor&lowbar;followup&lowbar;to">
 configuration variable is set.  Using this when replying to messages posted
@@ -1182,7 +1182,7 @@
 sent to a different party, mutt will automatically suggest to send
 the response to the original message's recipients -- responding to
 yourself won't make much sense in many cases.  (See <ref
-id="reply_to" name="&dollar;reply_to">.)
+id="reply_to" name="&dollar;reply&lowbar;to">.)
 
 Many users receive e-mail under a number of different addresses. To
 fully use mutt's features here, the program must be able to
@@ -1211,7 +1211,7 @@
 supported by all mail user agents.  Adding it is not bullet-proof against
 receiving personal CCs of list messages.  Also note that the generation
 of the Mail-Followup-To header is controlled by the <ref id="followup_to"
-name="&dollar;followup_to"> configuration variable.
+name="&dollar;followup&lowbar;to"> configuration variable.
 
 More precisely, Mutt maintains lists of patterns for the addresses
 of known and subscribed mailing lists.  Every subscribed mailing
@@ -1231,8 +1231,8 @@
 initialization file.  To tell mutt that you are subscribed to it,
 add ``subscribe mutt-users'' to your initialization file instead.
 If you also happen to get mail from someone whose address is
-<em/mutt-users@xxxxxxxxxxx/, you could use ``lists mutt-users@xxxxxxxx'' 
-or ``subscribe mutt-users@xxxxxxxx'' to
+<em/mutt-users@xxxxxxxxxxx/, you could use ``lists 
mutt-users@mutt&bsol;&bsol;.org'' 
+or ``subscribe mutt-users@mutt&bsol;&bsol;.org'' to
 match only mail from the actual list.
 
 The ``unlists'' command is used to remove a token from the list of
@@ -1375,7 +1375,7 @@
 
 See <ref id="pattern_hook" name="Message Matching in Hooks"> for information 
on the exact format of <em/pattern/.
 
-Example: <tt/fcc-hook aol.com&dollar; +spammers/
+Example: <tt/fcc-hook [@.]aol&bsol;&bsol;.com&dollar; +spammers/
 
 The above will save a copy of all messages going to the aol.com domain to
 the `+spammers' mailbox by default.  Also see the <ref id="fcc-save-hook" 
@@ -2104,7 +2104,7 @@
 
 <tscreen><verb>
 send-hook . 'unmy_hdr From:'
-send-hook ~Cb@xxx my_hdr from: c@xxx
+send-hook ~C'^b@b\.b$' my_hdr from: c@xxx
 </verb></tscreen>
 
 <sect2>Message Matching in Hooks<label id="pattern_hook">
@@ -2298,10 +2298,11 @@
 to reply directly to the author in private, since most mail clients
 will automatically reply to the address given in the ``Reply-To''
 field.  Mutt uses the <ref id="reply_to" name="&dollar;reply&lowbar;to">
-variable to help decide which address to use.  If set, you will be
+variable to help decide which address to use.  If set to <em/ask-yes/ or
+<em/ask-no/, you will be
 prompted as to whether or not you would like to use the address given in
 the ``Reply-To'' field, or reply directly to the address given in the
-``From'' field.  When unset, the ``Reply-To'' field will be used when
+``From'' field.  When set to <em/yes/, the ``Reply-To'' field will be used when
 present.
 
 The ``X-Label:'' header field can be used to further identify mailing
Index: doc/manual.sgml.tail
===================================================================
RCS file: /home/roessler/cvs/mutt/doc/manual.sgml.tail,v
retrieving revision 3.3
diff -u -r3.3 manual.sgml.tail
--- doc/manual.sgml.tail        19 Nov 2004 16:16:51 -0000      3.3
+++ doc/manual.sgml.tail        4 Feb 2005 08:45:26 -0000
@@ -45,6 +45,7 @@
 tag-prefix                 ;   apply next command to tagged entries
 tag-prefix-cond    not bound   apply next function ONLY to tagged messages
 top-page                   H   move to the top of the page
+what-key           not bound   display the keycode for a key press
 </verb>
 <sect2>index
 <p>