X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.docbook;h=0605fa84da98e3845df8d51d3619b7eed7dbe7cf;hb=93b627c389e98f0ef7347035ee75a8603b6dd866;hp=b4c01878e5b6d4d8bcaa6a211add508b21971bd5;hpb=2b81e4c6b65e7f0e91a98da32fa46c884bedf6aa;p=mimedecode.git

diff --git a/mimedecode.docbook b/mimedecode.docbook
index b4c0187..0605fa8 100644
--- a/mimedecode.docbook
+++ b/mimedecode.docbook
@@ -42,10 +42,10 @@
          <option>-cCDP</option>
       </arg>
       <arg choice="opt">
-         <option>-H|--host=hostname</option>
+         <option>-f charset</option>
       </arg>
       <arg choice="opt">
-         <option>-f charset</option>
+         <option>-H|--host=hostname</option>
       </arg>
       <arg choice="opt">
          <option>-d header</option>
@@ -53,6 +53,9 @@
       <arg choice="opt">
          <option>-p header:param</option>
       </arg>
+      <arg choice="opt">
+         <option>-r header</option>
+      </arg>
       <arg choice="opt">
          <option>-beit mask</option>
       </arg>
@@ -113,13 +116,13 @@ command-line options.
    than POSIX, please don't ask me; real OS users can consult my example at
    <ulink url="http://phdru.name/Software/dotfiles/mailcap.html">http://phdru.name/Software/dotfiles/mailcap.html</ulink>).
    The decoding process uses the first copiousoutput filter it can find. If
-   there is no any filter the body just passed as is.
+   there are no filters the body just passed as is.
 </para>
 
 <para>
    Then Content-Type header is consulted for charset. If it is not equal to the
-   current locale charset the body text is recoded. Finally message headers and
-   the body are flushed to stdout.
+   current locale charset and recoding is allowed the body text is recoded.
+   Finally message headers and the body are flushed to stdout.
 </para>
 </refsect1>
 
@@ -151,8 +154,8 @@ command-line options.
       <term>-c</term>
       <listitem>
          <para>
-            Recode different character sets in message body to current default
-            charset; this is the default.
+            Recode different character sets in message bodies to the current
+            default charset; this is the default.
          </para>
       </listitem>
    </varlistentry>
@@ -161,28 +164,28 @@ command-line options.
       <term>-C</term>
       <listitem>
          <para>
-            Do not recode character sets in message body.
+            Do not recode character sets in message bodies.
          </para>
       </listitem>
    </varlistentry>
 
    <varlistentry>
-      <term>-H hostname</term>
-      <term>--host=hostname</term>
+      <term>-f charset</term>
       <listitem>
          <para>
-           Use this hostname in X-MIME-Autoconverted headers instead of the
-           current hostname.
+            Force this charset to be the current default charset instead of
+            the current locale.
          </para>
       </listitem>
    </varlistentry>
 
    <varlistentry>
-      <term>-f charset</term>
+      <term>-H hostname</term>
+      <term>--host=hostname</term>
       <listitem>
          <para>
-            Force this charset to be the current default charset instead of
-            the current locale.
+           Use this hostname in X-MIME-Autoconverted headers instead of the
+           current hostname.
          </para>
       </listitem>
    </varlistentry>
@@ -192,7 +195,8 @@ command-line options.
       <listitem>
          <para>
             Add the header to a list of headers to decode; initially the list
-            contains headers "From" and "Subject".
+            contains headers "From", "To", "Cc", "Reply-To", "Mail-Followup-To"
+            and "Subject".
          </para>
       </listitem>
    </varlistentry>
@@ -227,6 +231,16 @@ command-line options.
       </listitem>
    </varlistentry>
 
+   <varlistentry>
+      <term>-r header</term>
+      <listitem>
+         <para>
+            Add the header to a list of headers to remove completely; initially
+            the list is empty.
+         </para>
+      </listitem>
+   </varlistentry>
+
    <varlistentry>
       <term>-b mask</term>
       <listitem>
@@ -335,12 +349,13 @@ the program always uses the default decoding.
 <title>BUGS</title>
 <para>
    The program may produce incorrect MIME message. The purpose of the program
-is to decode whatever it is possible to decode, not to produce absolutely
-correct MIME output. The incorrect parts are obvious - decoded Subject headers
-and filenames. Other than that output is correct MIME message. The program does
-not try to guess whether the headers are correct. For example, if a message
-header states that charset is iso8859-5, but the body is actually in utf-8
-the program will recode the message with the wrong charset.
+   is to decode whatever it is possible to decode, not to produce absolutely
+   correct MIME output. The incorrect parts are obvious - decoded
+   From/To/Cc/Reply-To/Mail-Followup-To/Subject headers and filenames. Other
+   than that output is correct MIME message. The program does not try to guess
+   whether the headers are correct. For example, if a message header states
+   that charset is iso8859-5, but the body is actually in utf-8 the program
+   will recode the message with the wrong charset.
 </para>
 </refsect1>