Manual: Fold consecutive <cmdsynopsis/> into just one

This make it visually easier to spot what belongs together.

diff --git a/ChangeLog b/ChangeLog
index 14e6ea78d82e8341784073226fff3d60ff82e225..41bfa9de8124c27158c0ff97afcaf4a425df0486 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-05 09:09 +0200  Rocco Rutte  <pdmef@gmx.net>  (864b19c6829f)
+
+       * doc/manual.xml.head: Manual: More entities and <quotes/> as
+       appropriate
+
+2009-04-04 16:23 +0200  Rocco Rutte  <pdmef@gmx.net>  (a4b635e96b30)
+
+       * ChangeLog, doc/Makefile.am: Manual: Improve 'sortcheck' target
+
+       Don't call up diff+pager if all is sorted and remove the temp files
+       for diffing we created.
+
 2009-04-04 15:37 +0200  Rocco Rutte  <pdmef@gmx.net>  (d4ea8e9a9024)
 
        * doc/gen-map-doc, doc/manual.xml.head, doc/manual.xml.tail: Manual:

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index d3d59144b2fe89ff2ce9008853dc3cbc70380133..486fb8851fce002191c4c56d0c6a1b940b1c1e2e 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -1866,9 +1866,7 @@ question marks into regular expressions).</para></listitem>
 <replaceable class="parameter">expr</replaceable>
 </arg>
 </group>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>ungroup</command>
 <arg choice="opt" rep="repeat">
 <option>-group</option>
@@ -2260,9 +2258,7 @@ sequence.
 <arg choice="plain">
 <replaceable class="parameter">charset</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>iconv-hook<anchor id="iconv-hook"/></command>
 <arg choice="plain">
 <replaceable class="parameter">charset</replaceable>
@@ -2438,9 +2434,7 @@ silently truncated at the screen width, and are not wrapped.
 <arg choice="plain">
 <replaceable class="parameter">background</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>color</command>
 <group choice="req">
 <arg choice="plain">
@@ -2459,9 +2453,7 @@ silently truncated at the screen width, and are not wrapped.
 <arg choice="plain">
 <replaceable class="parameter">regexp</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>color</command>
 <arg choice="plain">
 <option>index</option>
@@ -2475,9 +2467,7 @@ silently truncated at the screen width, and are not wrapped.
 <arg choice="plain">
 <replaceable class="parameter">pattern</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>uncolor</command>
 <arg choice="plain">
 <option>index</option>
@@ -2602,9 +2592,7 @@ attributes through the use of the <quote>mono</quote> command. Usage:
 <arg choice="plain">
 <replaceable class="parameter">attribute</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>mono</command>
 <group choice="req">
 <arg choice="plain">
@@ -2620,9 +2608,7 @@ attributes through the use of the <quote>mono</quote> command. Usage:
 <arg choice="plain">
 <replaceable class="parameter">regexp</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>mono</command>
 <arg choice="plain">
 <option>index</option>
@@ -2633,9 +2619,7 @@ attributes through the use of the <quote>mono</quote> command. Usage:
 <arg choice="plain">
 <replaceable class="parameter">pattern</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unmono</command>
 <arg choice="plain">
 <option>index</option>
@@ -2681,9 +2665,7 @@ can be one of the following:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">pattern</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unignore</command>
 <group choice="req">
 <arg choice="plain">
@@ -2743,9 +2725,7 @@ unignore posted-to:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">header</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unhdr&lowbar;order</command>
 <group choice="req">
 <arg choice="plain">
@@ -2794,9 +2774,7 @@ hdr&lowbar;order From Date: From: To: Cc: Subject:
 <arg choice="opt" rep="repeat">
 <replaceable>regexp</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unalternates</command>
 <arg choice="opt" rep="repeat">
 <option>-group</option>
@@ -2892,9 +2870,7 @@ is <quote>*</quote>, <emphasis>all entries</emphasis> on <literal>alternates</li
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">regexp</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unlists</command>
 <arg choice="opt" rep="repeat">
 <option>-group</option>
@@ -2908,9 +2884,7 @@ is <quote>*</quote>, <emphasis>all entries</emphasis> on <literal>alternates</li
 <replaceable class="parameter">regexp</replaceable>
 </arg>
 </group>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>subscribe</command>
 <arg choice="opt" rep="repeat">
 <option>-group</option>
@@ -2922,9 +2896,7 @@ is <quote>*</quote>, <emphasis>all entries</emphasis> on <literal>alternates</li
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">regexp</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unsubscribe</command>
 <arg choice="opt" rep="repeat">
 <option>-group</option>
@@ -3064,9 +3036,7 @@ mailbox).
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">mailbox</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unmailboxes</command>
 <group choice="req">
 <arg choice="plain">
@@ -3148,9 +3118,7 @@ mail detection instead which won't work for size-neutral changes.
 <arg choice="plain">
 <replaceable class="parameter">string</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unmy&lowbar;hdr</command>
 <group choice="req">
 <arg choice="plain">
@@ -3339,9 +3307,7 @@ to <link linkend="index-format">&dollar;index&lowbar;format</link>.
 <arg choice="plain">
 <replaceable class="parameter">command</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>send-hook</command>
 <arg choice="plain">
 <replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
@@ -3349,9 +3315,7 @@ to <link linkend="index-format">&dollar;index&lowbar;format</link>.
 <arg choice="plain">
 <replaceable class="parameter">command</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>send2-hook</command>
 <arg choice="plain">
 <replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
@@ -3559,9 +3523,7 @@ listed in the <link linkend="functions">function reference</link>.
 <arg choice="plain">
 <replaceable class="parameter">value</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unscore</command>
 <group choice="req">
 <arg choice="plain">
@@ -3606,9 +3568,7 @@ of all score entries.
 <arg choice="plain">
 <replaceable class="parameter">format</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>nospam</command>
 <group choice="req">
 <arg choice="plain">
@@ -3864,9 +3824,7 @@ The following commands are available to manipulate and query variables:
 </arg>
 </group>
 <arg choice="opt" rep="repeat"></arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>toggle</command>
 <arg choice="plain">
 <replaceable class="parameter">variable</replaceable>
@@ -3874,9 +3832,7 @@ The following commands are available to manipulate and query variables:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">variable</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unset</command>
 <arg choice="plain">
 <replaceable class="parameter">variable</replaceable>
@@ -3884,9 +3840,7 @@ The following commands are available to manipulate and query variables:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">variable</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>reset</command>
 <arg choice="plain">
 <replaceable class="parameter">variable</replaceable>
@@ -6485,9 +6439,7 @@ The syntax is:
 <arg choice="plain">
 <replaceable>mime-type</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>unattachments</command>
 <arg choice="plain">
 <replaceable>&lcub; + &verbar; - &rcub;disposition</replaceable>
@@ -6495,9 +6447,7 @@ The syntax is:
 <arg choice="plain">
 <replaceable>mime-type</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command>attachments</command>
 <arg choice="plain">
 <replaceable>?</replaceable>
@@ -7596,9 +7546,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">address</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="alias">unalias</link></command>
 <arg choice="opt" rep="repeat">
 <option>-group</option>
@@ -7628,9 +7576,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable>regexp</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="alternates">unalternates</link></command>
 <arg choice="opt" rep="repeat">
 <option>-group</option>
@@ -7656,9 +7602,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable>mimetype</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="alternative-order">unalternative-order</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -7680,9 +7624,7 @@ The following are the commands understood by Mutt:
 <arg choice="plain">
 <replaceable>mime-type</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="attachments">unattachments</link></command>
 <arg choice="plain">
 <replaceable>&lcub; + &verbar; - &rcub;disposition</replaceable>
@@ -7702,9 +7644,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable>mimetype</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="auto-view">unauto-view</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -7768,8 +7708,7 @@ The following are the commands understood by Mutt:
 <arg choice="plain">
 <replaceable class="parameter">background</replaceable>
 </arg>
-</cmdsynopsis>
-<cmdsynopsis>
+
 <command><link linkend="color">color</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -7788,8 +7727,7 @@ The following are the commands understood by Mutt:
 <arg choice="plain">
 <replaceable class="parameter">regexp</replaceable>
 </arg>
-</cmdsynopsis>
-<cmdsynopsis>
+
 <command><link linkend="color">color</link></command>
 <arg choice="plain">
 <option>index</option>
@@ -7803,9 +7741,7 @@ The following are the commands understood by Mutt:
 <arg choice="plain">
 <replaceable class="parameter">pattern</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="color">uncolor</link></command>
 <arg choice="plain">
 <option>index</option>
@@ -7893,9 +7829,7 @@ The following are the commands understood by Mutt:
 <replaceable class="parameter">expr</replaceable>
 </arg>
 </group>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="addrgroup">ungroup</link></command>
 <arg choice="opt" rep="repeat">
 <option>-group</option>
@@ -7926,9 +7860,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">header</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="hdr-order">unhdr&lowbar;order</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -7950,9 +7882,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">pattern</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="ignore">unignore</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -7978,9 +7908,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">regexp</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="lists">unlists</link></command>
 <arg choice="opt" rep="repeat">
 <option>-group</option>
@@ -8024,9 +7952,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">mailbox</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="mailboxes">unmailboxes</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -8072,9 +7998,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable>mimetype</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="mime-lookup">unmime-lookup</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -8096,8 +8020,7 @@ The following are the commands understood by Mutt:
 <arg choice="plain">
 <replaceable class="parameter">attribute</replaceable>
 </arg>
-</cmdsynopsis>
-<cmdsynopsis>
+
 <command><link linkend="mono">mono</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -8113,8 +8036,7 @@ The following are the commands understood by Mutt:
 <arg choice="plain">
 <replaceable class="parameter">regexp</replaceable>
 </arg>
-</cmdsynopsis>
-<cmdsynopsis>
+
 <command><link linkend="mono">mono</link></command>
 <arg choice="plain">
 <option>index</option>
@@ -8125,9 +8047,7 @@ The following are the commands understood by Mutt:
 <arg choice="plain">
 <replaceable class="parameter">pattern</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="mono">unmono</link></command>
 <arg choice="plain">
 <option>index</option>
@@ -8149,9 +8069,7 @@ The following are the commands understood by Mutt:
 <arg choice="plain">
 <replaceable class="parameter">string</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="my-hdr">unmy&lowbar;hdr</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -8194,9 +8112,7 @@ The following are the commands understood by Mutt:
 <arg choice="plain">
 <replaceable class="parameter">value</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="score">unscore</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -8261,9 +8177,7 @@ The following are the commands understood by Mutt:
 </arg>
 </group>
 <arg choice="opt" rep="repeat"></arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="set">toggle</link></command>
 <arg choice="plain">
 <replaceable class="parameter">variable</replaceable>
@@ -8271,9 +8185,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">variable</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="set">unset</link></command>
 <arg choice="plain">
 <replaceable class="parameter">variable</replaceable>
@@ -8281,9 +8193,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">variable</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="set">reset</link></command>
 <arg choice="plain">
 <replaceable class="parameter">variable</replaceable>
@@ -8312,9 +8222,7 @@ The following are the commands understood by Mutt:
 <arg choice="plain">
 <replaceable class="parameter">format</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="spam">nospam</link></command>
 <group choice="req">
 <arg choice="plain">
@@ -8340,9 +8248,7 @@ The following are the commands understood by Mutt:
 <arg choice="opt" rep="repeat">
 <replaceable class="parameter">regexp</replaceable>
 </arg>
-</cmdsynopsis>
 
-<cmdsynopsis>
 <command><link linkend="subscribe">unsubscribe</link></command>
 <arg choice="opt" rep="repeat">
 <option>-group</option>