Merge branch 'upstream' of ssh://antonio-guest@git.debian.org/git/pkg-mutt/mutt

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

diff --git a/doc/muttrc.man.head b/doc/muttrc.man.head
index d269a058c59fb7fffcaec6746a2baa2f65280f57..6df8c696c938659bfcf79243e80cea68ff00f7cc 100644 (file)
--- a/doc/muttrc.man.head
+++ b/doc/muttrc.man.head
@@ -40,7 +40,7 @@ similar to that of many popular shell programs, namely that a single
 quote is used to specify a literal string (one that is not
 interpreted for shell variables or quoting with a backslash [see
 next paragraph]), while double quotes indicate a string which
-should be evaluated.  For example, backquotes are evaluated inside of
+should be evaluated.  For example, backticks are evaluated inside of
 double quotes, but not single quotes.
 .PP
 \fB\(rs\fP quotes the next character, just as in shells such as bash and zsh.
@@ -58,7 +58,7 @@ middle of command names.
 .PP
 It is also possible to substitute the output of a Unix command in an
 initialization file.  This is accomplished by enclosing the command
-in backquotes (\fB`\fP\fIcommand\fP\fB`\fP).
+in backticks (\fB`\fP\fIcommand\fP\fB`\fP).
 .PP
 UNIX environment variables can be accessed like the way it is done in shells
 like sh and bash: Prepend the name of the variable by a dollar
@@ -95,7 +95,7 @@ specified group or groups. The syntax is similar to the \fBgroup\fP command,
 however the special character \fB*\fP can be used to empty a group of all of
 its contents.
 .IP
-These address groups can also be created implicitely by the \fBalias\fP, \fBlists\fP,
+These address groups can also be created implicitly by the \fBalias\fP, \fBlists\fP,
 \fBsubscribe\fP and \fBalternates\fP commands by specifying the optional \fI-group\fP
 option.
 .IP
@@ -218,7 +218,7 @@ specify multiple maps, put only a comma between the maps.
 .fi
 .IP
 If your terminal supports color, these commands can be used to
-assign \fIforeground\fP/\fIbackgound\fP combinations to certain
+assign \fIforeground\fP/\fIbackground\fP combinations to certain
 objects.  Valid objects are:
 .BR attachment ", " body ", " bold ", " header ", "
 .BR hdrdefault ", " index ", " indicator ", " markers ", "
@@ -357,7 +357,7 @@ This command adds the named \fIstring\fP to the keyboard buffer.
 .fi
 .IP
 These commands are used to set and manipulate configuration
-varibles.
+variables.
 .IP
 Mutt knows four basic types of variables: boolean, number, string
 and quadoption.  Boolean variables can be \fBset\fP (true),
@@ -558,7 +558,7 @@ message is part of a collapsed thread.
 cryptographically verified messages
 .TP
 ~x \fIEXPR\fP
-messages which contain \fIEXPR\fP in the \(lqReferences\(rq field
+messages which contain \fIEXPR\fP in the \(lqReferences\(rq or \(lqIn-Reply-To\(rq field
 .TP
 ~X \fIMIN\fP-\fIMAX\fP
 messages with MIN - MAX attachments
@@ -573,7 +573,7 @@ messages with a size in the range \fIMIN\fP to \fIMAX\fP
 duplicated messages (see $duplicate_threads)
 .TP
 ~$
-unreferenced message (requries threaded view)
+unreferenced message (requires threaded view)
 .TP
 ~(PATTERN)
 messages in threads containing messages matching a certain pattern, e.g. all threads containing messages from you: ~(~P)
@@ -582,9 +582,12 @@ messages in threads containing messages matching a certain pattern, e.g. all thr
 .PP
 In the above, \fIEXPR\fP is a regular expression.
 .PP
-With the \fB~m\fP, \fB~n\fP, \fB~X\fP, and \fB~z\fP operators, you can also
+With the \fB~d\fP, \fB~m\fP, \fB~n\fP, \fB~r\fP, \fB~X\fP, and \fB~z\fP operators, you can also
 specify ranges in the forms \fB<\fP\fIMAX\fP, \fB>\fP\fIMIN\fP,
 \fIMIN\fP\fB-\fP, and \fB-\fP\fIMAX\fP.
+.PP
+With the \fB~z\fP operator, the suffixes \(lqK\(rq and \(lqM\(rq are allowed to specify
+kilobyte and megabyte respectively.
 .SS Matching dates
 .PP
 The \fB~d\fP and \fB~r\fP operators are used to match date ranges,