Add upstream/542344-dont_fold_From_: Do not wrap From_ header (Closes: #542344)

[software/mutt-debian.git] / doc / mutt.man

diff --git a/doc/mutt.man b/doc/mutt.man
index b4318c4627a31c009217b7891e75d5cfbaf2ed64..18ad76a0d184974227c4b9e0ff0614b03b68311f 100644 (file)
--- a/doc/mutt.man
+++ b/doc/mutt.man
@@ -24,41 +24,39 @@ mutt \- The Mutt Mail User Agent
 .PP
 .B mutt
 [-nRyzZ] 
 .PP
 .B mutt
 [-nRyzZ] 

-[-e \fIcmd\fP] [-F \fIfile\fP] [-m \fItype\fP] [-f \fIfile\fP]
+[\-e \fIcmd\fP] [\-F \fIfile\fP] [\-m \fItype\fP] [\-f \fIfile\fP]

 .PP
 .B mutt 
 .PP
 .B mutt 

-[-nx] 
-[-e \fIcmd\fP] 
-[-F \fIfile\fP]
-[-H \fIfile\fP]
-[-i \fIfile\fP]
-[-s \fIsubj\fP]
-[-b \fIaddr\fP]
-[-c \fIaddr\fP]
-[\-a \fIfile\fP [...]]
-[\-\-]
+[\-nx] 
+[\-e \fIcmd\fP] 
+[\-F \fIfile\fP]
+[\-H \fIfile\fP]
+[\-i \fIfile\fP]
+[\-s \fIsubj\fP]
+[\-b \fIaddr\fP]
+[\-c \fIaddr\fP]
+[\-a \fIfile\fP [...] \-\-]

 \fIaddr\fP [...]
 .PP
 .B mutt 
 \fIaddr\fP [...]
 .PP
 .B mutt 

-[-nx] 
-[-e \fIcmd\fP] 
-[-F \fIfile\fP]
-[-s \fIsubj\fP]
-[-b \fIaddr\fP]
-[-c \fIaddr\fP]
-[\-a \fIfile\fP [...]]
-[\-\-]
+[\-nx] 
+[\-e \fIcmd\fP] 
+[\-F \fIfile\fP]
+[\-s \fIsubj\fP]
+[\-b \fIaddr\fP]
+[\-c \fIaddr\fP]
+[\-a \fIfile\fP [...] \-\-]

 \fIaddr\fP [...]
 < message
 .PP
 .B mutt
 \fIaddr\fP [...]
 < message
 .PP
 .B mutt

-[-n] [-e \fIcmd\fP] [-F \fIfile\fP] -p
+[\-n] [\-e \fIcmd\fP] [\-F \fIfile\fP] \-p

 .PP
 .B mutt
 .PP
 .B mutt

-[-n] [-e \fIcmd\fP] [-F \fIfile\fP] -A \fIalias\fP
+[\-n] [\-e \fIcmd\fP] [\-F \fIfile\fP] \-A \fIalias\fP

 .PP
 .B mutt
 .PP
 .B mutt

-[-n] [-e \fIcmd\fP] [-F \fIfile\fP] -Q \fIquery\fP
+[\-n] [\-e \fIcmd\fP] [\-F \fIfile\fP] \-Q \fIquery\fP

 .PP
 .B mutt 
 -v[v]
 .PP
 .B mutt 
 -v[v]


@@ -82,8 +80,10 @@ text, HTML, and/or PDF format.
 An expanded version of the given alias is passed to stdout.
 .IP "-a \fIfile\fP [...]"
 Attach a file to your message using MIME.
 An expanded version of the given alias is passed to stdout.
 .IP "-a \fIfile\fP [...]"
 Attach a file to your message using MIME.

-To attach multiple files, separating filenames and recipient addresses with
-"\-\-" is mandatory, e.g. \fBmutt \-a img.jpg *.png \-\- addr1 addr2\fP.
+When attaching single or multiple files, separating filenames and recipient addresses with
+"\-\-" is mandatory, e.g. \fBmutt -a image.jpg \-\- addr1\fP or
+\fBmutt \-a img.jpg *.png \-\- addr1 addr2\fP.
+The \-a option must be placed at the end of command line options.

 .IP "-b \fIaddress\fP"
 Specify a blind-carbon-copy (BCC) recipient
 .IP "-c \fIaddress\fP"
 .IP "-b \fIaddress\fP"
 Specify a blind-carbon-copy (BCC) recipient
 .IP "-c \fIaddress\fP"


@@ -109,7 +109,7 @@ message.
 .IP "-i \fIinclude\fP"
 Specify a file to include into the body of a message.
 .IP "-m \fItype\fP       "
 .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"
 .IP "-n"
 Causes Mutt to bypass the system configuration file.
 .IP "-p"


@@ -132,12 +132,12 @@ Emulate the mailx compose mode.
 Start Mutt with a listing of all mailboxes specified by the \fImailboxes\fP
 command.
 .IP "-z"
 Start Mutt with a listing of all mailboxes specified by the \fImailboxes\fP
 command.
 .IP "-z"

-When used with -f, causes Mutt not to start if there are no messages in the
+When used with \-f, causes Mutt not to start if there are no messages in the

 mailbox.
 .IP "-Z"
 Causes Mutt to open the first mailbox specified by the \fImailboxes\fP
 command which contains new mail.
 mailbox.
 .IP "-Z"
 Causes Mutt to open the first mailbox specified by the \fImailboxes\fP
 command which contains new mail.

-.IP "\-\-"
+.IP "--"

 Treat remaining arguments as \fIaddr\fP even if they start with a dash.
 See also "\-a" above.
 .SH ENVIRONMENT
 Treat remaining arguments as \fIaddr\fP even if they start with a dash.
 See also "\-a" above.
 .SH ENVIRONMENT


@@ -151,8 +151,8 @@ Full path of the user's home directory.
 .IP "MAIL"
 Full path of the user's spool mailbox.
 .IP "MAILDIR"
 .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"
 .B maildir (5)
 folder.
 .IP "MAILCAPS"