mutt stable branch with some hacks

In the manual, replaced 2 para by example (similar to the first example).

+6 -4
+6 -4
doc/manual.xml.head
··· 5204 5204 recipients are all from Germany, and who are known to your alias list. 5205 5205 </para> 5206 5206 5207 - <para> 5207 + <example id="ex-restrict-to-aliases"> 5208 + <title>Matching restricted to aliases</title> 5208 5209 <screen> 5209 5210 ^@~C \.de$ 5210 5211 </screen> 5211 - </para> 5212 + </example> 5212 5213 5213 5214 <para> 5214 5215 To match any defined alias, use a regular expression that matches any 5215 5216 string. This example matches messages whose senders are known aliases. 5216 5217 </para> 5217 5218 5218 - <para> 5219 + <example id="ex-match-alias"> 5220 + <title>Matching any defined alias</title> 5219 5221 <screen> 5220 5222 @~f . 5221 5223 </screen> 5222 - </para> 5224 + </example> 5223 5225 5224 5226 </sect2> 5225 5227