Cleanup: Fix flake8 E302 expected 2 blank lines, found 1

[mimedecode.git] / mimedecode.docbook

diff --git a/mimedecode.docbook b/mimedecode.docbook
index e8a0b2346a53b187d0f1e3bbb24d725339412702..0129709532dca754b56d05efe16293cca83f9af3 100644 (file)
--- a/mimedecode.docbook
+++ b/mimedecode.docbook
@@ -14,7 +14,7 @@
     <personblurb/>
   </author>
   <copyright>
-    <year>2001-2014</year>
+    <year>2001-2017</year>
     <holder>PhiloSoft Design.</holder>
   </copyright>
 </refentryinfo>
@@ -90,7 +90,7 @@
          <option>--set-param header:param=value</option>
       </arg>
       <arg choice="opt">
-         <option>-Bbeit mask</option>
+         <option>-BbeIit mask</option>
       </arg>
       <arg choice="opt">
          <option>--save-headers|body|message mask</option>
@@ -276,8 +276,8 @@
       <term>-p header1[,header2,header3,...]:param1[,param2,param3,...]</term>
       <listitem>
          <para>
-            Add the parameters(s) to a list of headers parameters to decode;
-            the parameters will be decoded only for the given header(s).
+            Add the parameter(s) to a list of headers parameters to decode;
+            the parameter(s) will be decoded only for the given header(s).
             Initially the list contains header "Content-Type", parameter "name";
             and header "Content-Disposition", parameter "filename".
          </para>
@@ -288,8 +288,8 @@
       <term>-p *[,-header1,-header2,-header3,...]:param1[,param2,param3,...]</term>
       <listitem>
          <para>
-            Add the parameters(s) to a list of headers parameters to decode;
-            the parameters will be decoded for all headers except the given
+            Add the parameter(s) to a list of headers parameters to decode;
+            the parameter(s) will be decoded for all headers except the given
             ones.
          </para>
       </listitem>
@@ -345,8 +345,8 @@
       <term>-R header1[,header2,header3,...]:param1[,param2,param3,...]</term>
       <listitem>
          <para>
-            Add the parameters(s) to a list of headers parameters to remove;
-            the parameters will be removed only for the given header(s).
+            Add the parameter(s) to a list of headers parameters to remove;
+            the parameter(s) will be removed only for the given header(s).
             Initially the list is empty.
          </para>
       </listitem>
@@ -364,7 +364,7 @@
       <term>-R *[,-header1,-header2,-header3,...]:*[,-param1,-param2,-param3,...]</term>
       <listitem>
          <para>
-           Remove listed parameters (or all parameters except listed) frome
+           Remove listed parameters (or all parameters except listed) from
            these headers (or from all headers except listed).
          </para>
       </listitem>
@@ -422,6 +422,17 @@
       </listitem>
    </varlistentry>
 
+   <varlistentry>
+      <term>-I mask</term>
+      <listitem>
+         <para>
+            Append mask to the list of content types to completely ignore.
+            There will be no output - no headers, no body, no warning. For a
+            multipart part the entire subtree is removed.
+         </para>
+      </listitem>
+   </varlistentry>
+
    <varlistentry>
       <term>-i mask</term>
       <listitem>
@@ -520,6 +531,12 @@ cat input_file | mimedecode.py -o output_file</programlisting>
    earlier than -B */*.
 </para>
 
+<para>
+  Options -e/-I/-i can also work with multipart subparts of a MIME message. In
+  case of -I/-i the entire subtree of that multipart is removed; with -i it's
+  replaced with ignore warning.
+</para>
+
 <para>
    Initially all 5 lists are empty, so without any additional parameters
    the program always uses the default decoding (as -t */*).
@@ -597,7 +614,7 @@ cat input_file | mimedecode.py -o output_file</programlisting>
 <refsect1>
 <title>COPYRIGHT</title>
 <para>
-  Copyright (C) 2001-2014 PhiloSoft Design.
+  Copyright (C) 2001-2017 PhiloSoft Design.
 </para>
 </refsect1>