Update manual (#497)

* Update Compare_dirs.xml

* Update Install.xml

* Update Plugins.xml

* Update Shortcut_keys.xml

diff --git a/Docs/Manual/EN/Compare_dirs.xml b/Docs/Manual/EN/Compare_dirs.xml
index d1d16db..aea7bfb 100644 (file)
--- a/Docs/Manual/EN/Compare_dirs.xml
+++ b/Docs/Manual/EN/Compare_dirs.xml
@@ -973,7 +973,7 @@ added/deleted/copied. User can create a new archive file using above menuitems i
               <para>Again, the <guimenuitem>Compare</guimenuitem> operation is
               available only when the current left and right folder paths are
               identical in the Folder Compare window, as shown in the preceding
-              screen shot. For example, it is not available if the current
+              screenshot. For example, it is not available if the current
               window compares two different folders.</para>
             </tip>
           </listitem>

diff --git a/Docs/Manual/EN/Install.xml b/Docs/Manual/EN/Install.xml
index 8e3de2a..fab5335 100644 (file)
--- a/Docs/Manual/EN/Install.xml
+++ b/Docs/Manual/EN/Install.xml
@@ -24,11 +24,11 @@
        \r
        <itemizedlist>\r
          <listitem>\r
-           <para><ulink url="https://sourceforge.net/projects/winmerge/files/stable/2.16.4/">WinMerge 2.16.4(64 bit)</ulink> \r
+           <para><ulink url="https://sourceforge.net/projects/winmerge/files/stable/2.16.4/">WinMerge 2.16.4 (64 bit)</ulink> \r
                supports Windows 7 and later. It runs on 64 bit Windows.</para>\r
          </listitem>\r
          <listitem>\r
-           <para><ulink url="https://sourceforge.net/projects/winmerge/files/stable/2.16.4/">WinMerge 2.16.4(32 bit)</ulink> \r
+           <para><ulink url="https://sourceforge.net/projects/winmerge/files/stable/2.16.4/">WinMerge 2.16.4 (32 bit)</ulink> \r
                supports Windows XP and later. It runs on both 32 bit and 64 bit Windows.</para>\r
          </listitem>\r
          <listitem>\r
@@ -70,11 +70,6 @@
       </listitem>\r
 \r
       <listitem>\r
-        <simpara>Click <guibutton>Next</guibutton> in the Welcome\r
-        screen.</simpara>\r
-      </listitem>\r
-\r
-      <listitem>\r
         <simpara>Click <guibutton>Next</guibutton> in the License Agreement\r
         screen.</simpara>\r
       </listitem>\r
@@ -108,6 +103,16 @@
           </varlistentry>\r
 \r
           <varlistentry>\r
+            <term>32-bit WinMerge ShellExtension<indexterm>\r
+                <primary>Shellextension</primary>\r
+              </indexterm></term>\r
+\r
+            <listitem>\r
+              <para>The option enables you to launch WinMerge directly from Windows Explorer, comparing items that you have selected there.</para>\r
+            </listitem>\r
+          </varlistentry>\r
+\r
+          <varlistentry>\r
             <term>Filters</term>\r
 \r
             <listitem>\r
@@ -127,7 +132,7 @@
           </varlistentry>\r
 \r
           <varlistentry>\r
-            <term>Frhed</term>\r
+            <term>Frhed (Free hex editor)</term>\r
 \r
             <listitem>\r
               <para>Frhed enable you to show files in hex format.</para>\r
@@ -135,7 +140,7 @@
           </varlistentry>\r
 \r
           <varlistentry>\r
-            <term>WinIMerge</term>\r
+            <term>WinIMerge (Image Diff/Merge)</term>\r
 \r
             <listitem>\r
               <para>WinIMerge enables you to show the differences between image files.</para>\r
@@ -188,7 +193,7 @@
           </listitem>\r
 \r
           <listitem>\r
-            <para>Optionally, check the option, <guilabel>Don't create a Start\r
+            <para>Optionally, check the option <guilabel>Don't create a Start\r
             Menu folder</guilabel>.</para>\r
           </listitem>\r
         </itemizedlist>\r
@@ -270,19 +275,64 @@
           </varlistentry>\r
 \r
           <varlistentry>\r
-            <term>Create a Desktop shortcut</term>\r
+            <term>Create a desktop shortcut</term>\r
 \r
             <listitem>\r
               <para>Adds the WinMerge shortcut to your Windows Desktop.</para>\r
             </listitem>\r
           </varlistentry>\r
+        </variablelist>\r
+\r
+        <para>Click <guibutton>Next</guibutton>.</para>\r
+      </listitem>\r
+\r
+      <listitem>\r
+        <simpara>In the 3-way merge wizard page, register WinMerge\r
+        as 3-way merge tool for TortoiseSVN/Git.</simpara>\r
+\r
+        <variablelist>\r
+          <varlistentry>\r
+            <term>Register WinMerge as a 3-way merge tool<indexterm>\r
+                <primary>3-way merge tool</primary>\r
+              </indexterm></term>\r
+\r
+            <listitem>\r
+              <para>Register WinMerge as 3-way merge tool for\r
+              TortoiseSVN/Git.</para>\r
+            </listitem>\r
+          </varlistentry>\r
+\r
+          <varlistentry>\r
+            <term>Merge at right pane</term>\r
+\r
+            <listitem>\r
+              <para>Merge at right pane.</para>\r
+            </listitem>\r
+          </varlistentry>\r
+\r
+\r
+          <varlistentry>\r
+            <term>Merge at center pane</term>\r
+\r
+            <listitem>\r
+              <para>Merge at center pane.</para>\r
+            </listitem>\r
+          </varlistentry>\r
+\r
+          <varlistentry>\r
+            <term>Merge at left pane</term>\r
+\r
+            <listitem>\r
+              <para>Merge at left pane.</para>\r
+            </listitem>\r
+          </varlistentry>\r
 \r
           <varlistentry>\r
-            <term>Create a Quick Launch shortcut</term>\r
+            <term>Auto-merge at startup time</term>\r
 \r
             <listitem>\r
-              <para>Adds the WinMerge shortcut to the Windows Quick Launch\r
-              bar.</para>\r
+              <para>Optionally, disable the option <guilabel>Auto-merge at\r
+            startup time</guilabel>.</para>\r
             </listitem>\r
           </varlistentry>\r
         </variablelist>\r

diff --git a/Docs/Manual/EN/Plugins.xml b/Docs/Manual/EN/Plugins.xml
index 90a6128..f227840 100644 (file)
--- a/Docs/Manual/EN/Plugins.xml
+++ b/Docs/Manual/EN/Plugins.xml
@@ -386,46 +386,6 @@
         </segmentedlist></para>
     </section>
 
-    <section id="Plugins_msword">
-      <title><filename>CompareMSWordFiles.sct<indexterm>
-          <primary>CompareMSWordFiles.sct plugin file</primary>
-        </indexterm></filename></title>
-
-      <para>Displays the text content of a <trademark
-      class="registered">Microsoft</trademark> <application>Word</application>
-      file, stripping away all formatting and embedded objects.</para>
-
-      <para><segmentedlist>
-          <segtitle>Category</segtitle>
-
-          <segtitle>File filter</segtitle>
-
-          <segtitle>Packing</segtitle>
-
-          <segtitle>Settings dialog support</segtitle>
-
-          <segtitle>Dependency</segtitle>
-
-          <seglistitem>
-            <seg>Unpacker</seg>
-
-           <seg><filename class="extension">*.doc</filename>, <filename
-            class="extension">*.docx</filename>, <filename
-            class="extension">*.docm</filename>, <filename
-            class="extension">*.dot</filename>, <filename
-            class="extension">*.dotx</filename>, <filename
-            class="extension">*.dotm</filename></seg>
-
-            <seg>No</seg>
-
-            <seg>Yes</seg>
-
-            <seg><trademark class="registered">Microsoft</trademark>
-            <application>Word</application></seg>
-          </seglistitem>
-        </segmentedlist></para>
-    </section>
-
     <section id="Plugins_powerpnt">
       <title><filename>CompareMSPowerPointFiles.sct<indexterm>
           <primary>CompareMSPowerPointFiles.sct plugin file</primary>
@@ -511,51 +471,42 @@
         </segmentedlist></para>
     </section>
 
-    <section id="EditorAddin">
-      <title><filename>editor addin.sct<indexterm>
-          <primary>editor addin.sct plugin file</primary>
+    <section id="Plugins_msword">
+      <title><filename>CompareMSWordFiles.sct<indexterm>
+          <primary>CompareMSWordFiles.sct plugin file</primary>
         </indexterm></filename></title>
 
-      <para>Adds five functions to the <menuchoice>
-          <guimenu>Plugins</guimenu>
+      <para>Displays the text content of a <trademark
+      class="registered">Microsoft</trademark> <application>Word</application>
+      file, stripping away all formatting and embedded objects.</para>
 
-          <guisubmenu>Scripts</guisubmenu>
-        </menuchoice> menu:</para>
+      <para><segmentedlist>
+          <segtitle>Category</segtitle>
 
-      <itemizedlist>
-        <listitem>
-          <simpara><guimenuitem>MakeUpper</guimenuitem> convert the selection to
-          UPPER CASE.</simpara>
-        </listitem>
+          <segtitle>File filter</segtitle>
 
-        <listitem>
-          <simpara><guimenuitem>MakeLower</guimenuitem> convert the selection to
-          lower case.</simpara>
-        </listitem>
+          <segtitle>Packing</segtitle>
 
-        <listitem>
-          <simpara><guimenuitem>SortAscending</guimenuitem> sort the selection 
-          in ascending order.</simpara>
-        </listitem>
+          <segtitle>Settings dialog support</segtitle>
 
-        <listitem>
-          <simpara><guimenuitem>SortDescending</guimenuitem> sort the selection 
-          in descending order.</simpara>
-        </listitem>
+          <segtitle>Dependency</segtitle>
 
-        <listitem>
-          <simpara><guimenuitem>ExecFilterCommand</guimenuitem> replace the selection 
-          with the output of the specified filter command.</simpara>
-        </listitem>
-      </itemizedlist>
+          <seglistitem>
+            <seg>Unpacker</seg>
 
-      <para><segmentedlist>
-          <segtitle>Category</segtitle>
-          <segtitle>Settings dialog support</segtitle>
+           <seg><filename class="extension">*.doc</filename>, <filename
+            class="extension">*.docx</filename>, <filename
+            class="extension">*.docm</filename>, <filename
+            class="extension">*.dot</filename>, <filename
+            class="extension">*.dotx</filename>, <filename
+            class="extension">*.dotm</filename></seg>
 
-          <seglistitem>
-            <seg>Editor complement</seg>
             <seg>No</seg>
+
+            <seg>Yes</seg>
+
+            <seg><trademark class="registered">Microsoft</trademark>
+            <application>Word</application></seg>
           </seglistitem>
         </segmentedlist></para>
     </section>
@@ -759,6 +710,55 @@
         </segmentedlist></para>
     </section>
 
+    <section id="EditorAddin">
+      <title><filename>editor addin.sct<indexterm>
+          <primary>editor addin.sct plugin file</primary>
+        </indexterm></filename></title>
+
+      <para>Adds five functions to the <menuchoice>
+          <guimenu>Plugins</guimenu>
+
+          <guisubmenu>Scripts</guisubmenu>
+        </menuchoice> menu:</para>
+
+      <itemizedlist>
+        <listitem>
+          <simpara><guimenuitem>MakeUpper</guimenuitem> convert the selection to
+          UPPER CASE.</simpara>
+        </listitem>
+
+        <listitem>
+          <simpara><guimenuitem>MakeLower</guimenuitem> convert the selection to
+          lower case.</simpara>
+        </listitem>
+
+        <listitem>
+          <simpara><guimenuitem>SortAscending</guimenuitem> sort the selection 
+          in ascending order.</simpara>
+        </listitem>
+
+        <listitem>
+          <simpara><guimenuitem>SortDescending</guimenuitem> sort the selection 
+          in descending order.</simpara>
+        </listitem>
+
+        <listitem>
+          <simpara><guimenuitem>ExecFilterCommand</guimenuitem> replace the selection 
+          with the output of the specified filter command.</simpara>
+        </listitem>
+      </itemizedlist>
+
+      <para><segmentedlist>
+          <segtitle>Category</segtitle>
+          <segtitle>Settings dialog support</segtitle>
+
+          <seglistitem>
+            <seg>Editor complement</seg>
+            <seg>No</seg>
+          </seglistitem>
+        </segmentedlist></para>
+    </section>
+
     <section id="Plugins_datetime">
       <title><filename>insert datetime.sct<indexterm>
           <primary>insert datetime.sct plugin file</primary>

diff --git a/Docs/Manual/EN/Shortcut_keys.xml b/Docs/Manual/EN/Shortcut_keys.xml
index da5f1f5..4783f82 100644 (file)
--- a/Docs/Manual/EN/Shortcut_keys.xml
+++ b/Docs/Manual/EN/Shortcut_keys.xml
@@ -150,6 +150,12 @@
         </row>
 
         <row>
+          <entry><keycap>Ctrl</keycap>+<keycap>F5</keycap></entry>
+
+          <entry>Reload</entry>
+        </row>
+
+        <row>
           <entry><keycap>F6</keycap></entry>
 
           <entry>Change to next pane (active file)</entry>
@@ -301,6 +307,27 @@
           <entry><keycombo>
               <keycap>Ctrl</keycap>
 
+              <keycap>U</keycap>
+            </keycombo></entry>
+
+          <entry>Convert selected text to lower case</entry>
+        </row>
+
+        <row>
+          <entry><keycombo>
+              <keycap>Ctrl</keycap>
+              <keycap>Shift</keycap>
+
+              <keycap>U</keycap>
+            </keycombo></entry>
+
+          <entry>Convert selected text to upper case</entry>
+        </row>
+
+        <row>
+          <entry><keycombo>
+              <keycap>Ctrl</keycap>
+
               <keycap>Y</keycap>
             </keycombo></entry>