Update Manual (#513)

* Update README.md

* Add files via upload

* Update About_Doc.xml

* Update Command_line.xml

* Update Compare_dirs.xml

* Update Compare_files.xml

* Update Compare_images.xml

* Update Configuration.xml

* Update Faq.xml

* Update Open_paths.xml

* Update build_htmlhelp_en.bat

* Update build_htmlhelp_jp.bat

diff --git a/Docs/Manual/EN/About_Doc.xml b/Docs/Manual/EN/About_Doc.xml
index 55c03ec..1fb829f 100644 (file)
--- a/Docs/Manual/EN/About_Doc.xml
+++ b/Docs/Manual/EN/About_Doc.xml
@@ -47,7 +47,7 @@
         <term>Context-sensitive help</term>
 
         <listitem>
-          <para>While using any WinMerge window, press F1. If a specific topic
+          <para>While using any WinMerge window, press <keycap>F1</keycap>. If a specific topic
           is available for your current window, Help opens at that topic. If
           not, Help opens at the beginning.</para>
         </listitem>

diff --git a/Docs/Manual/EN/Command_line.xml b/Docs/Manual/EN/Command_line.xml
index cf7c2ab..8eeab39 100644 (file)
--- a/Docs/Manual/EN/Command_line.xml
+++ b/Docs/Manual/EN/Command_line.xml
@@ -37,6 +37,8 @@
 
       <arg><option>/s</option></arg>
 
+      <arg><option>/s-</option></arg>
+
       <arg choice="opt" rep="norepeat"><option>/ul</option></arg>
 
       <arg choice="opt" rep="norepeat"><option>/um</option></arg>
@@ -196,6 +198,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term><option>/s-</option></term>
+      <listitem>
+        <para>Ensure that another instance is always executed, ignoring the
+        value of the "Allow only one instance to run" option.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <indexterm>
         <primary>MRU list</primary>
       </indexterm>
@@ -288,21 +298,21 @@
     <varlistentry>
       <term><option>/fl</option></term>
       <listitem>
-        <para>Sets focus to the left side at startup</para>
+        <para>Sets focus to the left side at startup.</para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
       <term><option>/fm</option></term>
       <listitem>
-        <para>Sets focus to the middle side at startup</para>
+        <para>Sets focus to the middle side at startup.</para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
       <term><option>/fr</option></term>
       <listitem>
-        <para>Sets focus to the right side at startup</para>
+        <para>Sets focus to the right side at startup.</para>
       </listitem>
     </varlistentry>
 

diff --git a/Docs/Manual/EN/Compare_dirs.xml b/Docs/Manual/EN/Compare_dirs.xml
index aea7bfb..70443fc 100644 (file)
--- a/Docs/Manual/EN/Compare_dirs.xml
+++ b/Docs/Manual/EN/Compare_dirs.xml
@@ -275,7 +275,8 @@ I get the partial list, but no Abort indicator.--></para>
             see an item's subfolder, look at its path in the Compare result
             column. Folders that exist on only one side are displayed if one of
             the <guimenu>View</guimenu> menu options, <guimenuitem>Show Left
-            Unique Files</guimenuitem> or <guimenuitem>Show Left Unique
+            Unique Files</guimenuitem>, <guimenuitem>Show Middle Unique Files
+            </guimenuitem> or <guimenuitem>Show Right Unique
             Files</guimenuitem>, is enabled.</para>
           </listitem>
         </varlistentry>
@@ -299,7 +300,7 @@ I get the partial list, but no Abort indicator.--></para>
           <secondary>Folder Compare window</secondary>
         </indexterm></title>
 
-      <para>In the Compare Folders window, files and folders are compared and
+      <para>In the Folder Compare window, files and folders are compared and
       divided into several categories. In each row, the category is clearly
       identified in the left column with one of these icons:</para>
 
@@ -369,6 +370,13 @@ I get the partial list, but no Abort indicator.--></para>
 
         <member><inlinemediaobject>
             <imageobject>
+              <imagedata contentwidth="16" fileref="screenshots/mfolder.png"
+                         format="PNG" />
+            </imageobject>
+          </inlinemediaobject> Middle-only folders</member>
+
+        <member><inlinemediaobject>
+            <imageobject>
               <imagedata contentwidth="16" fileref="screenshots/rfolder.png"
                          format="PNG" />
             </imageobject>
@@ -383,6 +391,13 @@ I get the partial list, but no Abort indicator.--></para>
 
         <member><inlinemediaobject>
             <imageobject>
+              <imagedata contentwidth="16" fileref="screenshots/mfile.png"
+                         format="PNG" />
+            </imageobject>
+          </inlinemediaobject> Middle-only files</member>
+
+        <member><inlinemediaobject>
+            <imageobject>
               <imagedata contentwidth="16" fileref="screenshots/rfile.png"
                          format="PNG" />
             </imageobject>
@@ -534,6 +549,21 @@ I get the partial list, but no Abort indicator.--></para>
             <guibutton>OK</guibutton>.</para>
           </listitem>
         </itemizedlist>
+        <para>In the Folder Compare window with three folders, the
+        <guimenuitem>Copy</guimenuitem> item has a submenu with nine
+        shortcuts:</para>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata contentwidth="410"
+                       fileref="screenshots/ctx_menu_copy2.png" format="PNG" />
+          </imageobject>
+
+          <textobject>
+            <phrase>Folder Compare window Copy context menu</phrase>
+          </textobject>
+        </mediaobject>
+
       </section>
 
       <section>
@@ -586,10 +616,11 @@ I get the partial list, but no Abort indicator.--></para>
         </indexterm></title>
 
       <para>You can use the <guimenuitem>Delete</guimenuitem> context menu item
-      to delete selected items in either or both sides. Like other file
+      to delete selected items in either or all sides. Like other file
       operations, <guimenuitem>Delete</guimenuitem> has a submenu with
-      <guimenuitem>Left</guimenuitem>, <guimenuitem>Right</guimenuitem>, and
-      <guimenuitem>Both</guimenuitem> shortcuts.</para>
+      <guimenuitem>Left</guimenuitem>, <guimenuitem>Middle</guimenuitem>,
+      <guimenuitem>Right</guimenuitem>, and <guimenuitem>All</guimenuitem>
+      shortcuts.</para>
 
       <warning>
         <para>We highly recommend that you keep the <guilabel>Send deleted files
@@ -612,7 +643,7 @@ I get the partial list, but no Abort indicator.--></para>
 
       <para>To rename a file or folder, choose <guimenuitem>Rename</guimenuitem>
       in its context menu or press <keycap>F2</keycap>. Then change the name in
-      the edit box and press <keycap>Return</keycap>, or press
+      the edit box and press <keycap>Enter</keycap>, or press
       <keycap>Esc</keycap> to cancel. You can only rename a single file or
       folder. Note that renaming changes items in both sides: it is not
       currently possible to rename an item on just one side.</para>
@@ -625,14 +656,15 @@ I get the partial list, but no Abort indicator.--></para>
           <secondary>in Folder Compare window</secondary>
         </indexterm></title>
 
-      <para>In the context menu, you can use either <guimenuitem>Open
-      Left</guimenuitem> and <guimenuitem>Open Right</guimenuitem>, depending on
-      which side you want to operate on. Each <guimenuitem>Open</guimenuitem>
-      menu item has a submenu with these shortcuts:</para>
+      <para>In the context menu, you can use <guimenuitem>Open
+      Left</guimenuitem>, <guimenuitem>Open Middle</guimenuitem> or
+      <guimenuitem>Open Right</guimenuitem>, depending on which side you want to
+      operate on. Each <guimenuitem>Open</guimenuitem> menu item has a submenu
+      with these shortcuts:</para>
 
       <variablelist>
         <varlistentry>
-          <term><guimenuitem>With Registered Application</guimenuitem></term>
+          <term>With Registered Application</term>
 
           <listitem>
             <para>Opens the file with the application (if any) that is
@@ -657,7 +689,7 @@ I get the partial list, but no Abort indicator.--></para>
         </varlistentry>
 
         <varlistentry>
-          <term><guimenuitem>With...</guimenuitem></term>
+          <term>With...</term>
 
           <listitem>
             <para>Opens the <guilabel>Open With</guilabel> dialog, where you can
@@ -717,6 +749,10 @@ I get the partial list, but no Abort indicator.--></para>
           <guimenu>File</guimenu>
 
           <guimenuitem>Left Read-only</guimenuitem>
+        </menuchoice>, <menuchoice>
+          <guimenu>File</guimenu>
+
+          <guimenuitem>Middle Read-only</guimenuitem>
         </menuchoice> or <menuchoice>
           <guimenu>File</guimenu>
 
@@ -735,7 +771,7 @@ I get the partial list, but no Abort indicator.--></para>
       protected side is write-protected. Similarly, you cannot copy a file from
       the unprotected side to the protected side.</para>
 
-      <para>The <guilabel>RO</guilabel> code in the left or right side's pane in
+      <para>The <guilabel>RO</guilabel> code in the left side's, middle or right side's pane in
       the status bar (near the bottom right of the window) indicates that the
       side is currently read-only.</para>
     </section>
@@ -771,7 +807,7 @@ I get the partial list, but no Abort indicator.--></para>
         7-Zip plugin.</para>
       </note>
 
-      <para>The Zip menu item has a submenu with four shortcuts:</para>
+      <para>The <guimenu>Zip</guimenu> menu item has a submenu with five shortcuts:</para>
 
       <variablelist>
         <varlistentry>
@@ -784,6 +820,15 @@ I get the partial list, but no Abort indicator.--></para>
         </varlistentry>
 
         <varlistentry>
+          <term>Middle</term>
+
+          <listitem>
+            <para>Adds middle files and folders recursively to the archive
+            file</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
           <term>Right</term>
 
           <listitem>
@@ -808,6 +853,21 @@ I get the partial list, but no Abort indicator.--></para>
         </varlistentry>
 
         <varlistentry>
+          <term>All</term>
+
+          <listitem>
+            <para>Adds files and folders recursively from all sides to the
+            archive file. Because the filenames are same, they are added to
+            different subfolders, named <filename
+            class="directory">Original</filename> and <filename
+            class="directory">Altered</filename>, inside the archive: left-side
+            files are put to <filename class="directory">Original</filename>,
+            and right-side files are put into <filename
+            class="directory">Altered</filename>.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
           <term>Differences</term>
 
           <listitem>
@@ -858,7 +918,7 @@ added/deleted/copied. User can create a new archive file using above menuitems i
       </indexterm></title>
 
     <para>This section discusses ways to browse folders that are listed in a
-    Compare Folder window. When you browse a folder, you perform a completely
+    Folder Compare window. When you browse a folder, you perform a completely
     new compare operation. Its result overwrites the current result in the
     window.</para>
 
@@ -1090,6 +1150,11 @@ added/deleted/copied. User can create a new archive file using above menuitems i
         </listitem>
 
         <listitem>
+          <para><guimenuitem>Show Middle Unique Items</guimenuitem>: Files and
+          directories present only in the middle</para>
+        </listitem>
+
+        <listitem>
           <para><guimenuitem>Show Right Unique Items</guimenuitem>: Files and
           directories present only in right side</para>
         </listitem>
@@ -1201,10 +1266,10 @@ added/deleted/copied. User can create a new archive file using above menuitems i
         </listitem>
 
         <listitem>
-          <para><guilabel>Left Date</guilabel>, <guilabel>Right Date</guilabel>:
-          Modification dates of item in each side. The newer of the two dates
-          (or the date for any unique item) is prefixed with an asterisk ( *
-          ).</para>
+          <para><guilabel>Left Date</guilabel>, <guilabel>Middle
+          Date</guilabel>, <guilabel>Right Date</guilabel>: Modification dates
+          of item in each side. The newer of the two dates (or the date for any
+          unique item) is prefixed with an asterisk ( * ).</para>
         </listitem>
 
         <listitem>
@@ -1230,37 +1295,42 @@ added/deleted/copied. User can create a new archive file using above menuitems i
         </listitem>
 
         <listitem>
-          <para><guilabel>Left Attributes</guilabel>, <guilabel>Right
-          Attributes</guilabel>: Shows file attributes.</para>
+          <para><guilabel>Left Attributes</guilabel>, <guilabel>Middle
+          Attributes</guilabel>, <guilabel>Right Attributes</guilabel>: Shows
+          file attributes.</para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Left Creation Time</guilabel>, <guilabel>Right
-          Creation Time</guilabel>: Item creation time.</para>
+          <para><guilabel>Left Creation Time</guilabel>, <guilabel>Middle
+          Creation Time</guilabel>, <guilabel>Right Creation Time</guilabel>:
+          Item creation time.</para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Left Encoding</guilabel>, <guilabel>Right
-          Encoding</guilabel>: File encoding. Shows the codepage number for ANSI
-          files and Unicode encoding for Unicode files.</para>
+          <para><guilabel>Left Encoding</guilabel>, <guilabel>Middle
+          Encoding</guilabel>, <guilabel>Right Encoding</guilabel>: File
+          encoding. Shows the codepage number for ANSI files and Unicode
+          encoding for Unicode files.</para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Left File Version</guilabel>, <guilabel>Right File
-          Version</guilabel>: Version number from the file, if present. Note
-          that the version is read only for some binary file types known to
-          usually have a version resource.</para>
+          <para><guilabel>Left File Version</guilabel>, <guilabel>Middle File
+          Version</guilabel>, <guilabel>Right File Version</guilabel>: Version
+          number from the file, if present. Note that the version is read only
+          for some binary file types known to usually have a version
+          resource.</para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Left Size</guilabel>, <guilabel>Right Size</guilabel>:
-          File size in bytes.</para>
+          <para><guilabel>Left Size</guilabel>, <guilabel>Middle
+          Size</guilabel>, <guilabel>Right Size</guilabel>: File size in
+          bytes.</para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Left Size (Short)</guilabel>, <guilabel>Right Size
-          (Short)</guilabel>: Shorter versions of file sizes, rounded to KB, MB,
-          or GB.</para>
+          <para><guilabel>Left Size (Short)</guilabel>, <guilabel>Middle Size
+          (Short)</guilabel>, <guilabel>Right Size (Short)</guilabel>: Shorter
+          versions of file sizes, rounded to KB, MB, or GB.</para>
         </listitem>
 
         <listitem>
@@ -1279,8 +1349,9 @@ added/deleted/copied. User can create a new archive file using above menuitems i
         </listitem>
 
         <listitem>
-          <para><guilabel>Left EOL</guilabel>, <guilabel>Right EOL</guilabel>:
-          Shows the EOL (linefeed) style of files.</para>
+          <para><guilabel>Left EOL</guilabel>, <guilabel>Middle EOL</guilabel>,
+          <guilabel>Right EOL</guilabel>: Shows the EOL (linefeed) style of
+          files.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -1315,9 +1386,11 @@ added/deleted/copied. User can create a new archive file using above menuitems i
     context menu.</para>
 
     <para>If the selection occurs on both sides, you can choose either the
-    <guimenu>Left shell menu</guimenu> or <guimenu>Right shell menu</guimenu>;
-    if the item occurs only on one side, only that side's shell menu is
-    available.</para>
+    <guimenu>Left shell menu</guimenu> or <guimenu>Right shell menu</guimenu>.
+    If the selection occurs on all sides, you can choose the
+    <guimenu>Left shell menu</guimenu>, <guimenu>Middle shell menu</guimenu> or
+    <guimenu>Right shell menu</guimenu>. If the item occurs only on one side,
+    only that side's shell menu is available.</para>
 
     <caution>
       <para>Please consider that shell menu commands run entirely outside of

diff --git a/Docs/Manual/EN/Compare_files.xml b/Docs/Manual/EN/Compare_files.xml
index ad0e28d..ecd1c06 100644 (file)
--- a/Docs/Manual/EN/Compare_files.xml
+++ b/Docs/Manual/EN/Compare_files.xml
@@ -638,7 +638,7 @@
             <itemizedlist>
               <listitem>
                 <para>To set a bookmark on a line, double-click in its margin
-                (or press (<keycombo>
+                (or press <keycombo>
                     <keycap>Ctrl</keycap>
 
                     <keycap>F2</keycap>
@@ -657,7 +657,7 @@
 
               <listitem>
                 <para>Double-click a single bookmark to delete it (or press
-                (<keycombo>
+                <keycombo>
                     <keycap>Ctrl</keycap>
 
                     <keycap>F2</keycap>
@@ -776,8 +776,9 @@
             <guimenu>File</guimenu>
 
             <guimenuitem>Merge Mode</guimenuitem>
-          </menuchoice> restores these WinMerge 1.7.1 single keyboard shortcuts
-        for difference merging and navigating functions:</para>
+          </menuchoice> (or press <keycap>F9</keycap>) restores these WinMerge
+        1.7.1 single keyboard shortcuts for difference merging and navigating
+        functions:</para>
 
         <itemizedlist>
           <listitem>
@@ -800,7 +801,7 @@
         <keycap>Arrow</keycap> key combinations work in merge mode in the same
         way as normal mode.</para>
 
-        <para>Merge mode is indicated in the status bar by the text,
+        <para>Merge mode is indicated in the status bar by the text
         <guilabel>Merge</guilabel>.</para>
       </section>
     </section>
@@ -1077,7 +1078,7 @@
           <listitem>
             <para>EOL style of the file: <guilabel>Win</guilabel> for
             Windows/DOS files (CRLF), <guilabel>Unix</guilabel> (LF),
-            <guilabel>Mac</guilabel> (CR), or Mixed.</para>
+            <guilabel>Mac</guilabel> (CR), or <guilabel>Mixed</guilabel>.</para>
 
             <note>
               <para>When the per-line EOL style is used, the file EOL style is
@@ -1339,11 +1340,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term>Last Difference (<keycombo>
-              <keycap>Alt</keycap>
-
-              <keycap>End</keycap>
-            </keycombo>)<indexterm>
+          <term>Last Difference<indexterm>
               <primary>Last Difference function</primary>
 
               <secondary>with Compare Files</secondary>

diff --git a/Docs/Manual/EN/Compare_images.xml b/Docs/Manual/EN/Compare_images.xml
index 2f2ab3b..9fee1fd 100644 (file)
--- a/Docs/Manual/EN/Compare_images.xml
+++ b/Docs/Manual/EN/Compare_images.xml
@@ -129,6 +129,7 @@
               <listitem><guilabel>Alpha Blend</guilabel></listitem>
               <listitem><guilabel>Alpha Blend Animation</guilabel></listitem>
             </itemizedlist>
+            <para></para>
           </listitem>
         </varlistentry>
 

diff --git a/Docs/Manual/EN/Configuration.xml b/Docs/Manual/EN/Configuration.xml
index 2710c86..37bc0a3 100644 (file)
--- a/Docs/Manual/EN/Configuration.xml
+++ b/Docs/Manual/EN/Configuration.xml
@@ -192,12 +192,12 @@
         <listitem>
           <para><option>Enabled</option> (default): The Select Files or Folders
           dialog checks both paths as you enter them. The
-          <guibutton>OK</guibutton> button remains disabled until both paths are
+          <guibutton>Compare</guibutton> button remains disabled until both paths are
           validated. Note that this checking can cause some delay.</para>
         </listitem>
 
         <listitem>
-          <para><option>Disabled</option>: The <guibutton>OK</guibutton> button
+          <para><option>Disabled</option>: The <guibutton>Compare</guibutton> button
           in the Select Files or Folders dialog is always enabled, and attempts
           to open any paths you specify. Since there is no delay during
           validation, this can speed up the selection of paths. However, if the
@@ -306,13 +306,13 @@
     </section>
 
     <section>
-      <title>Close "Select Files or Folders" Dialog on clicking OK button<indexterm>
+      <title>Close "Select Files or Folders" Dialog on clicking Compare button<indexterm>
           <primary>Select Files or Folders dialog</primary>
         </indexterm></title>
 
       <itemizedlist>
         <listitem>
-          <para><option>Disabled</option> (default): When you click <guibutton>Compare</guibutton> button, the Select File or Folder dialog will remain open instead of closing.</para>
+          <para><option>Disabled</option> (default): When you click <guibutton>Compare</guibutton> button, the Select File or Folders dialog will remain open instead of closing.</para>
         </listitem>
 
         <listitem>
@@ -904,7 +904,7 @@
 
       <itemizedlist>
         <listitem>
-          <para><option>Enabled</option> (default): WinMerge doing a reqursive comparing and also includes subfolders.</para>
+          <para><option>Enabled</option> (default): WinMerge doing a recursive comparing and also includes subfolders.</para>
         </listitem>
 
         <listitem>
@@ -1420,8 +1420,8 @@
     then click <guibutton>OK</guibutton> to load the new color in the
     box.</para>
 
-    <para>At any time, you can click <guibutton>Defaults</guibutton> to reload
-    the installed color scheme.</para>
+    <para>To revert to the default colors of a scheme, choose a different scheme
+    and return to the modified scheme.</para>
   </section>
 
   <section id="Configuration_differencescolors">
@@ -1447,8 +1447,8 @@
     elements that are recognized, and enables you to change their text color and
     weight.</para>
 
-    <para>At any time, you can click <guibutton>Defaults</guibutton> to reload
-    the installed color scheme.</para>
+    <para>To revert to the default colors of a scheme, choose a different scheme
+    and return to the modified scheme.</para>
   </section>
 
   <section id="Configuration_textcolors">
@@ -1491,8 +1491,8 @@
     then click <guibutton>OK</guibutton> to load the new color in the
     box.</para>
 
-    <para>At any time, you can click <guibutton>Defaults</guibutton> to reload
-    the installed color scheme.</para>
+    <para>To revert to the default colors of a scheme, choose a different scheme
+    and return to the modified scheme.</para>
   </section>
 
   <section id="Configuration_archive">

diff --git a/Docs/Manual/EN/Faq.xml b/Docs/Manual/EN/Faq.xml
index f026044..2020741 100644 (file)
--- a/Docs/Manual/EN/Faq.xml
+++ b/Docs/Manual/EN/Faq.xml
@@ -330,11 +330,11 @@
 
           <itemizedlist>
             <listitem>
-              <screen>CALL "<replaceable>&lt;winmerge path&gt;\WinMerge</replaceable>" /e /u %1 %2</screen>
+              <screen>CALL "<replaceable>&lt;winmerge path&gt;\WinMerge</replaceable>" /e /u %1 %2 %3</screen>
             </listitem>
 
             <listitem>
-              <screen>start "WinMerge" "<replaceable>&lt;winmerge path&gt;</replaceable>" /e /u %1 %2</screen>
+              <screen>start "WinMerge" "<replaceable>&lt;winmerge path&gt;</replaceable>" /e /u %1 %2 %3</screen>
             </listitem>
           </itemizedlist>
 

diff --git a/Docs/Manual/EN/Open_paths.xml b/Docs/Manual/EN/Open_paths.xml
index b55b023..3784d5f 100644 (file)
--- a/Docs/Manual/EN/Open_paths.xml
+++ b/Docs/Manual/EN/Open_paths.xml
@@ -455,7 +455,9 @@ to compare one file/folder against several files/folders.</para> </tip> -->
    &lt;paths&gt;
       &lt;left&gt;c:\work\project1&lt;/left&gt;
       &lt;left-readonly&gt;1&lt;/left-readonly&gt;
-      &lt;right&gt;c:\work\project2&lt;/right&gt;
+      &lt;middle&gt;c:\work\project2&lt;/middle&gt;
+      &lt;middle-readonly&gt;1&lt;/middle-readonly&gt;
+      &lt;right&gt;c:\work\project3&lt;/right&gt;
       &lt;right-readonly&gt;0&lt;/right-readonly&gt;
       &lt;filter&gt;Visual C++ loose&lt;/filter&gt;
       &lt;subfolders&gt;0&lt;/subfolders&gt;
@@ -485,6 +487,24 @@ to compare one file/folder against several files/folders.</para> </tip> -->
         </varlistentry>
 
         <varlistentry>
+          <term><sgmltag>middle</sgmltag></term>
+
+          <listitem>
+            <para>Middle path to open</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><sgmltag>middle-readonly</sgmltag></term>
+
+          <listitem>
+            <para>1 = Open read only</para>
+
+            <para>0 = Open normally</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
           <term><sgmltag>right</sgmltag></term>
 
           <listitem>

diff --git a/Docs/Manual/EN/screenshots/ctx_menu_copy2.png b/Docs/Manual/EN/screenshots/ctx_menu_copy2.png
new file mode 100644 (file)
index 0000000..6bb6717
Binary files /dev/null and b/Docs/Manual/EN/screenshots/ctx_menu_copy2.png differ

diff --git a/Docs/Manual/EN/screenshots/mfile.png b/Docs/Manual/EN/screenshots/mfile.png
new file mode 100644 (file)
index 0000000..6b3b916
Binary files /dev/null and b/Docs/Manual/EN/screenshots/mfile.png differ

diff --git a/Docs/Manual/EN/screenshots/mfolder.png b/Docs/Manual/EN/screenshots/mfolder.png
new file mode 100644 (file)
index 0000000..5431732
Binary files /dev/null and b/Docs/Manual/EN/screenshots/mfolder.png differ

diff --git a/Docs/Manual/README.md b/Docs/Manual/README.md
index 0cf8564..be4d5bc 100644 (file)
--- a/Docs/Manual/README.md
+++ b/Docs/Manual/README.md
@@ -54,7 +54,7 @@ Every language has his one batch files. Paths to the installed tools are written
    Creates the English HTML files *without ads* under the folder `\Build\Manual\html-en`.
 
  * `build_html_en.bat withads`  
-   Creates the English HTML files *with adds* under the folder `\Build\Manual\html-en`.
+   Creates the English HTML files *with ads* under the folder `\Build\Manual\html-en`.
 
  * `build_htmlhelp_en.bat`  
    Creates the English CHM file under the folder `Build\Manual\htmlhelp`.

diff --git a/Docs/Manual/build_htmlhelp_en.bat b/Docs/Manual/build_htmlhelp_en.bat
index 3093bfb..c788f58 100644 (file)
--- a/Docs/Manual/build_htmlhelp_en.bat
+++ b/Docs/Manual/build_htmlhelp_en.bat
@@ -41,7 +41,6 @@ del "toc.hhc"
 del "index.hhk"
 rd /S /Q "%docbook_outputdir%\images"
 rd /S /Q "%docbook_outputdir%\screenshots"
-rd /S /Q "%docbook_outputdir%\art"
 rd /S /Q "%docbook_outputdir%\css"
 if not "%docbook_build_path%" == "." rd /S /Q "%docbook_outputdir%"
 echo Finished!

diff --git a/Docs/Manual/build_htmlhelp_jp.bat b/Docs/Manual/build_htmlhelp_jp.bat
index 20939b9..a2ced0b 100644 (file)
--- a/Docs/Manual/build_htmlhelp_jp.bat
+++ b/Docs/Manual/build_htmlhelp_jp.bat
@@ -41,7 +41,6 @@ del "toc.hhc"
 del "index.hhk"
 rd /S /Q "%docbook_outputdir%\images"
 rd /S /Q "%docbook_outputdir%\screenshots"
-rd /S /Q "%docbook_outputdir%\art"
 rd /S /Q "%docbook_outputdir%\css"
 if not "%docbook_build_path%" == "." rd /S /Q "%docbook_outputdir%"
 echo Finished!