Better document how the initial folder is determined. Closes #3189.

diff --git a/ChangeLog b/ChangeLog
index 545db537ffd2c623e84bce526f163bae7f008eec..a9c61c2c7eac3a17074ff0a0d6506b2b0fe14a91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-15 16:09 +0100  Rocco Rutte  <pdmef@gmx.net>  (ee5e696a9d08)
+
+       * doc/manual.xml.head, headers.c: Support spaces in Attach:
+       pseudoheader. Closes #3179.
+
+2009-02-10 13:05 +0100  Rocco Rutte  <pdmef@gmx.net>  (a21f8bf84149)
+
+       * ChangeLog, init.h: Fix documentation typos. Closes #3178.
+
 2009-01-27 12:58 -0800  Brendan Cully  <brendan@kublai.com>  (7ddf1d1cc490)
 
        * imap/imap.c: Move socket close into imap_logout from imap_logout_all

diff --git a/doc/mutt.man b/doc/mutt.man
index b4318c4627a31c009217b7891e75d5cfbaf2ed64..3d78349e5a2aa598487b18d502bde6873e324dbe 100644 (file)
--- a/doc/mutt.man
+++ b/doc/mutt.man
@@ -109,7 +109,7 @@ message.
 .IP "-i \fIinclude\fP"
 Specify a file to include into the body of a message.
 .IP "-m \fItype\fP       "
-specify a default mailbox type
+specify a default mailbox type for newly created folders.
 .IP "-n"
 Causes Mutt to bypass the system configuration file.
 .IP "-p"
@@ -151,8 +151,8 @@ Full path of the user's home directory.
 .IP "MAIL"
 Full path of the user's spool mailbox.
 .IP "MAILDIR"
-Full path of the user's spool mailbox.  Commonly used when the spool
-mailbox is a 
+Full path of the user's spool mailbox if MAIL is unset.  Commonly used when the spool
+mailbox is a
 .B maildir (5)
 folder.
 .IP "MAILCAPS"

diff --git a/init.h b/init.h
index 22689f3dfb7d475e92456d87f8376a7705b245ad..fcb130cb82c533b63bb0ac1f14d01d723ebfc62a 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1273,7 +1273,8 @@ struct option_t MuttVars[] = {
   /*
   ** .pp
   ** The default mailbox type used when creating new folders. May be any of
-  ** ``mbox'', ``MMDF'', ``MH'' and ``Maildir''.
+  ** ``mbox'', ``MMDF'', ``MH'' and ``Maildir''. This is overriden by the
+  ** \fC-m\fP command-line option.
   */
   { "metoo",           DT_BOOL, R_NONE, OPTMETOO, 0 },
   /*
@@ -2943,8 +2944,8 @@ struct option_t MuttVars[] = {
   ** .pp
   ** If your spool mailbox is in a non-default place where Mutt cannot find
   ** it, you can specify its location with this variable.  Mutt will
-  ** automatically set this variable to the value of the environment
-  ** variable \fC$$$MAIL\fP if it is not set.
+  ** initially set this variable to the value of the environment
+  ** variable \fC$$$MAIL\fP or \fC$$$MAILDIR\fP if either is defined.
   */
   { "status_chars",    DT_STR,  R_BOTH, UL &StChars, UL "-*%A" },
   /*