Update manual

diff --git a/Docs/Manual/EN/Configuration.xml b/Docs/Manual/EN/Configuration.xml
index a8c3e8f..34b6834 100644 (file)
--- a/Docs/Manual/EN/Configuration.xml
+++ b/Docs/Manual/EN/Configuration.xml
@@ -715,6 +715,27 @@
         </listitem>
       </itemizedlist>
     </section>
+
+    <section>
+      <title>Completely unhighlight the ignored differences<indexterm>
+          <primary>unhighlight ignored differences</primary>
+        </indexterm></title>
+
+      <itemizedlist>
+        <listitem>
+          <para><option>Enabled</option>:
+          Makes the color of the different lines ignored by line filters and substitution
+          filters the same as the color of the identical lines.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><option>Disabled</option> (default):
+          Difference lines ignored by line filters and substitution filters are
+          displayed in the color of Ignored Difference.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
   </section>
        
   <section id="Configuration_compare_folder">
@@ -1128,6 +1149,11 @@
       <title>Enable image compare in folder compare</title>
       <para>TBD</para>
     </section>
+
+    <section>
+      <title>OCR result</title>
+      <para>TBD</para>
+    </section>
   </section>
 
   <section id="Configuration_editor">

diff --git a/Docs/Manual/EN/Filters.xml b/Docs/Manual/EN/Filters.xml
index a13ab16..639686a 100644 (file)
--- a/Docs/Manual/EN/Filters.xml
+++ b/Docs/Manual/EN/Filters.xml
@@ -8,6 +8,8 @@
       <seealso>file masks</seealso>
 
       <seealso>line filters</seealso>
+
+      <seealso>substitution filters</seealso>
     </indexterm></title>
 
   <para>When you compare files or folders, you can use filters to narrow the
@@ -61,7 +63,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>File comparisons: Line filters<indexterm>
+      <term>File comparisons: Line filters and substitution filters<indexterm>
           <primary>comparing files</primary>
 
           <secondary>filtering</secondary>
@@ -70,6 +72,11 @@
       <listitem>
         <para>Line filters are applied only to file compare operations. They let
         you ignore single line differences.</para>
+        <para>Substitution filters are applied only to file compare operations.
+        They replace the strings in the diff block with the specified strings,
+        compare them, and ignore the diff block if the replacement results match.
+        They are useful for ignoring large numbers of uninteresting changes. 
+        </para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -732,6 +739,20 @@ Pekka Himanen</screen></para>
     </section>
   </section>
 
+  <section id="Filters_SubstitutionFilter">
+    <title>Using substitution filters<indexterm>
+        <primary>filters</primary>
+
+        <secondary>substitution</secondary>
+      </indexterm><indexterm>
+        <primary>filters</primary>
+
+        <secondary>in file comparisons</secondary>
+      </indexterm></title>
+
+    <para>TBD</para>
+  </section>
+
   <section id="Filters_dlg">
     <title>Using the Filters dialog<indexterm>
         <primary>Filters dialog</primary>
@@ -784,6 +805,15 @@ Pekka Himanen</screen></para>
           operations.</para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term>Substitution Filters</term>
+
+        <listitem>
+          <para>Choose this tab to work with substitution filters for file compare
+          operations.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <section id="Filters_FileFiltersTab">
@@ -1143,6 +1173,33 @@ Pekka Himanen</screen></para>
         For details, see <xref linkend="Filters_LineFilterApply" />.</para>
       </section>
     </section>
+
+    <section id="Filters_SubstitutionFiltersTab">
+      <title>Using the Substitution Filters tab<indexterm>
+          <primary>substitution filters</primary>
+
+          <secondary>enabling</secondary>
+        </indexterm></title>
+
+        <para>TBD</para>
+
+      <section id="Filters_SubstitutionFilterCfg">
+        <title>Configuring substitution filters</title>
+
+        <para>TBD</para>
+
+      </section>
+
+      <section id="Filters_SubstitutionFilterEnabling">
+        <title>Enabling and disabling substitution filters<indexterm>
+            <primary>substitution filters</primary>
+
+            <secondary>list of available</secondary>
+          </indexterm></title>
+
+        <para>TBD</para>
+      </section>
+    </section>
   </section>
 
   <section id="AboutFilters_regexp">

diff --git a/Docs/Manual/JP/Configuration.xml b/Docs/Manual/JP/Configuration.xml
index 53e7ca4..0b565c0 100644 (file)
--- a/Docs/Manual/JP/Configuration.xml
+++ b/Docs/Manual/JP/Configuration.xml
@@ -718,6 +718,27 @@
         </listitem>
       </itemizedlist>
     </section>
+
+    <section>
+      <title>Completely unhighlight the ignored differences<indexterm>
+          <primary>unhighlight ignored differences</primary>
+        </indexterm></title>
+
+      <itemizedlist>
+        <listitem>
+          <para><option>Enabled</option>:
+          Makes the color of the different lines ignored by line filters and substitution
+          filters the same as the color of the identical lines.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><option>Disabled</option> (default):
+          Difference lines ignored by line filters and substitution filters are
+          displayed in the color of Ignored Difference.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
   </section>
        
   <section id="Configuration_compare_folder">
@@ -1130,6 +1151,11 @@
       <title>フォルダ比較で画像比較を有効にする</title>
       <para>TBD</para>
     </section>
+
+    <section>
+      <title>OCRの結果</title>
+      <para>TBD</para>
+    </section>
   </section>
 
   <section id="Configuration_editor">

diff --git a/Docs/Manual/JP/Filters.xml b/Docs/Manual/JP/Filters.xml
index 5558e1f..89dc9b1 100644 (file)
--- a/Docs/Manual/JP/Filters.xml
+++ b/Docs/Manual/JP/Filters.xml
@@ -8,6 +8,8 @@
       <seealso>file masks</seealso>
 
       <seealso>line filters</seealso>
+
+      <seealso>substitution filters</seealso>
     </indexterm></title>
 
   <para>
@@ -64,7 +66,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>ファイル比較: 行フィルタ<indexterm>
+      <term>ファイル比較: 行フィルタと置換フィルタ<indexterm>
           <primary>comparing files</primary>
 
           <secondary>filtering</secondary>
@@ -74,6 +76,11 @@
         <para>
           行フィルタは、ファイル比較操作のみに適用されます。
           それにより、単一行の差異を無視することができます。</para>
+        <para>置換フィルタは、ファイル比較操作のみに適用されます。
+         置換フィルタは、diffブロック内の文字列を指定された文字列に置換して比較し、
+         結果が一致する場合はそのdiffブロックを無視します。
+         これは、興味のない多数の変更を無視するのに役立ちます。
+        </para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -801,6 +808,20 @@ Pekka Himanen</screen>
     </section>
   </section>
 
+  <section id="Filters_SubstitutionFilter">
+    <title>Using substitution filters<indexterm>
+        <primary>filters</primary>
+
+        <secondary>substitution</secondary>
+      </indexterm><indexterm>
+        <primary>filters</primary>
+
+        <secondary>in file comparisons</secondary>
+      </indexterm></title>
+
+    <para>TBD</para>
+  </section>
+
   <section id="Filters_dlg">
     <title>フィルタダイアログの使用<indexterm>
         <primary>Filters dialog</primary>
@@ -856,6 +877,15 @@ Pekka Himanen</screen>
             ファイル比較用の行フィルタを設定するには、こちらのタブを使用してください。</para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term>Substitution Filters</term>
+
+        <listitem>
+          <para>Choose this tab to work with substitution filters for file compare
+          operations.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <section id="Filters_FileFiltersTab">
@@ -1263,6 +1293,33 @@ Pekka Himanen</screen>
           <xref linkend="Filters_LineFilterApply" />を参照してください。</para>
       </section>
     </section>
+
+    <section id="Filters_SubstitutionFiltersTab">
+      <title>Using the Substitution Filters tab<indexterm>
+          <primary>substitution filters</primary>
+
+          <secondary>enabling</secondary>
+        </indexterm></title>
+
+        <para>TBD</para>
+
+      <section id="Filters_SubstitutionFilterCfg">
+        <title>Configuring substitution filters</title>
+
+        <para>TBD</para>
+
+      </section>
+
+      <section id="Filters_SubstitutionFilterEnabling">
+        <title>Enabling and disabling substitution filters<indexterm>
+            <primary>substitution filters</primary>
+
+            <secondary>list of available</secondary>
+          </indexterm></title>
+
+        <para>TBD</para>
+      </section>
+    </section>
   </section>
 
   <section id="AboutFilters_regexp">