Improve section on patterns

diff --git a/ChangeLog b/ChangeLog
index 73e5c9613bbdfdd77a8c7429978a6763d82fe47f..735b559886cb1ce7d425e8be44bef6c8315fa9c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-03-19 16:47 +0100  Rocco Rutte  <pdmef@gmx.net>  (de835501d8db)
+
+       * curs_lib.c: Fix progress update debug message
+
+2009-03-19 15:35 +0100  Rocco Rutte  <pdmef@gmx.net>  (acfaa2273124)
+
+       * ChangeLog, doc/manual.xml.head, doc/muttrc.man.head: Document kilo
+       and mega suffixes for range patterns
+
+       Document it only for ~z (message size) as they don't make much sense
+       for other patterns like message score or number of attachments.
+
 2009-03-18 17:40 +0100  Rocco Rutte  <pdmef@gmx.net>  (8528b8e715da)
 
        * init.h: Properly initialize more structs

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 31ae6b7e5c559ab77971c3286cd7ad17e14d0e95..8bb02c427a9ac1cb62bc5b5c7f321798c62cb82f 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -4187,6 +4187,9 @@ they may or may not be available in stock libraries on various systems.
 <sect1 id="patterns">
 <title>Patterns: Searching, Limiting and Tagging</title>
 
+<sect2 id="patterns-modifier">
+<title>Pattern Modifier</title>
+
 <para>
 Many of Mutt's commands allow you to specify a pattern to match
 (<literal>limit</literal>, <literal>tag-pattern</literal>,
@@ -4258,7 +4261,21 @@ threads containing messages from you: ~(~P)</entry></row>
 
 <para>
 Where <emphasis>EXPR</emphasis> is a
-<link linkend="regexp">regular expression</link>.  Special attention has to be
+<link linkend="regexp">regular expression</link>. 
+</para>
+
+<para>
+*) The forms <quote>&lt;&lsqb;<emphasis>MAX</emphasis>&rsqb;</quote>, <quote>&gt;&lsqb;<emphasis>MIN</emphasis>&rsqb;</quote>,
+<quote>&lsqb;<emphasis>MIN</emphasis>&rsqb;-</quote> and <quote>-&lsqb;<emphasis>MAX</emphasis>&rsqb;</quote>
+are allowed, too.
+</para>
+
+<para>
+**) The suffixes <quote>K</quote> and <quote>M</quote> are allowed to specify kilobyte and megabyte respectively.
+</para>
+
+<para>
+Special attention has to be
 made when using regular expressions inside of patterns.  Specifically,
 Mutt's parser for these patterns will strip one level of backslash (<quote>\</quote>),
 which is normally used for quoting.  If it is your intention to use a
@@ -4270,48 +4287,36 @@ the literal string <quote>*.*</quote>. Simple string matches are less powerful t
 regular expressions but can be considerably faster. This is especially
 true for IMAP folders, because string matches can be performed on the
 server instead of by fetching every message. IMAP treats <literal>=h</literal> specially:
-it must be of the form "header: substring" and will not partially
+it must be of the form <quote>header: substring</quote> and will not partially
 match header names. The substring part may be omitted if you simply
 wish to find messages containing a particular header without regard to
 its value.
 </para>
 
 <para>
-*) The forms <quote>&lt;&lsqb;<emphasis>MAX</emphasis>&rsqb;</quote>, <quote>&gt;&lsqb;<emphasis>MIN</emphasis>&rsqb;</quote>,
-<quote>&lsqb;<emphasis>MIN</emphasis>&rsqb;-</quote> and <quote>-&lsqb;<emphasis>MAX</emphasis>&rsqb;</quote>
-are allowed, too.
-</para>
-
-<para>
-**) The suffixes <quote>K</quote> and <quote>M</quote> are allowed to specify kilobyte and megabyte respectively.
-</para>
-
-<sect2 id="patterns-modifier">
-<title>Pattern Modifier</title>
-
-<note>
-<para>
-Note that patterns matching 'lists' of addresses (notably c, C, p, P and t)
+Patterns matching lists of addresses (notably c, C, p, P and t)
 match if there is at least one match in the whole list. If you want to
 make sure that all elements of that list match, you need to prefix your
 pattern with <quote>&circ;</quote>.
 This example matches all mails which only has recipients from Germany.
 </para>
-</note>
 
+<example id="ex-recips">
+<title>Matching all addresses in address lists</title>
 <screen>
 ^~C \.de$
 </screen>
+</example>
 
 </sect2>
 
-<sect2 id="simple-patterns">
-<title>Simple Patterns</title>
+<sect2 id="simple-searches">
+<title>Simple Searches</title>
 
 <para>
-Mutt supports two versions of so called <quote>simple searches</quote> which are
+Mutt supports two versions of so called <quote>simple searches</quote>. These are
 issued if the query entered for searching, limiting and similar
-operations does not seem to be a valid pattern (i.e. it does not contain
+operations does not seem contain a valid pattern modifier (i.e. it does not contain
 one of these characters: <quote>&tilde;</quote>, <quote>=</quote> or <quote>&percnt;</quote>). If the query is
 supposed to contain one of these special characters, they must be escaped
 by prepending a backslash (<quote>\</quote>).
@@ -4361,7 +4366,7 @@ for the composed complex query.
 </sect2>
 
 <sect2 id="complex-patterns">
-<title>Complex Patterns</title>
+<title>Nesting and Boolean Operators</title>
 
 <para>
 Logical AND is performed by specifying more than one criterion.  For