From: Kimmo Varis <kimmov@gmail.com>
Date: Tue, 16 Sep 2008 20:04:44 +0000 (+0000)
Subject: PATCH: [ 2112128 ] Final pass for minor fixes: typos, index entries, etc.
X-Git-Tag: 2.16.5~2934
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5f80cbef31b978d61f49182cf3294255a5bcd5f8;p=winmerge-jp%2Fwinmerge-jp.git

PATCH: [ 2112128 ] Final pass for minor fixes: typos, index entries, etc.
 Submitted by Denis Bradford
---

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index f6f4c9475..239b04881 100644
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -7,6 +7,7 @@ WinMerge 2.11.1.5
   Use external editor to edit file filters (#2082774)
   Improved command line handling (#2081779)
   Change Manual url to http://winmerge.org/docs/manual/ (r5956)
+  Manual updates
   Plugins: Show processing instructions in XML plugin (#1979321)
   BugFix: ClearCase checkout/commit dialog translation error (#2051069)
   BugFix: Table of Contents in manual (#2071625)
diff --git a/Docs/Users/Manual/About_Doc.xml b/Docs/Users/Manual/About_Doc.xml
index 383785854..894835894 100644
--- a/Docs/Users/Manual/About_Doc.xml
+++ b/Docs/Users/Manual/About_Doc.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <article id="AboutDoc">
-  <title>About WinMerge online Help</title>
+  <title>About WinMerge Help</title>
 
-  <para>This is online Help for WinMerge <xi:include href="replaceables.xml"
+  <para>This is Help for WinMerge <xi:include href="replaceables.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xpointer="element(version)" />.</para>
 
   <section>
-    <title>Audience</title>
+    <title>Audience and scope</title>
 
     <para>WinMerge Help is intended for both new and experienced users. It
     explains how to use WinMerge, and documents its capabilities and
@@ -180,7 +180,9 @@
   </section>
 
   <section>
-    <title>Documentation conventions</title>
+    <title>Documentation conventions<indexterm>
+        <primary>conventions, documentation</primary>
+      </indexterm></title>
 
     <informaltable>
       <tgroup cols="2">
diff --git a/Docs/Users/Manual/Command_line.xml b/Docs/Users/Manual/Command_line.xml
index 401e4cf40..4b2a1e714 100644
--- a/Docs/Users/Manual/Command_line.xml
+++ b/Docs/Users/Manual/Command_line.xml
@@ -2,10 +2,10 @@
 <article id="CommandLine">
   <title>Command line<indexterm>
       <primary>command line</primary>
-
-      <secondary>syntax</secondary>
     </indexterm><indexterm>
       <primary>WinMerge command line</primary>
+
+      <see>command line</see>
     </indexterm></title>
 
   <para>The WinMerge command line accepts several parameters in addition to the
@@ -137,7 +137,7 @@
       <indexterm>
         <primary>filters</primary>
 
-        <secondary>applying</secondary>
+        <secondary>applying in command line</secondary>
       </indexterm>
 
       <para><option>/f</option> applies a specified filter to restrict the
@@ -302,6 +302,8 @@
     <listitem>
       <indexterm>
         <primary>conflict files</primary>
+
+        <secondary>specifying on command line</secondary>
       </indexterm>
 
       <para><option><replaceable>conflictfile</replaceable></option> Specifies a
diff --git a/Docs/Users/Manual/Compare_dirs.xml b/Docs/Users/Manual/Compare_dirs.xml
index b73ecd8dd..dc87597c1 100644
--- a/Docs/Users/Manual/Compare_dirs.xml
+++ b/Docs/Users/Manual/Compare_dirs.xml
@@ -7,7 +7,8 @@
   <para>This topic describes how to compare and merge folders using the Folder
   Compare window.</para>
 
-  <xi:include href="Text_encoding.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="Text_encoding.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <section id="Compare_dirs_starting">
     <title>Starting a folder compare operation</title>
@@ -29,7 +30,7 @@
           all files in the folders, and is nonrecursive (does not include
           subfolders). To change any of these options and for more details about
           the Select Files or Folder dialog, see <xref
-          linkend="OpenPaths" />.<!--This topic focuses mainly on the WinMerge window method.--></para>
+          linkend="OpenPaths" />.</para>
         </listitem>
       </varlistentry>
 
@@ -52,7 +53,9 @@
 
       <variablelist>
         <varlistentry>
-          <term>Recursive mode</term>
+          <term>Recursive mode<indexterm>
+              <primary>recursive folder compare</primary>
+            </indexterm></term>
 
           <listitem>
             <para>Recursive mode is useful for detecting and manipulating
@@ -144,6 +147,14 @@ I get the partial list, but no Abort indicator.--></para>
         <primary>Folder Compare window</primary>
 
         <seealso>Compare windows</seealso>
+      </indexterm><indexterm>
+        <primary>Compare windows</primary>
+
+        <secondary>Folder</secondary>
+      </indexterm><indexterm>
+        <primary>subfolders</primary>
+
+        <secondary>in Folder Compare window</secondary>
       </indexterm></title>
 
     <para>The Folder Compare window shows the result of a folder compare in a
@@ -325,7 +336,11 @@ I get the partial list, but no Abort indicator.--></para>
   </section>
 
   <section id="Compare_dirs_multiwin">
-    <title>Working with multiple Folder Compare windows</title>
+    <title>Working with multiple Folder Compare windows<indexterm>
+        <primary>Folder Compare window</primary>
+
+        <secondary>using multiple</secondary>
+      </indexterm></title>
 
     <para>By default, the WinMerge window displays a single Folder Compare
     window. That is, if you start another file comparison while a Folder Compare
@@ -408,6 +423,10 @@ I get the partial list, but no Abort indicator.--></para>
         <primary>file operations</primary>
 
         <secondary>in Folder Compare window</secondary>
+      </indexterm><indexterm>
+        <primary>Folder Compare window</primary>
+
+        <secondary>file operations</secondary>
       </indexterm></title>
 
     <para>The Folder Compare window supports common operations on files, like
@@ -642,6 +661,12 @@ I get the partial list, but no Abort indicator.--></para>
           <primary>Folder Compare window</primary>
 
           <secondary>protecting files in</secondary>
+        </indexterm><indexterm>
+          <primary>protecting files</primary>
+        </indexterm><indexterm>
+          <primary>read-only files</primary>
+
+          <see>protecting files</see>
         </indexterm></title>
 
       <para>To protect the files and folders on either side of a compare from
diff --git a/Docs/Users/Manual/Compare_files.xml b/Docs/Users/Manual/Compare_files.xml
index 0d6604d46..a3f7800c9 100644
--- a/Docs/Users/Manual/Compare_files.xml
+++ b/Docs/Users/Manual/Compare_files.xml
@@ -6,10 +6,11 @@
 
   <para>This topic describes how to use the WinMerge File Compare window to
   compare and merge files. To understand the basic concepts about differences
-  used here, we suggest you read read <xref linkend="IntroductDiffing" />
+  used here, we suggest you read <xref linkend="IntroductDiffing" />
   first.</para>
 
-  <xi:include href="Text_encoding.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="Text_encoding.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <section id="Compare_files_starting">
     <title>Starting a file compare operation</title>
@@ -51,6 +52,10 @@
         <primary>File Compare window</primary>
 
         <seealso>Compare windows</seealso>
+      </indexterm><indexterm>
+        <primary>Compare windows</primary>
+
+        <secondary>File</secondary>
       </indexterm></title>
 
     <para>The File Compare window displays compared files in two File panes,
@@ -1162,7 +1167,7 @@ https://sourceforge.net/forum/forum.php?thread_id=2001747&forum_id=41637-->
   </section>
 
   <section id="Compare_files_merge">
-    <title>Merging Differences<indexterm>
+    <title>Merging differences<indexterm>
         <primary>merging differences</primary>
       </indexterm></title>
 
@@ -1483,7 +1488,7 @@ https://sourceforge.net/forum/forum.php?thread_id=2001747&forum_id=41637-->
     </section>
 
     <section id="ResolveConflictFiles">
-      <title>Resolving Conflict Files<indexterm>
+      <title>Resolving conflict files<indexterm>
           <primary>conflict files</primary>
         </indexterm></title>
 
diff --git a/Docs/Users/Manual/Configuration.xml b/Docs/Users/Manual/Configuration.xml
index 4f6d40b52..5c6b466b0 100644
--- a/Docs/Users/Manual/Configuration.xml
+++ b/Docs/Users/Manual/Configuration.xml
@@ -139,7 +139,7 @@
 
     <section>
       <title>Disable splash screen<indexterm>
-          <primary>splash screen, disabling</primary>
+          <primary>splash screen, enabling and disabling</primary>
         </indexterm></title>
 
       <itemizedlist>
@@ -209,7 +209,7 @@
       <title>Allow only one instance to run<indexterm>
           <primary>WinMerge window</primary>
 
-          <secondary>opening multiple</secondary>
+          <secondary>limiting instances</secondary>
         </indexterm></title>
 
       <itemizedlist>
@@ -284,7 +284,9 @@
     </section>
 
     <section>
-      <title>Open-dialog Auto-Completion</title>
+      <title>Open-dialog Auto-Completion<indexterm>
+          <primary>MRU list</primary>
+        </indexterm></title>
 
       <para>Choose one of these options:</para>
 
@@ -1042,9 +1044,9 @@
 
     <section>
       <title>Download 7-zip Plugin<indexterm>
-          <primary>7-Zip archive support</primary>
+          <primary>7-Zip archives</primary>
 
-          <secondary>options</secondary>
+          <secondary>configuring support after installation</secondary>
         </indexterm></title>
 
       <para>If WinZip is already installed on your system, WinMerge
@@ -1057,7 +1059,11 @@
     </section>
 
     <section>
-      <title>Enable archive file support</title>
+      <title>Enable archive file support<indexterm>
+          <primary>7-Zip archives</primary>
+
+          <secondary>enabling and disabling integration</secondary>
+        </indexterm></title>
 
       <para>This option controls how WinMerge handles archive files (based on
       7-Zip integration).</para>
@@ -1090,7 +1096,9 @@
     </section>
 
     <section>
-      <title>Detect archive type from file signature</title>
+      <title>Detect archive type from file signature<indexterm>
+          <primary>detecting archive types</primary>
+        </indexterm></title>
 
       <itemizedlist>
         <listitem>
@@ -1144,9 +1152,9 @@
 
     <section>
       <title>Add to explorer context menu<indexterm>
-          <primary>shell integration</primary>
+          <primary>integration</primary>
 
-          <secondary>enabling and disabling</secondary>
+          <secondary>with Windows shell</secondary>
         </indexterm></title>
 
       <itemizedlist>
@@ -1383,7 +1391,11 @@
     <title>Version Control options<indexterm>
         <primary>version control systems</primary>
 
-        <secondary>integration configuration</secondary>
+        <secondary>configuring after installation</secondary>
+      </indexterm><indexterm>
+        <primary>integration</primary>
+
+        <secondary>with version control systems</secondary>
       </indexterm></title>
 
     <!--What does version control integration do for me? How do the Option page settings work with installed 
diff --git a/Docs/Users/Manual/Filters.xml b/Docs/Users/Manual/Filters.xml
index 0a848799e..faacfbff3 100644
--- a/Docs/Users/Manual/Filters.xml
+++ b/Docs/Users/Manual/Filters.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <article id="Filters">
   <title>Using Filters<indexterm>
-      <primary>filtering</primary>
+      <primary>filters</primary>
+
+      <seealso>file filters</seealso>
+
+      <seealso>file masks</seealso>
+
+      <seealso>line filters</seealso>
     </indexterm></title>
 
   <para>When you compare files or folders, you can use filters to narrow the
@@ -76,7 +82,7 @@
 
         <secondary>file masks</secondary>
       </indexterm><indexterm>
-        <primary>filtering</primary>
+        <primary>filters</primary>
 
         <secondary>in folder comparisons</secondary>
       </indexterm></title>
@@ -86,7 +92,11 @@
     omitted from your selection.</para>
 
     <section id="Filters_MaskApply">
-      <title>Defining and applying file masks</title>
+      <title>Defining and applying file masks<indexterm>
+          <primary>command line</primary>
+
+          <secondary>applying file masks</secondary>
+        </indexterm></title>
 
       <para>Define and apply a file mask at the time you launch your folder
       compare operation:</para>
@@ -119,7 +129,7 @@
         </indexterm><indexterm>
           <primary>filters</primary>
 
-          <secondary>file mask syntax</secondary>
+          <secondary>file masks</secondary>
         </indexterm><indexterm>
           <primary>regular expressions</primary>
 
@@ -150,12 +160,12 @@
   </section>
 
   <section id="Filters_FileFilter">
-    <title>Using File filters<indexterm>
+    <title>Using file filters<indexterm>
         <primary>filters</primary>
 
         <secondary>file filters</secondary>
       </indexterm><indexterm>
-        <primary>filtering</primary>
+        <primary>filters</primary>
 
         <secondary>in folder comparisons</secondary>
       </indexterm></title>
@@ -227,7 +237,11 @@
     </section>
 
     <section id="Filters_FileFilterApply">
-      <title>Applying file filters</title>
+      <title>Applying file filters<indexterm>
+          <primary>file filters</primary>
+
+          <secondary>applying</secondary>
+        </indexterm></title>
 
       <para>You can apply a file filter using any of these methods:</para>
 
@@ -292,8 +306,13 @@
         </listitem>
 
         <listitem>
-          <para>When you launch a folder compare from the WinMerge command line,
-          use the <option>-f</option> flag to specify a file filter.</para>
+          <para><indexterm>
+              <primary>command line</primary>
+
+              <secondary>applying file filters</secondary>
+            </indexterm>When you launch a folder compare from the WinMerge
+          command line, use the <option>-f</option> flag to specify a file
+          filter.</para>
         </listitem>
       </itemizedlist>
 
@@ -307,9 +326,9 @@
 
           <secondary>file filter</secondary>
         </indexterm><indexterm>
-          <primary>filters</primary>
+          <primary>file filters</primary>
 
-          <secondary>file filter syntax</secondary>
+          <secondary>syntax</secondary>
         </indexterm></title>
 
       <para>This section describes the syntax of WinMerge file filters and
@@ -480,12 +499,12 @@ f: ^[h,k,m] ## <filename>h*.*</filename>, <filename>k*.*</filename>, and <filena
   </section>
 
   <section id="Filters_LineFilter">
-    <title>Using Line filters<indexterm>
+    <title>Using line filters<indexterm>
         <primary>filters</primary>
 
-        <secondary>line filters</secondary>
+        <secondary>line</secondary>
       </indexterm><indexterm>
-        <primary>filtering</primary>
+        <primary>filters</primary>
 
         <secondary>in file comparisons</secondary>
       </indexterm></title>
@@ -589,7 +608,7 @@ f: ^[h,k,m] ## <filename>h*.*</filename>, <filename>k*.*</filename>, and <filena
         </indexterm><indexterm>
           <primary>filters</primary>
 
-          <secondary>line filter syntax</secondary>
+          <secondary>line</secondary>
         </indexterm><indexterm>
           <primary>regular expressions</primary>
 
@@ -658,9 +677,9 @@ Pekka Himanen</screen></para>
 
       <tip>
         <para>It's usually good practice to use the beginning of line (
-        <code>^</code> ) and end of line ( <code>&amp;</code> ) of line markers
-        to control your patterns precisely, because the rule is applied if any
-        part of a line matches the expression.</para>
+        <code>^</code> ) and end of line ( <code>&amp;</code> ) markers to
+        control your patterns precisely, because the rule is applied if any part
+        of a line matches the expression.</para>
       </tip>
 
       <example>
@@ -689,7 +708,7 @@ Pekka Himanen</screen></para>
       <example>
         <title>Line filter rule matching CVS Id lines</title>
 
-        <para>Id lines look like this:</para>
+        <para>CVS Id lines look like this:</para>
 
         <screen>// $Id$</screen>
 
diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml
index 433d7b6b6..b9e4c5c1a 100644
--- a/Docs/Users/Manual/Install.xml
+++ b/Docs/Users/Manual/Install.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <article id="Installing">
-  <title>Getting and installing WinMerge</title>
+  <title>Getting and installing WinMerge<indexterm>
+      <primary>installing WinMerge</primary>
+    </indexterm></title>
 
   <para>WinMerge can be installed using the installer or by unzipping files from
   an archive. Using the installer is the recommended method.</para>
@@ -75,7 +77,9 @@
 
         <variablelist>
           <varlistentry>
-            <term>WinMerge core files</term>
+            <term>WinMerge core files<indexterm>
+                <primary>WinMerge executables, Unicode and ANSI</primary>
+              </indexterm></term>
 
             <listitem>
               <para>WinMerge executable (<filename>WinMerge.exe</filename> on
@@ -141,7 +145,15 @@
 
       <listitem>
         <para>In the Select Additional Tasks page, specify any additional
-        tasks:</para>
+        tasks:<indexterm>
+            <primary>integration</primary>
+
+            <secondary>with version control system</secondary>
+          </indexterm><indexterm>
+            <primary>VCS</primary>
+
+            <see>version control systems</see>
+          </indexterm></para>
 
         <variablelist>
           <varlistentry>
@@ -154,7 +166,9 @@
           </varlistentry>
 
           <varlistentry>
-            <term>Integrate with TortoiseCVS</term>
+            <term>Integrate with TortoiseCVS<indexterm>
+                <primary>TortoiseCVS integration</primary>
+              </indexterm></term>
 
             <listitem>
               <para>Sets WinMerge to be the TortoiseCVS diff application.</para>
@@ -162,7 +176,9 @@
           </varlistentry>
 
           <varlistentry>
-            <term>Integrate with TortoiseSVN</term>
+            <term>Integrate with TortoiseSVN<indexterm>
+                <primary>TortoiseSVN integration</primary>
+              </indexterm></term>
 
             <listitem>
               <para>Sets WinMerge to be the TortoiseSVN diff application</para>
@@ -170,7 +186,11 @@
           </varlistentry>
 
           <varlistentry>
-            <term>Integrate with ClearCase</term>
+            <term>Integrate with ClearCase<indexterm>
+                <primary>ClearCase integration</primary>
+
+                <secondary>configuring during installation</secondary>
+              </indexterm></term>
 
             <listitem>
               <para>Sets WinMerge to be the ClearCase diff and merge
@@ -215,7 +235,15 @@
   </section>
 
   <section id="InstallFromArchive">
-    <title>Installing from an archive</title>
+    <title>Installing from an archive<indexterm>
+        <primary>archive, installing Winmerge from</primary>
+      </indexterm><indexterm>
+        <primary>mfc71[u].dll runtime file</primary>
+      </indexterm><indexterm>
+        <primary>msvcr71.dll runtime file</primary>
+      </indexterm><indexterm>
+        <primary>msvcp71.dll runtime file</primary>
+      </indexterm></title>
 
     <para>WinMerge is pretty much independent of other system components. It is
     not tightly integrated with Windows, and does not use many DLLs.</para>
@@ -248,7 +276,13 @@
   </section>
 
   <section>
-    <title>Shell integration</title>
+    <title>Shell integration<indexterm>
+        <primary>integration</primary>
+
+        <secondary>with Windows shell</secondary>
+      </indexterm><indexterm>
+        <primary>Windows shell integration</primary>
+      </indexterm></title>
 
     <para>The installer enables shell integration when you choose the
     <guilabel>Enable Explorer context menu integration</guilabel> option in the
@@ -272,7 +306,9 @@
     Windows updates all its references.</para>
 
     <section>
-      <title>64-bit shell integration</title>
+      <title>64-bit shell integration<indexterm>
+          <primary>Windows 64-bit versions, WinMerge support</primary>
+        </indexterm></title>
 
       <para>Starting with Version 2.6, WinMerge supports 64-bit Windows versions
       by including 64-bit shell integration. The WinMerge installer recognizes
@@ -290,6 +326,10 @@
   <section id="Installing_archive_support">
     <title><indexterm>
         <primary>installing archive support</primary>
+      </indexterm><indexterm>
+        <primary>7-Zip archives</primary>
+
+        <secondary>configuring support during installation</secondary>
       </indexterm>7-Zip and archive support</title>
 
     <para>WinMerge uses <ulink url="http://www.7-zip.org/">7-Zip</ulink> for
@@ -334,7 +374,9 @@
       </menuchoice>.</para>
 
     <section id="Install_merge7zinstaller">
-      <title>Merge7zInstaller</title>
+      <title>Merge7z Installer<indexterm>
+          <primary>Merge7z installer</primary>
+        </indexterm></title>
 
       <para><filename>Merge7zInstaller</filename> is a stand-alone installer for
       7-Zip integration.</para>
diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml
index b07e9346e..d39e86687 100644
--- a/Docs/Users/Manual/Intro_diffs.xml
+++ b/Docs/Users/Manual/Intro_diffs.xml
@@ -7,7 +7,11 @@
   operations.</para>
 
   <section id="Intro_diffs_comparing">
-    <title>Comparing files</title>
+    <title>Comparing files<indexterm>
+        <primary>comparing files</primary>
+
+        <secondary>overview</secondary>
+      </indexterm></title>
 
     <para>We usually compare two files that are related in some way, such as two
     versions that were edited at different times, or by different people. If you
@@ -52,7 +56,7 @@
           breaks exactly:</para>
 
           <formalpara>
-            <title>Fle1:</title>
+            <title>File1:</title>
 
             <para><screen>It's slow comparing words 
 and characters. Instead,  
@@ -237,7 +241,11 @@ Believe it or not.</screen></para>
   </section>
 
   <section id="Intro_diffs_merging">
-    <title>Merging files</title>
+    <title>Merging files<indexterm>
+        <primary>merging differences</primary>
+
+        <secondary>overview and example</secondary>
+      </indexterm></title>
 
     <para>The purpose of merging is to combine changes from two files into one
     file. Merging extends the concepts and functions used in comparing
@@ -386,7 +394,13 @@ Believe it or not.</screen></para>
     </section>
 
     <section>
-      <title>Choosing a merge result file</title>
+      <title>Choosing a merge result file <indexterm>
+          <primary>merging differences</primary>
+
+          <secondary>result file</secondary>
+        </indexterm><indexterm>
+          <primary>result file, in merge</primary>
+        </indexterm></title>
 
       <para>You control where your merge result is preserved. The WinMerge File
       Compare window does not have a separate result pane, as some merge tools
diff --git a/Docs/Users/Manual/Introduction.xml b/Docs/Users/Manual/Introduction.xml
index 376ee0c07..b291c5087 100644
--- a/Docs/Users/Manual/Introduction.xml
+++ b/Docs/Users/Manual/Introduction.xml
@@ -35,7 +35,9 @@
   the advantage of all WinMerge users.</para>
 
   <section>
-    <title>WinMerge versions</title>
+    <title>WinMerge versions<indexterm>
+        <primary>WinMerge versions</primary>
+      </indexterm></title>
 
     <para>There are three kind of versions available in the <ulink
     url="https://sourceforge.net/project/showfiles.php?group_id=13216">downloads</ulink>
@@ -43,7 +45,7 @@
 
     <section>
       <title><indexterm>
-          <primary>Stable versions</primary>
+          <primary>stable WinMerge versions</primary>
         </indexterm>Stable versions</title>
 
       <para><ulink
@@ -55,7 +57,7 @@
 
     <section>
       <title><indexterm>
-          <primary>Beta versions</primary>
+          <primary>beta WinMerge versions</primary>
         </indexterm>Beta versions</title>
 
       <para><ulink
@@ -73,7 +75,7 @@
 
     <section>
       <title><indexterm>
-          <primary>Experimental versions</primary>
+          <primary>experimental WinMerge versions</primary>
         </indexterm>Experimental versions</title>
 
       <para><ulink
@@ -145,7 +147,7 @@
 
   <section>
     <title><indexterm>
-        <primary>support</primary>
+        <primary>WinMerge support</primary>
 
         <secondary>reporting bugs</secondary>
       </indexterm>Getting support and reporting bugs</title>
diff --git a/Docs/Users/Manual/Locales.xml b/Docs/Users/Manual/Locales.xml
index b02feecc0..bf0f6bf2a 100644
--- a/Docs/Users/Manual/Locales.xml
+++ b/Docs/Users/Manual/Locales.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <article id="Locales">
-  <title>Locale support</title>
+  <title>Locale support<indexterm>
+      <primary>localizing WinMerge </primary>
+    </indexterm></title>
 
   <para>The WinMerge user interface is in English by default, but you can
-  localize your installation to other languages for which translations have
-  been contributed. Localizing WinMerge changes text strings that are
-  displayed in the interface, including menus, dialogs, tooltips, and messages,
-  to the language you choose.</para>
+  localize your installation to other languages for which translations have been
+  contributed. Localizing WinMerge changes text strings that are displayed in
+  the interface, including menus, dialogs, tooltips, and messages, to the
+  language you choose.</para>
 
   <para>Note that localization does not extend beyond the translation of
   strings. For example, it does not affect how numbers are divided or how words
@@ -109,7 +111,9 @@
   </section>
 
   <section>
-    <title>Available WinMerge localizations</title>
+    <title>Available WinMerge localizations<indexterm>
+        <primary>localizations, available</primary>
+      </indexterm></title>
 
     <para>WinMerge localizations contributed to date include the following
     translations:</para>
@@ -222,7 +226,9 @@
   </section>
 
   <section>
-    <title>Reporting errors in translation</title>
+    <title>Reporting errors in translation<indexterm>
+        <primary>translations, reporting errors</primary>
+      </indexterm></title>
 
     <para>Please submit any errors you find in translations as bugs to our
     <ulink
@@ -232,7 +238,9 @@
   </section>
 
   <section>
-    <title>Submitting a new translation</title>
+    <title>Submitting a new translation<indexterm>
+        <primary>submitting translations</primary>
+      </indexterm></title>
 
     <para>If you would like to add your language to the list, read the <ulink
     url="http://winmerge.org/translations/">Translations</ulink> documentation
diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml
index 8d27802ca..4ca07a0d3 100644
--- a/Docs/Users/Manual/Open_paths.xml
+++ b/Docs/Users/Manual/Open_paths.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <article id="OpenPaths">
-  <title>Opening files and folders</title>
+  <title>Opening files and folders<indexterm>
+      <primary>opening files and folders</primary>
+    </indexterm></title>
 
   <para>WinMerge provides several ways to specify paths and open files or
-  folders:</para>
+  folders:<indexterm>
+      <primary>folders</primary>
+
+      <secondary>selecting in Select Files or Folders dialog</secondary>
+    </indexterm><indexterm>
+      <primary>files</primary>
+
+      <secondary>selecting in Select Files or Folders dialog</secondary>
+    </indexterm></para>
 
   <itemizedlist>
     <listitem>
@@ -24,14 +34,18 @@
   </itemizedlist>
 
   <section id="OpenPaths_opendialog">
-    <title>Select Files or Folders dialog</title>
+    <title>Select Files or Folders dialog<indexterm>
+        <primary>Select Files or Folders dialog</primary>
+      </indexterm></title>
 
     <para><xref linkend="QuickStart" /> describes the Select Files or Folders
     dialog. This section provides more details, and some tips for using the
     Select Files or Folders dialog more efficiently.</para>
 
     <section>
-      <title>Using environment variables</title>
+      <title>Using environment variables<indexterm>
+          <primary>environment variables, in compare target paths</primary>
+        </indexterm></title>
 
       <para>You can use environment variables in your paths. Windows expands the
       variable name between % (percent) delimiters. For example, if an
@@ -42,7 +56,11 @@
     </section>
 
     <section id="OpeningArchives">
-      <title>Opening archive files</title>
+      <title>Opening archive files<indexterm>
+          <primary>7-Zip archives</primary>
+
+          <secondary>opening</secondary>
+        </indexterm></title>
 
       <para>WinMerge archive support is provided in the 7-Zip plugin. See <xref
       linkend="Installing" /> to install this plugin.</para>
@@ -69,7 +87,11 @@
     </section>
 
     <section id="Open_paths_filters">
-      <title>Specifying filters</title>
+      <title>Applying filters<indexterm>
+          <primary>filters</primary>
+
+          <secondary>applying in Select Files or Folders dialog</secondary>
+        </indexterm></title>
 
       <para>The <guilabel>Filter</guilabel> edit field enables you to restrict
       the files to be included in your folder compare. You can specify one or
@@ -86,7 +108,7 @@
       selecting, use filter files. Filter files are collections of regular
       expressions that can either include or exclude files. WinMerge installs a
       number of predefined filter files in its <filename>Filters</filename>
-      folder, and you can create your own, too. </para>
+      folder, and you can create your own, too.</para>
 
       <para>To specify a filter, click the <guibutton>Select</guibutton> button
       next to the <guilabel>Filters</guilabel> field to choose from a list of
@@ -98,7 +120,9 @@
     </section>
 
     <section id="Open_paths_unpacker">
-      <title>Selecting an unpacker for file comparisons</title>
+      <title>Selecting an unpacker for file comparisons<indexterm>
+          <primary>unpacker plugins</primary>
+        </indexterm></title>
 
       <para>Unpackers are plugins that are installed with WinMerge to provide
       functionality that is not used by default. Plugins that can be used to
@@ -123,10 +147,12 @@
 
   <section id="OpenPaths_shell-integ">
     <title><indexterm>
-        <primary>shell integration</primary>
+        <primary>Windows shell integration</primary>
+      </indexterm><indexterm>
+        <primary>context menu, WinMerge shortcuts in Windows Explorer</primary>
       </indexterm>Shell integration</title>
 
-    <para>The WinMerge shell Integration is a convenient way to select paths and
+    <para>The Windows shell Integration is a convenient way to select paths and
     open WinMerge directly from Windows Explorer. It adds a
     <guimenuitem>WinMerge</guimenuitem> shortcut in the Explorer context menu
     (available when you right-click one or two files or folders in Explorer).
@@ -285,7 +311,15 @@ to compare one file/folder against several files/folders.</para> </tip> -->
     </section>
 
     <section>
-      <title>Including Subfolders</title>
+      <title>Including Subfolders<indexterm>
+          <primary>recursive folder compare</primary>
+
+          <secondary>specifying in Select Files or Folders dialog</secondary>
+        </indexterm><indexterm>
+          <primary>subfolders</primary>
+
+          <seealso>recursive folder compare</seealso>
+        </indexterm></title>
 
       <para>By default, WinMerge does not include subfolders in compare
       operations. To change the default behavior, enable <guilabel>Include
@@ -299,7 +333,7 @@ to compare one file/folder against several files/folders.</para> </tip> -->
 
   <section id="OpenPaths_dragndrop">
     <title><indexterm>
-        <primary>drag and drop</primary>
+        <primary>drag and drop, in WinMerge window</primary>
       </indexterm>Drag and drop</title>
 
     <para>From any Windows source that allows you to drag objects, such as
@@ -346,6 +380,10 @@ to compare one file/folder against several files/folders.</para> </tip> -->
   <section id="OpenPaths_project">
     <title><indexterm>
         <primary>project files</primary>
+      </indexterm><indexterm>
+        <primary>command line</primary>
+
+        <secondary>specifying project files</secondary>
       </indexterm>Project files</title>
 
     <para>You can save the currently open paths and filters in a project file.
@@ -353,20 +391,17 @@ to compare one file/folder against several files/folders.</para> </tip> -->
     Project files are handy if you compare the same files repeatedly.</para>
 
     <section>
-      <title>Project files</title>
+      <title>Using project files</title>
 
-      <para>You can specify a project file as a command line argument, just like
-      a normal file. In the WinMerge window, click <menuchoice>
+      <para>To use a project file In the WinMerge window, click <menuchoice>
           <guimenu>File</guimenu>
 
           <guimenuitem>Open Project</guimenuitem>
         </menuchoice>. WinMerge reads the paths from the project file. If the
       project file has two paths, both paths are opened. If only one path is
       given or one of paths is invalid, WinMerge opens the Select Files or
-      Folders dialog, where you can add or correct the path information.</para>
-
-      <para>A project file can also be opened in the Select Files or Folders
-      dialog. Here are a few things to consider:</para>
+      Folders dialog, where you can add or correct the path information. Here
+      are a few things to consider:</para>
 
       <itemizedlist>
         <listitem>
@@ -390,6 +425,9 @@ to compare one file/folder against several files/folders.</para> </tip> -->
           file are compared.</simpara>
         </listitem>
       </itemizedlist>
+
+      <para>To specify a project file on the command line, simply enter it as a
+      single file path.</para>
     </section>
 
     <section>
diff --git a/Docs/Users/Manual/Plugins.xml b/Docs/Users/Manual/Plugins.xml
index 0df6c6d4e..dbc9e1c64 100644
--- a/Docs/Users/Manual/Plugins.xml
+++ b/Docs/Users/Manual/Plugins.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <article id="Plugins">
-  <title>Plugins</title>
+  <title>Plugins<indexterm>
+      <primary>plugins</primary>
+    </indexterm></title>
 
   <para>WinMerge plugins are custom dlls or scriptlets, written in the COM API,
   that preprocess data before a comparison. For example, you can use a plugin to
@@ -9,7 +11,9 @@
   provide are of interest to only a few users, or because they do not fit into
   the WinMerge architecture.</para>
 
-  <para>Each plugin is:</para>
+  <para>Each plugin is:<indexterm>
+      <primary>installing plugins</primary>
+    </indexterm></para>
 
   <itemizedlist>
     <listitem>
@@ -37,7 +41,9 @@
 
     <variablelist>
       <varlistentry>
-        <term>Editor complement</term>
+        <term>Editor complement<indexterm>
+            <primary>editor complement plugins</primary>
+          </indexterm></term>
 
         <listitem>
           <para>This type of plugin performs custom operations on selected text
@@ -46,7 +52,9 @@
       </varlistentry>
 
       <varlistentry>
-        <term>Unpacker: transform a file to a text format</term>
+        <term>Unpacker: transform a file to a text format<indexterm>
+            <primary>unpacker plugins</primary>
+          </indexterm></term>
 
         <listitem>
           <para>This type of plugin transforms a compressed file to a viewable
@@ -80,7 +88,9 @@
       </varlistentry>
 
       <varlistentry>
-        <term>Prediffer: preprocess files to hide some differences</term>
+        <term>Prediffer: preprocess files to hide some differences<indexterm>
+            <primary>prediffer plugins</primary>
+          </indexterm></term>
 
         <listitem>
           <para>This type of plugin does not operate on the source files
@@ -199,14 +209,14 @@
         <para>To apply plugins when automatic unpacking is set, simply launch a
         compare operation on a file in the Folder Compare window. If the file's
         type suggested unpacker plugin (if any) preprocesses the file before
-        WinMerge opens it in the File Compare window. </para>
+        WinMerge opens it in the File Compare window.</para>
 
         <para>For example, suppose you right-click an MS Word
         <filename>doc</filename> file and choose
         <guimenuitem>Compare</guimenuitem> (also assume that the <xref
         linkend="Plugins_msword" /> plugin is available). WinMerge converts the
         doc file (or rather, a copy of it ) to a plain text file and opens it in
-        the File Compare window. </para>
+        the File Compare window.</para>
       </section>
 
       <section>
@@ -220,7 +230,7 @@
 
         <orderedlist>
           <listitem>
-            <para>Select the file you want to compare. </para>
+            <para>Select the file you want to compare.</para>
           </listitem>
 
           <listitem>
@@ -228,7 +238,7 @@
                 <guimenu>Plugins</guimenu>
 
                 <guimenuitem>Edit with Unpacker</guimenuitem>
-              </menuchoice>. </para>
+              </menuchoice>.</para>
 
             <para>This menu item is enabled only if the selected file's type is
             supported by an available unpacking plugin.</para>
@@ -314,10 +324,18 @@
   </section>
 
   <section id="Plugins_available">
-    <title>Available plugins</title>
+    <title>Available plugins<indexterm>
+        <primary>Visual Basic dlls for plugins</primary>
+      </indexterm><indexterm>
+        <primary>plugins</primary>
+
+        <secondary>Visual Basic dlls</secondary>
+      </indexterm></title>
 
     <section>
-      <title><filename>CompareMSExcelFiles.dll</filename></title>
+      <title><filename>CompareMSExcelFiles.dll<indexterm>
+          <primary>CompareMSExcelFiles.dll plugin file</primary>
+        </indexterm></filename></title>
 
       <para>Displays the text contents of a <trademark
       class="registered">Microsoft</trademark> <application>Excel</application>
@@ -346,7 +364,9 @@
     </section>
 
     <section id="Plugins_msword">
-      <title><filename>CompareMSWordFiles.dll</filename></title>
+      <title><filename>CompareMSWordFiles.dll<indexterm>
+          <primary>CompareMSWordFiles.dll plugin file</primary>
+        </indexterm></filename></title>
 
       <para>Displays the text content of a <trademark
       class="registered">Microsoft</trademark> <application>Word</application>
@@ -377,7 +397,9 @@
     </section>
 
     <section id="DisplayXMLFiles">
-      <title><filename>DisplayXMLFiles.dll</filename></title>
+      <title><filename>DisplayXMLFiles.dll<indexterm>
+          <primary>DisplayXMLFiles.dll plugin file</primary>
+        </indexterm></filename></title>
 
       <para>This plugin pretty-prints XML files nicely by inserting tabs and
       line breaks. This is useful for XML files that do not have line returns in
@@ -401,7 +423,9 @@
     </section>
 
     <section id="EditorAddin">
-      <title><filename>editor addin.sct</filename></title>
+      <title><filename>editor addin.sct<indexterm>
+          <primary>editor addin.sct plugin file</primary>
+        </indexterm></filename></title>
 
       <para>Adds two functions to the <menuchoice>
           <guimenu>Edit</guimenu>
@@ -431,7 +455,9 @@
     </section>
 
     <section id="IgnoreColumns">
-      <title><filename>IgnoreColumns.dll</filename></title>
+      <title><filename>IgnoreColumns.dll<indexterm>
+          <primary>IgnoreColumns.dll plugin file</primary>
+        </indexterm></filename></title>
 
       <para>This plugin ignores characters at specified columns. The first
       column is number 1</para>
@@ -500,7 +526,9 @@
     </section>
 
     <section>
-      <title><filename>IgnoreCommentsC.dll</filename></title>
+      <title><filename>IgnoreCommentsC.dll<indexterm>
+          <primary>IgnoreCommentsC.dll plugin file</primary>
+        </indexterm></filename></title>
 
       <para>The plugin ignores comments within<constant> //</constant>... and
       <constant>/*</constant> ... <constant>*/</constant> delimiters in C, C++,
@@ -526,7 +554,9 @@
     </section>
 
     <section>
-      <title><filename>IgnoreFieldsComma.dll</filename></title>
+      <title><filename>IgnoreFieldsComma.dll<indexterm>
+          <primary>IgnoreFieldsComma.dll plugin file</primary>
+        </indexterm></filename></title>
 
       <para>This plugin is for files with fields and commas as delimiters (CSV
       files, for example). It ignores the delimiter characters. The first field
@@ -550,7 +580,9 @@
     </section>
 
     <section>
-      <title><filename>IgnoreFieldsTab.dll</filename></title>
+      <title><filename>IgnoreFieldsTab.dll<indexterm>
+          <primary>IgnoreFieldsTab.dll plugin file</primary>
+        </indexterm></filename></title>
 
       <para>This plugin is for files that use fields and tabs as delimiters
       (<application>for examle, Excel</application> files saved in the <filename
@@ -575,7 +607,9 @@
     </section>
 
     <section>
-      <title><filename>IgnoreLeadingLineNumbers.dll</filename></title>
+      <title><filename>IgnoreLeadingLineNumbers.dll<indexterm>
+          <primary>IgnoreLeadingLineNumbers.dll plugin file</primary>
+        </indexterm></filename></title>
 
       <para>This plugin ignores the leading line numbers in text files (for
       example, NC and BASIC files).</para>
@@ -598,7 +632,9 @@
     </section>
 
     <section id="Plugins_datetime">
-      <title><filename>insert datetime.sct</filename></title>
+      <title><filename>insert datetime.sct<indexterm>
+          <primary>insert datetime.sct plugin file</primary>
+        </indexterm></filename></title>
 
       <para>Adds two functions to the <menuchoice>
           <guimenu>Edit</guimenu>
@@ -629,7 +665,10 @@
 
     <section>
       <title><filename>RCLocalizationHelper.dll</filename>,
-      <filename>RCLocalizationHelperU.dll</filename></title>
+      <filename>RCLocalizationHelperU.dll<indexterm>
+          <primary>RCLocalizationHelper.dll, RCLocalizationHelperU.dll plugin
+          files</primary>
+        </indexterm></filename></title>
 
       <para>This plugin preprocesses RC files by stripping out localized
       strings, to enable comparing different language versions of the same RC
@@ -653,7 +692,10 @@
 
     <section>
       <title><filename>WatchBeginningOfLog.dll</filename>,
-      <filename>WatchEndOfLog.dll</filename></title>
+      <filename>WatchEndOfLog.dll<indexterm>
+          <primary>WatchBeginningOfLog.dll, WatchEndOfLog.dll plugin
+          files</primary>
+        </indexterm></filename></title>
 
       <para>For long LOG files, often only in the first lines or in the last
       lines are significant.</para>
@@ -693,7 +735,11 @@
   </section>
 
   <section>
-    <title>Requirements</title>
+    <title>Requirements<indexterm>
+        <primary>plugins</primary>
+
+        <secondary>Windows Script Host requirement</secondary>
+      </indexterm></title>
 
     <section>
       <title>Windows Script Host</title>
@@ -710,7 +756,18 @@
     </section>
 
     <section id="MSVBVM60">
-      <title><application>Visual Basic</application> runtime library</title>
+      <title><application>Visual Basic</application> runtime library<indexterm>
+          <primary>Visual Basic dlls for plugins</primary>
+        </indexterm><indexterm>
+          <primary>plugins</primary>
+
+          <secondary>Visual Basic dlls</secondary>
+        </indexterm><indexterm>
+          <primary>msvbvm60.dll plugin file</primary>
+        </indexterm><indexterm>
+          <primary>Run-Time Redistribution Pack, for Visual Basic
+          library</primary>
+        </indexterm></title>
 
       <para>Some plugins require <application>the Visual Basic</application>
       runtime library to work.</para>
diff --git a/Docs/Users/Manual/Quick_start.xml b/Docs/Users/Manual/Quick_start.xml
index 5ac07836a..b2f4f0559 100644
--- a/Docs/Users/Manual/Quick_start.xml
+++ b/Docs/Users/Manual/Quick_start.xml
@@ -6,10 +6,10 @@
     <title><indexterm>
         <primary>getting started with WinMerge</primary>
       </indexterm><indexterm>
-        <primary>opening files and folders</primary>
+        <primary>choosing files and folders</primary>
 
         <secondary>getting started</secondary>
-      </indexterm>Opening files and folders</title>
+      </indexterm>Selecting files and folders to compare</title>
 
     <para>After you have installed WinMerge, step through the procedure and
     discussions in this topic to learn basic WinMerge operations and concepts.
@@ -21,7 +21,9 @@
     <orderedlist>
       <listitem>
         <para>Open the WinMerge window. Here are some of the methods you can
-        use:</para>
+        use:<indexterm>
+            <primary>WinMerge window</primary>
+          </indexterm></para>
 
         <itemizedlist>
           <listitem>
@@ -241,7 +243,13 @@
     </orderedlist>
 
     <section>
-      <title>Other ways to open files and folders</title>
+      <title>Other ways to open files and folders<indexterm>
+          <primary>project files</primary>
+        </indexterm><indexterm>
+          <primary>command line</primary>
+
+          <secondary>opening files and folders</secondary>
+        </indexterm></title>
 
       <para>The Select Files or Folders dialog is the main interface for opening
       files and folders. But you can use many other ways, too:</para>
diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml
index 7277b7610..70be31096 100644
--- a/Docs/Users/Manual/WinMerge_help.xml
+++ b/Docs/Users/Manual/WinMerge_help.xml
@@ -84,6 +84,10 @@
     </authorgroup>
   </bookinfo>
 
+  <!--Note to maintainers: Not all doc files are included in this file. There are also fragment files included at the topic 
+level. For example, several files include elements from replaceables.xml. Other fragment files are select-unpacker.xml 
+and Text_encoding.xml. Pleaes do not delete xml files in this directory unless you know for sure that they are not used.-->
+
   &AboutDoc;
 
   &QuickStart;
@@ -116,5 +120,5 @@
 
   &ShortCuts;
 
-  <index id="word_index"/>
+  <index id="word_index"></index>
 </book>