WinMerge

Revision: 4884
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4884&view=rev
Author:   kimmov
Date:     2008-01-09 07:42:23 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
PATCH: [ 1867212 ] Manual: clarify file filter's folder name matching

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Manual/Filters.xml

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-09 14:23:42 UTC (rev 4883)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-09 15:42:23 UTC (rev 4884)
@@ -11,6 +11,7 @@
     TortoiseSVN x64 (#1865168)
   Close compare tab with middle mouse button (#1865220)
   Add index.html for documentation folders (#1866183)
+  Manual: Clarify file filters folder name matching (#1867212)
   BugFix: Crash when using TrackPoint middle-button scrolling (#1864040)
   BugFix: WinMerge didn't show the contents of the symbolic link target (#1864978)
   BugFix: Unused registry key HKCU\Thingamahoochie\WinMerge was created 

Modified: trunk/Docs/Users/Manual/Filters.xml
===================================================================
--- trunk/Docs/Users/Manual/Filters.xml	2008-01-09 14:23:42 UTC (rev 4883)
+++ trunk/Docs/Users/Manual/Filters.xml	2008-01-09 15:42:23 UTC (rev 4884)
@@ -104,7 +104,7 @@
       class="extension">.flt</filename>. Files have defined format which is
       explained later in this chapter. Filters-dialog allows creating new
       filter files based on template file. Filter files can be created from
-      the scrach but using template file is the recommended way to create a
+      the scratch but using template file is the recommended way to create a
       new filter. The template file is named
       <filename>FileFilter.tmpl</filename> and can be modified if needed. The
       template file is located in <filename
@@ -137,7 +137,7 @@
       <important>
         <para>With WinMerge 2.6.0 and later filter files are not anymore
         loaded from profile folder like with earlier versions. Using
-        user-defined folder for filter files provices more flexibility and
+        user-defined folder for filter files provides more flexibility and
         easier access to filter files.</para>
       </important>
 
@@ -175,12 +175,11 @@
       <para>Rule begins with "<constant>f:</constant>" if it matches for
       filenames and "<constant>d:</constant>" if it matches for folder names.
       (d comes from "folder".) Filenames are given to filter as is, there are
-      no special characters added. But for folder names there must be
-      "<constant>\\</constant>" in begin of folder name. The resulting "\"
-      char is a part of the folder name. This is done clearly to separate
-      folder names and filenames. "<constant>##</constant>" is a comment
-      separator, all characters in line after that are ignored by
-      WinMerge.</para>
+      no special characters added. Folder names have preceding backslash
+      before them (e.g. "\Folder name"). So if folder names are matched by the
+      beginning of the name, the filter must start with "\\" to match the
+      first backslash. "<constant>##</constant>" is a comment separator, all
+      characters in line after that are ignored by WinMerge.</para>
 
       <para><note>
           <para>File filter rules are case-insensitive. Rule
@@ -199,7 +198,9 @@
 f: ^My ## Match My*.* files
 f: Dlg\. ## Match *Dlg.* files
 d: \\test$ ## Match 'test' folders
-d: ^\\Build$ ## Match 'Build' folders</screen>
+d: ^\\Build$ ## Match 'Build' folders
+d: Temp$ ## Match *Temp folders (e.g. FirstTemp)
+d: Src ## Match *Src* folders</screen>
       </example>
 
       <para>Line begin or -end marker (<constant>"^"</constant> or


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4941
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4941&view=rev
Author:   kimmov
Date:     2008-01-22 06:49:49 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
PATCH: [ 1876770 ] Manual: Add conflict file resolving section

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Manual/Compare_files.xml

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-22 14:31:47 UTC (rev 4940)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-22 14:49:49 UTC (rev 4941)
@@ -5,6 +5,7 @@
 WinMerge 2.7.7.3
   Resolve conflict files (cvs, svn...) (#1875129)
   Save line filter when edit box loses focus (#1875853)
+  Manual: Add instructions for conflict file resolving (#1876770)
   BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
   Bugfix: Clipped text in file saving error message (#1874854)
 

Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_files.xml	2008-01-22 14:31:47 UTC (rev 4940)
+++ trunk/Docs/Users/Manual/Compare_files.xml	2008-01-22 14:49:49 UTC (rev 4941)
@@ -544,4 +544,68 @@
       </listitem>
     </itemizedlist>
   </sect2>
+
+  <sect2>
+    <title><indexterm>
+        <primary>Conflict Files</primary>
+      </indexterm>Resolving Conflict Files</title>
+
+    <para>WinMerge can resolve conflict files several version control systems
+    produce when merging files. Conflict file is basically two different
+    versions of files embedded into one file. WinMerge reads this file and
+    separates it into its original files, and shows those files in file
+    compare. So conflicted file can be resolved using normal WinMerge file
+    compare functionality.</para>
+
+    <sect3>
+      <title>Opening Conflict Files</title>
+
+      <para>Conflict files can be opened into WinMerge using <menuchoice>
+          <guimenu>File</guimenu>
+
+          <guimenuitem>Open Conflict File...</guimenuitem>
+        </menuchoice>. Conflict file to resolve can be selected using file
+      selection dialog that opens. At the moment there are no other ways to
+      open conflict files.</para>
+
+      <warning>
+        <para>WinMerge overwrites original conflict file. If original file is
+        wanted to save, it must be copied to another folder or another
+        filename before opening it into WinMerge.</para>
+      </warning>
+    </sect3>
+
+    <sect3>
+      <title>Conflict Resolving</title>
+
+      <para>WinMerge opens conflict file into normal file compare (see above).
+      All normal WinMerge file compare features are in use. Files in two
+      panels are:</para>
+
+      <simplelist>
+        <member><emphasis>Left panel</emphasis>: this file is called
+        "<emphasis>theirs</emphasis>" file. It is usually the file that is in
+        version control system's repository. This file usually cannot be
+        edited. An as such, WinMerge opens left-side file as read-only.
+        Differences can be moved only from this file to the another
+        file.</member>
+
+        <member><emphasis>Right panel</emphasis>: this file is called
+        "<emphasis>mine</emphasis>" file. It is the user's working file
+        originally. All changes should be done to this file. I.e. this file is
+        at the same time the result file.</member>
+      </simplelist>
+
+      <para>After the wanted resolved file is in right-side panel, it can be
+      saved like normal file. WinMerge saves the file over original
+      file.</para>
+
+      <para>Left side "<emphasis>mine</emphasis>" file is set to modified
+      after opening conflict file. This allows fast resolve by just saving the
+      file when user's file is the wanted end result. This also prevents
+      accidentally not resolving the files. As resolving only happens when
+      file is saved. If file is no saved, original conflict file is kept
+      unmodified.</para>
+    </sect3>
+  </sect2>
 </sect1>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4949
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4949&view=rev
Author:   kimmov
Date:     2008-01-23 07:13:15 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
PATCH: [ 1877735 ] Manual: Document third path in command line

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Manual/Command_line.xml

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-22 23:13:10 UTC (rev 4948)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-23 15:13:15 UTC (rev 4949)
@@ -7,6 +7,7 @@
   Save line filter when edit box loses focus (#1875853)
   Add link to translations website at help menu (#1699883)
   Manual: Add instructions for conflict file resolving (#1876770)
+  Manual: Document third path given to command line (#1877735)
   BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
   Bugfix: Clipped text in file saving error message (#1874854)
 

Modified: trunk/Docs/Users/Manual/Command_line.xml
===================================================================
--- trunk/Docs/Users/Manual/Command_line.xml	2008-01-22 23:13:10 UTC (rev 4948)
+++ trunk/Docs/Users/Manual/Command_line.xml	2008-01-23 15:13:15 UTC (rev 4949)
@@ -187,4 +187,15 @@
   <replaceable>rightpath</replaceable>) point to folders or files. It is not
   possible to compare folder to file (except in case described in above note).
   If WinMerge cannot find any of given paths, it opens Open-dialog.</para>
-</sect1>
+
+  <para>Third path given in command line is rarely needed when WinMerge is
+  started from command line. It is meant to be used with many version control
+  tools which use third path as a "<emphasis>result</emphasis>" file. WinMerge
+  always shows two files in file compare, the third path is a path where any
+  of these files gets saved into, leaving other two paths intact.</para>
+
+  <para>Usually these tools use terms like "<emphasis>theirs</emphasis>",
+  "<emphasis>mine</emphasis>" and "<emphasis>merged</emphasis> "/ "
+  <emphasis>resolved</emphasis>" about these three files. And those paths
+  should be given in that order for WinMerge.</para>
+</sect1>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5458
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5458&view=rev
Author:   kimmov
Date:     2008-06-10 06:32:48 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
PATCH: [ 1988845 ] Manual: Use PNG images for all screenshots
 Submitted by Denis Bradford

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Contributors.txt
    trunk/Docs/Users/Manual/Quick_start.xml
    trunk/Docs/Users/Manual/Version_control.xml

Added Paths:
-----------
    trunk/Docs/Users/Manual/screenshots/OpenDlg1.png
    trunk/Docs/Users/Manual/screenshots/sourcesafe1.png

Removed Paths:
-------------
    trunk/Docs/Users/Manual/screenshots/OpenDlg1.gif
    trunk/Docs/Users/Manual/screenshots/sourcesafe1.gif

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-06-10 10:39:02 UTC (rev 5457)
+++ trunk/Docs/Users/ChangeLog.txt	2008-06-10 13:32:48 UTC (rev 5458)
@@ -3,6 +3,7 @@
 to Subversion revision numbers (rXXXXX).
 
 WinMerge 2.9.1.4
+  Use PNG files in manual (#1988845)
   BugFix: Temp paths in Reports created from archive file (#1984346)
   BugFix: ISL file syntax highlighting starts comment with { (#1981326)
 

Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt	2008-06-10 10:39:02 UTC (rev 5457)
+++ trunk/Docs/Users/Contributors.txt	2008-06-10 13:32:48 UTC (rev 5458)
@@ -122,6 +122,7 @@
 Other Contributors (code, ideas, testing..):
 * Andre Arpin
 * Steve Beaudoin
+* Denis Bradford
 * Adam Carrivick
 * Hern Chen
 * Jeremy Dewey

Modified: trunk/Docs/Users/Manual/Quick_start.xml
===================================================================
--- trunk/Docs/Users/Manual/Quick_start.xml	2008-06-10 10:39:02 UTC (rev 5457)
+++ trunk/Docs/Users/Manual/Quick_start.xml	2008-06-10 13:32:48 UTC (rev 5458)
@@ -17,7 +17,7 @@
 
     <para><mediaobject>
         <imageobject>
-          <imagedata fileref="screenshots/OpenDlg1.gif" format="GIF" />
+          <imagedata fileref="screenshots/OpenDlg1.png" format="PNG" />
         </imageobject>
       </mediaobject></para>
 
@@ -222,4 +222,4 @@
     <guimenu>Edit</guimenu>-menu, clicking toolbar button with two yellow
     arrows or pressing <keycap>F5</keycap> key.</para>
   </sect2>
-</sect1>
\ No newline at end of file
+</sect1>

Modified: trunk/Docs/Users/Manual/Version_control.xml
===================================================================
--- trunk/Docs/Users/Manual/Version_control.xml	2008-06-10 10:39:02 UTC (rev 5457)
+++ trunk/Docs/Users/Manual/Version_control.xml	2008-06-10 13:32:48 UTC (rev 5458)
@@ -21,9 +21,13 @@
 
     <orderedlist>
       <listitem>
-        <para>Enable Visual SourceSafe integration from
-        <menuchoice><guimenu>Edit</guimenu><guimenuitem>Options</guimenuitem>
-        <guilabel>Versioning System</guilabel></menuchoice></para>
+        <para>Enable Visual SourceSafe integration from <menuchoice>
+            <guimenu>Edit</guimenu>
+
+            <guimenuitem>Options</guimenuitem>
+
+            <guilabel>Versioning System</guilabel>
+          </menuchoice></para>
       </listitem>
 
       <listitem>
@@ -43,7 +47,7 @@
 
     <para><inlinemediaobject>
         <imageobject>
-          <imagedata fileref="screenshots/sourcesafe1.gif" format="GIF" />
+          <imagedata fileref="screenshots/sourcesafe1.png" format="PNG" />
         </imageobject>
       </inlinemediaobject></para>
 
@@ -93,4 +97,4 @@
       </listitem>
     </itemizedlist>
   </sect2>
-</sect1>
\ No newline at end of file
+</sect1>

Deleted: trunk/Docs/Users/Manual/screenshots/OpenDlg1.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/OpenDlg1.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/OpenDlg1.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/sourcesafe1.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/sourcesafe1.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/sourcesafe1.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5465
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5465&view=rev
Author:   kimmov
Date:     2008-06-11 05:55:58 -0700 (Wed, 11 Jun 2008)

Log Message:
-----------
PATCH: [ 1989744 ] Use PNG images for all screenshots
 Submitted by denisbradford

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Manual/Compare_dirs.xml

Added Paths:
-----------
    trunk/Docs/Users/Manual/screenshots/aborted.png
    trunk/Docs/Users/Manual/screenshots/binary.png
    trunk/Docs/Users/Manual/screenshots/binarydiff.png
    trunk/Docs/Users/Manual/screenshots/equal.png
    trunk/Docs/Users/Manual/screenshots/error.png
    trunk/Docs/Users/Manual/screenshots/fileskip.png
    trunk/Docs/Users/Manual/screenshots/folderskip.png
    trunk/Docs/Users/Manual/screenshots/folderup.png
    trunk/Docs/Users/Manual/screenshots/folderup_disable.png
    trunk/Docs/Users/Manual/screenshots/lfile.png
    trunk/Docs/Users/Manual/screenshots/lfolder.png
    trunk/Docs/Users/Manual/screenshots/notequal.png
    trunk/Docs/Users/Manual/screenshots/rfile.png
    trunk/Docs/Users/Manual/screenshots/rfolder.png

Removed Paths:
-------------
    trunk/Docs/Users/Manual/screenshots/aborted.gif
    trunk/Docs/Users/Manual/screenshots/binary.gif
    trunk/Docs/Users/Manual/screenshots/binarydiff.gif
    trunk/Docs/Users/Manual/screenshots/equal.gif
    trunk/Docs/Users/Manual/screenshots/error.gif
    trunk/Docs/Users/Manual/screenshots/fileskip.gif
    trunk/Docs/Users/Manual/screenshots/folderskip.gif
    trunk/Docs/Users/Manual/screenshots/folderup.gif
    trunk/Docs/Users/Manual/screenshots/folderup_disable.gif
    trunk/Docs/Users/Manual/screenshots/lfile.gif
    trunk/Docs/Users/Manual/screenshots/lfolder.gif
    trunk/Docs/Users/Manual/screenshots/notequal.gif
    trunk/Docs/Users/Manual/screenshots/rfile.gif
    trunk/Docs/Users/Manual/screenshots/rfolder.gif

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-06-11 04:46:54 UTC (rev 5464)
+++ trunk/Docs/Users/ChangeLog.txt	2008-06-11 12:55:58 UTC (rev 5465)
@@ -3,7 +3,7 @@
 to Subversion revision numbers (rXXXXX).
 
 WinMerge 2.9.1.4
-  Use PNG files in manual (#1988845)
+  Manual: Use PNG files (#1988845, #1989744)
   BugFix: Temp paths in Reports created from archive file (#1984346)
   BugFix: ISL file syntax highlighting starts comment with { (#1981326)
 

Modified: trunk/Docs/Users/Manual/Compare_dirs.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_dirs.xml	2008-06-11 04:46:54 UTC (rev 5464)
+++ trunk/Docs/Users/Manual/Compare_dirs.xml	2008-06-11 12:55:58 UTC (rev 5465)
@@ -65,74 +65,74 @@
     Categories are easy to recognize from these icons:<simplelist>
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/equal.gif" format="GIF" />
+              <imagedata fileref="screenshots/equal.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Identical text files</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/notequal.gif" format="GIF" />
+              <imagedata fileref="screenshots/notequal.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Differing text files</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/binary.gif" format="GIF" />
+              <imagedata fileref="screenshots/binary.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Identical binary files</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/binarydiff.gif" format="GIF" />
+              <imagedata fileref="screenshots/binarydiff.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Differing binary files</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/lfolder.gif" format="GIF" />
+              <imagedata fileref="screenshots/lfolder.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Left-only folders</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/rfolder.gif" format="GIF" />
+              <imagedata fileref="screenshots/rfolder.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Right-only folders</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/lfile.gif" format="GIF" />
+              <imagedata fileref="screenshots/lfile.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Left-only files</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/rfile.gif" format="GIF" />
+              <imagedata fileref="screenshots/rfile.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Right-only files</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/folderskip.gif" format="GIF" />
+              <imagedata fileref="screenshots/folderskip.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Skipped directories (filtered out)</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/fileskip.gif" format="GIF" />
+              <imagedata fileref="screenshots/fileskip.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Skipped files (filtered out)</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/error.gif" format="GIF" />
+              <imagedata fileref="screenshots/error.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Items that couldn't be compared. This usually
         happens when other program has locked the file.</member>
 
         <member><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="screenshots/aborted.gif" format="GIF" />
+              <imagedata fileref="screenshots/aborted.png" format="PNG" />
             </imageobject>
           </inlinemediaobject> Aborted item. WinMerge did not finish comparing
         this item when compare was stopped. Result is unknown.</member>
@@ -352,13 +352,13 @@
     <simplelist type="vert">
       <member><inlinemediaobject>
           <imageobject>
-            <imagedata fileref="screenshots/folderup.gif" format="GIF" />
+            <imagedata fileref="screenshots/folderup.png" format="PNG" />
           </imageobject>
         </inlinemediaobject> Parent folder can be opened.</member>
 
       <member><inlinemediaobject>
           <imageobject>
-            <imagedata fileref="screenshots/folderup_disable.gif" format="GIF" />
+            <imagedata fileref="screenshots/folderup_disable.png" format="PNG" />
           </imageobject>
         </inlinemediaobject> Parent folder cannot be opened.</member>
     </simplelist>

Deleted: trunk/Docs/Users/Manual/screenshots/aborted.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/aborted.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/aborted.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/binary.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/binary.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/binary.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/binarydiff.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/binarydiff.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/binarydiff.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/equal.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/equal.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/equal.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/error.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/error.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/error.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/fileskip.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/fileskip.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/fileskip.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/folderskip.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/folderskip.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/folderskip.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/folderup.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/folderup.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/folderup.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/folderup_disable.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/folderup_disable.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/folderup_disable.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/lfile.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/lfile.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/lfile.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/lfolder.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/lfolder.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/lfolder.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/notequal.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/notequal.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/notequal.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/rfile.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/rfile.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/rfile.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/Docs/Users/Manual/screenshots/rfolder.gif
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/rfolder.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/rfolder.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5472
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5472&view=rev
Author:   kimmov
Date:     2008-06-12 07:19:29 -0700 (Thu, 12 Jun 2008)

Log Message:
-----------
PATCH: [ 1990886 ] WinMerge 2.8.2 release notes

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/ReleaseNotes.html

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-06-12 14:07:57 UTC (rev 5471)
+++ trunk/Docs/Users/ChangeLog.txt	2008-06-12 14:19:29 UTC (rev 5472)
@@ -3,6 +3,7 @@
 to Subversion revision numbers (rXXXXX).
 
 WinMerge 2.9.1.4
+  Update release notes (#1990886)
   Manual: Use PNG files (#1988845, #1989744)
   BugFix: Temp paths in Reports created from archive file (#1984346)
   BugFix: ISL file syntax highlighting starts comment with { (#1981326)

Modified: trunk/Docs/Users/ReleaseNotes.html
===================================================================
--- trunk/Docs/Users/ReleaseNotes.html	2008-06-12 14:07:57 UTC (rev 5471)
+++ trunk/Docs/Users/ReleaseNotes.html	2008-06-12 14:19:29 UTC (rev 5472)
@@ -51,9 +51,10 @@
 </head>
 <body>
 
-<h2>WinMerge 2.8.0 Release Notes</h2>
+<h2>WinMerge 2.8.2 Release Notes</h2>
 <ul>
   <li><a href="#about">About This Release</a></li>
+  <li><a href="#new282">What Is New in 2.8.2?</a></li>
   <li><a href="#new280">What Is New in 2.8.0?</a></li>
   <li><a href="#new28RC">What Is New in 2.8 RC?</a></li>
   <li><a href="#new276">What Is New in 2.7.6?</a></li>
@@ -61,7 +62,7 @@
   <li><a href="#new272">What Is New in 2.7.2?</a></li>
   <li><a href="#issues">Known Issues</a></li>
 </ul>
-<p>April 2008</p>
+<p>June 2008</p>
 
 <h3><a name="about">About This Release</a></h3>
 
@@ -81,7 +82,7 @@
 Please submit bug reports to our <a href=
 "https://sourceforge.net/tracker/?group_id=13216&amp;atid=113216">bug-tracker</a>.
 
-<h3><a name="new280">What Is New in 2.8.0?</a></h3>
+<h3><a name="new282">What Is New in 2.8.2?</a></h3>
 <p>
 For a complete changelog history, see the <code><a href="ChangeLog.txt">ChangeLog.txt</a></code>
 file located in the <code>Docs</code> folder under the WinMerge program folder.
@@ -89,6 +90,26 @@
 
 <h4>Changes</h4>
 <ul>
+  <li>Make 'Yes' the default button in copy confirmation dialog</li>
+  <li>Command line parsing fixes</li>
+  <li>Fix showing differences in the end of the line</li>
+  <li>Manual and documentation updates</li>
+</ul>
+
+<h4>Translations</h4>
+<p>
+Several translations were updated and three new translations were added:
+</p>
+<ul>
+  <li>Greek</li>
+  <li>Romanian</li>
+  <li>Ukrainian</li>
+</ul>
+
+<h3><a name="new280">What Is New in 2.8.0?</a></h3>
+
+<h4>Changes</h4>
+<ul>
   <li>Installer and splash screen graphics updates</li>
   <li>Manual and documentation updates</li>
   <li>Translation updates</li>
@@ -161,8 +182,8 @@
 </p>
 
 <p>
-See WinMerge's development wiki for more information about translations:
-<a href="http://winmerge.org/Wiki/Translations">http://winmerge.org/Wiki/Translations</a>
+See WinMerge web site for more information about translations:
+<a href="http://winmerge.org/translations/">http://winmerge.org/translations/</a>
 
 <p>
 In conclusion: PO files have replaced LANG files in Languages-subfolder.
@@ -231,6 +252,11 @@
 <h3><a name="issues">Known Issues</a></h3>
 <ul>
   <li>
+    <p><strong>7-zip installed from MSI installer may not work with WinMerge.</strong></p>
+    <p><i>Workaround</i>: Use the EXE installer of 7-Zip. See manual
+    <i>4.5. 7-Zip and Archive Support</i> for more information.</p>
+  </li>
+  <li>
     <p><strong>Old IE version can cause crashes when handling archive files.</strong></p>
     <p><i>Workaround</i>: If WinMerge crashes when handling archives, consider
       updating IE to version 6.0 or later.</p>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5494
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5494&view=rev
Author:   kimmov
Date:     2008-06-17 07:27:25 -0700 (Tue, 17 Jun 2008)

Log Message:
-----------
PATCH: [ 1995265 ] Release notes for 2.8.4

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/ReleaseNotes.html

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-06-17 09:59:10 UTC (rev 5493)
+++ trunk/Docs/Users/ChangeLog.txt	2008-06-17 14:27:25 UTC (rev 5494)
@@ -4,7 +4,7 @@
 
 WinMerge 2.9.1.4
   Use PCRE regular expressions in the editor (#1991259)
-  Update release notes (#1990886)
+  Update release notes (#1990886, #1995265)
   Manual: Use PNG files (#1988845, #1989744)
   BugFix: Temp paths in Reports created from archive file (#1984346)
   BugFix: ISL file syntax highlighting starts comment with { (#1981326)

Modified: trunk/Docs/Users/ReleaseNotes.html
===================================================================
--- trunk/Docs/Users/ReleaseNotes.html	2008-06-17 09:59:10 UTC (rev 5493)
+++ trunk/Docs/Users/ReleaseNotes.html	2008-06-17 14:27:25 UTC (rev 5494)
@@ -51,9 +51,10 @@
 </head>
 <body>
 
-<h2>WinMerge 2.8.2 Release Notes</h2>
+<h2>WinMerge 2.8.4 Release Notes</h2>
 <ul>
   <li><a href="#about">About This Release</a></li>
+  <li><a href="#new282">What Is New in 2.8.4?</a></li>
   <li><a href="#new282">What Is New in 2.8.2?</a></li>
   <li><a href="#new280">What Is New in 2.8.0?</a></li>
   <li><a href="#new28RC">What Is New in 2.8 RC?</a></li>
@@ -82,7 +83,7 @@
 Please submit bug reports to our <a href=
 "https://sourceforge.net/tracker/?group_id=13216&amp;atid=113216">bug-tracker</a>.
 
-<h3><a name="new282">What Is New in 2.8.2?</a></h3>
+<h3><a name="new284">What Is New in 2.8.4?</a></h3>
 <p>
 For a complete changelog history, see the <code><a href="ChangeLog.txt">ChangeLog.txt</a></code>
 file located in the <code>Docs</code> folder under the WinMerge program folder.
@@ -90,6 +91,15 @@
 
 <h4>Changes</h4>
 <ul>
+  <li>Fix a crash when one path given from command line</li>
+  <li>Fix a crash when starting second instance with single-instance enabled</li>
+  <li>Brazilian translation update</li>
+</ul>
+
+<h3><a name="new282">What Is New in 2.8.2?</a></h3>
+
+<h4>Changes</h4>
+<ul>
   <li>Make 'Yes' the default button in copy confirmation dialog</li>
   <li>Command line parsing fixes</li>
   <li>Fix showing differences in the end of the line</li>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5509
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5509&view=rev
Author:   kimmov
Date:     2008-06-23 09:07:02 -0700 (Mon, 23 Jun 2008)

Log Message:
-----------
PATCH: [ 1999880 ] Beta 2.9.10 release notes

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/ReleaseNotes.html

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-06-23 14:32:03 UTC (rev 5508)
+++ trunk/Docs/Users/ChangeLog.txt	2008-06-23 16:07:02 UTC (rev 5509)
@@ -5,7 +5,7 @@
 WinMerge 2.9.1.4
   Use PCRE regular expressions in the editor (#1991259)
   Installer: install to all users (#1460517)
-  Update release notes (#1990886, #1995265)
+  Update release notes (#1990886, #1995265, #1999880)
   Manual: Use PNG files (#1988845, #1989744)
   BugFix: Temp paths in Reports created from archive file (#1984346)
   BugFix: ISL file syntax highlighting starts comment with { (#1981326)

Modified: trunk/Docs/Users/ReleaseNotes.html
===================================================================
--- trunk/Docs/Users/ReleaseNotes.html	2008-06-23 14:32:03 UTC (rev 5508)
+++ trunk/Docs/Users/ReleaseNotes.html	2008-06-23 16:07:02 UTC (rev 5509)
@@ -51,16 +51,10 @@
 </head>
 <body>
 
-<h2>WinMerge 2.8.4 Release Notes</h2>
+<h2>WinMerge 2.9.10 Release Notes</h2>
 <ul>
   <li><a href="#about">About This Release</a></li>
-  <li><a href="#new284">What Is New in 2.8.4?</a></li>
-  <li><a href="#new282">What Is New in 2.8.2?</a></li>
-  <li><a href="#new280">What Is New in 2.8.0?</a></li>
-  <li><a href="#new28RC">What Is New in 2.8 RC?</a></li>
-  <li><a href="#new276">What Is New in 2.7.6?</a></li>
-  <li><a href="#new274">What Is New in 2.7.4?</a></li>
-  <li><a href="#new272">What Is New in 2.7.2?</a></li>
+  <li><a href="#new2910">What Is New in 2.9.10?</a></li>
   <li><a href="#issues">Known Issues</a></li>
 </ul>
 <p>June 2008</p>
@@ -68,197 +62,53 @@
 <h3><a name="about">About This Release</a></h3>
 
 <p>
-This is a new WinMerge stable release which is recommended and replaces earlier
-2.6.x versions.
+This is a WinMerge beta release which is meant for preview the current state of
+WinMerge development. This release is not recommended for the production.
 </p>
 
 <p>
-Compared to the 2.6.x releases, there are many improvements beneficial to the
-usage of WinMerge. Some areas of improvement include: Improved UTF-8 file
-detection and opening of binary files. Another significant improvement is the
-new localization system.  This simplifies the translation process of WinMerge.
-</p>
-
-<p>
 Please submit bug reports to our <a href=
 "https://sourceforge.net/tracker/?group_id=13216&amp;atid=113216">bug-tracker</a>.
 
-<h3><a name="new284">What Is New in 2.8.4?</a></h3>
+<h3><a name="new2910">What Is New in 2.9.10?</a></h3>
 <p>
 For a complete changelog history, see the <code><a href="ChangeLog.txt">ChangeLog.txt</a></code>
 file located in the <code>Docs</code> folder under the WinMerge program folder.
 </p>
 
-<h4>Changes</h4>
-<ul>
-  <li>Fix a crash when one path given from command line</li>
-  <li>Fix a crash when starting second instance with single-instance enabled</li>
-  <li>Brazilian translation update</li>
-</ul>
-
-<h3><a name="new282">What Is New in 2.8.2?</a></h3>
-
-<h4>Changes</h4>
-<ul>
-  <li>Make 'Yes' the default button in copy confirmation dialog</li>
-  <li>Command line parsing fixes</li>
-  <li>Fix showing differences in the end of the line</li>
-  <li>Manual and documentation updates</li>
-</ul>
-
-<h4>Translations</h4>
 <p>
-Several translations were updated and three new translations were added:
+WinMerge 2.9.x will not have many new features. Instead many existing features
+will be improved and optimized. And some long-standing problems will be fixed.
 </p>
-<ul>
-  <li>Greek</li>
-  <li>Romanian</li>
-  <li>Ukrainian</li>
-</ul>
 
-<h3><a name="new280">What Is New in 2.8.0?</a></h3>
-
-<h4>Changes</h4>
-<ul>
-  <li>Installer and splash screen graphics updates</li>
-  <li>Manual and documentation updates</li>
-  <li>Translation updates</li>
-</ul>
-
-<h3><a name="new28RC">What Is New in 2.8 RC?</a></h3>
-
-<h4>Detect UTF-8 Files Without BOM Bytes</h4>
+<h4>Regular expressions</h4>
 <p>
-Until now, WinMerge could not detect UTF-8 files without a BOM (Byte-order) marker. 
-Opening such files with WinMerge caused segments of the file(s) to render improperly 
-on the screen. UTF-8 files without BOM bytes are now properly detected and displayed.
+Regular expression library (PCRE, <a href="http://www.pcre.org/">http://www.pcre.org/</a>)
+is updated to the latest version (7.7). That will fix some problems present in
+older version used in WinMerge 2.8.x. PCRE is now used also in WinMerge's
+editor component. So Find- and Replace- features have now a lot improved regular
+expression support.
 </p>
 
-<h4>Open Binary Files</h4>
+<h4>Installing for all users</h4>
 <p>
-WinMerge could not display files it detected as binary in previous versions. 
-WinMerge did however compare the files and returned the results as either 
-"binary files are identical" or "binary files are different." Starting with this 
-release, WinMerge now shows <b>all</b> files in the file compare, including binary files. 
-Bytes that have no visual representation (character) are displayed with its byte value.
+Installer will now install WinMerge to all users. Previously the installer
+always installed just for the current user which causes problems in many
+environments. Now the Shell Integration is correctly enabled for all users
+after installing.
 </p>
 
-<p>
-<b>NOTE:</b> WinMerge is not a binary file editor. Do not damage your binary
-files!
-</p>
-
-<h4>Resolve Conflict Files</h4>
-<p>
-The oldest <i>open</i> feature request has finally been implented! WinMerge can now open 
-"conflict files" that several version control systems (CVS, Subversion, etc.) output. 
-A conflict file is seperated into two files?"theirs" and "mine." These files are then 
-displayed for typical file compare and merging.
-</p>
-
-<h4>Other Changes</h4>
+<h4>Changes</h4>
 <ul>
-  <li>Syntax highlighting for PowerShell and PO(T) files.</li>
-  <li>Zooming in file compare.</li>
-  <li>Create a <i>pair folder</i> for a <i>unique folder</i> so browsing into that folder 
-    is possible.</li>
-  <li>Option to select a folder for temporary files.</li>
-  <li>Show the file's encoding type in the file compare status bar.</li>
-  <li>Option to preserve a file's modification date in file compare.</li>
+  <li>Fix location pane flickering, optimize location pane</li>
+  <li>Open conflict files by drag&dropping file to main window</li>
 </ul>
 
-<h4>Important Bugs Fixed</h4>
+<h4>Translation updates</h4>
 <ul>
-  <li>Right mouse button did not move the cursor to the new position in file compare</li>
-  <li>Merge/Delete would delete files from folders marked as read-only.</li>
-  <li>Potential lockup in folder compare.</li>
-  <li>Line filter did not filter non-ascii lines correctly.</li>
-  <li>Did not switch back to content compare once switched to quick compare in
-    folder compare.</li>
-  <li>Quick compare did not ignore EOL differences.</li>
+  <li>New Slovenian translation</li>
 </ul>
 
-
-<h3><a name="new276">What Is New in 2.7.6?</a></h3>
-
-<h4>New Localization System</h4>
-<p>
-The most significant change in this release is the new localization system. This new 
-system is based on the widely used PO files.  PO files are text files that have both 
-the original (English) text and the translated text together.  Since PO files are text 
-files, they are simple and intuitive to edit. WinMerge no longer uses DLL resources for 
-translations and therefore, no compiling will ever be required. One can now edit the PO 
-files on-the-fly, re-start WinMerge, and the changes will be reflected immediately.
-</p>
-
-<p>
-See WinMerge web site for more information about translations:
-<a href="http://winmerge.org/translations/">http://winmerge.org/translations/</a>
-
-<p>
-In conclusion: PO files have replaced LANG files in Languages-subfolder.
-</p>
-
-<h4>Translations</h4>
-<p>
-Several translations were again updated. We expect things to improve with
-translation statuses, as the new system is so much easier to use.
-</p>
-
-<p>
-New Croatian and Portuguese translations were added.
-</p>
-
-<h4>Other Changes</h4>
-<ul>
-  <li>HTML reports from file compare</li>
-  <li>Improved printing</li>
-  <li>New dialog for selecting folder compare columns</li>
-  <li>New icon for Shell Integration</li>
-</ul>
-
-<h4>Important Bugs Fixed</h4>
-<ul>
-  <li>Rename in folder compare misbehaved when renaming an item that only existed on 
-    one side.</li>
-  <li>"Do not merge" ignored differences when multiple differences are selected</li>
-  <li>VCS system integration tried to check out the wrong file, this caused a variety 
-    of side-effects.</li>
-  <li>Backup file was created from the wrong file in folder compare operations</li>
-</ul>
-
-<h3><a name="new274">What Is New in 2.7.4?</a></h3>
-<ul>
-  <li>New confirmation dialog for copying items in folder compare.</li>
-  <li>Improved line filter -dialog.</li>
-  <li>Printing improvements.</li>
-  <li>Allow user to select syntax highlighting to use for a file.</li>
-  <li>Tabbed multi-window interface.</li>
-  <li>Alternative big toolba.r</li>
-  <li>Recent project files in File-menu.</li>
-</ul>
-
-<h4>Important Bugs Fixed</h4>
-<ul>
-  <li>Crash when comparing empty folders.</li>
-  <li>Pressing ESC-key when renaming a file caused a crash.</li>
-</ul>
-
-<h3><a name="new272">What Is New in 2.7.2?</a></h3>
-<ul>
-  <li>New XML (expat+scew) and regular expression (PCRE) libraries used.</li>
-  <li>Try to match files inside differences.</li>
-  <li>Optimized folder compare.</li>
-  <li>New options for creating backup files.</li>
-</ul>
-
-<h4>Important Bugs Fixed</h4>
-<ul>
-  <li>Crash occures when file modification time was missing.</li>
-  <li>Dialogs could be hidden behind other windows.</li>
-  <li>Many word-wrap related fixes.</li>
-</ul>
-
 <h3><a name="issues">Known Issues</a></h3>
 <ul>
   <li>
@@ -307,3 +157,5 @@
 </ul>
 </body>
 </html>
+
+ 	  	 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5523
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5523&view=rev
Author:   kimmov
Date:     2008-06-25 06:26:26 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
PATCH: [ 2000322 ] Copy edit of first four Help topics for review
 Submitted by Denis Bradford

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Manual/About_Doc.xml
    trunk/Docs/Users/Manual/Install.xml
    trunk/Docs/Users/Manual/Introduction.xml
    trunk/Docs/Users/Manual/Quick_start.xml
    trunk/Docs/Users/Manual/screenshots/foldercomp1.png

Added Paths:
-----------
    trunk/Docs/Users/Manual/screenshots/nav_uparrow_btn.png
    trunk/Docs/Users/Manual/screenshots/open_icon.png
    trunk/Docs/Users/Manual/screenshots/refresh_btn.png
    trunk/Docs/Users/Manual/screenshots/wm_icon.png

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-06-24 21:44:47 UTC (rev 5522)
+++ trunk/Docs/Users/ChangeLog.txt	2008-06-25 13:26:26 UTC (rev 5523)
@@ -3,6 +3,9 @@
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
+WinMerge 2.9.1.5
+  Manual: Copy editing (#2000322)
+
 WinMerge 2.9.1.4 - 2008-06-24 (r5518)
   Use PCRE regular expressions in the editor (#1991259)
   Installer: install to all users (#1460517)

Modified: trunk/Docs/Users/Manual/About_Doc.xml
===================================================================
--- trunk/Docs/Users/Manual/About_Doc.xml	2008-06-24 21:44:47 UTC (rev 5522)
+++ trunk/Docs/Users/Manual/About_Doc.xml	2008-06-25 13:26:26 UTC (rev 5523)
@@ -1,75 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sect1 id="AboutDoc">
-  <title>About This Document</title>
+  <title>About this document</title>
 
-  <para>This is a manual for WinMerge 2.8.</para>
+  <para>This document is the user manual for WinMerge 2.8. It explains the capabilities and limitations of WinMerge. This manual is recommended reading for both new and experienced users.</para>
 
-  <para>This manual is recommended reading for experienced and new users of
-  WinMerge 2.8. Reading this manual will help ensure the user knows about the
-  various functions available in WinMerge, and various limitations.</para>
+  <para>To learn essential WinMerge basics, please read the following topics:</para>
 
-  <para>Please read at least the following chapters:</para>
+  <variablelist>
+    <varlistentry>
+      <term><link linkend="QuickStart">Quick start</link></term>
 
-  <itemizedlist>
-    <listitem>
-      <simpara>The <link linkend="QuickStart">Quick start</link> chapter will
-      get you quickly started with WinMerge. After reading this chapter you
-      will know the basic usage of WinMerge.</simpara>
-    </listitem>
+      <listitem>
+        <para>Gets you quickly started with WinMerge and shows its basic usage.</para>
+      </listitem>
+    </varlistentry>
 
-    <listitem>
-      <simpara>The <link linkend="CompareDirs">Comparing Folders</link>
-      chapter explains folder comparison, ways to change the results display,
-      and operations available in the folder comparison window.</simpara>
-    </listitem>
+    <varlistentry>
+      <term><link linkend="CompareDirs">Comparing folders</link></term>
 
-    <listitem>
-      <simpara>The <link linkend="CompareFiles">Comparing Files</link> chapter
-      explains the file comparison/merge window, its various panes, and
-      methods of navigation, modes, and operations available in this
-      window.</simpara>
-    </listitem>
+      <listitem>
+        <para>Explains the folder comparison window, available operations, and customizing the results display.</para>
+      </listitem>
+    </varlistentry>
 
-    <listitem>
-      <simpara>The <link linkend="Configuration">Options and
-      Configuration</link> chapter helps to customize WinMerge to your needs,
-      including things such as whitespace handling, colors, and handling text
-      encoding.</simpara>
-    </listitem>
-  </itemizedlist>
+    <varlistentry>
+      <term><link linkend="CompareFiles">Comparing files</link></term>
 
-  <para>The following chapters are suggested reading for more efficient use of
-  WinMerge:</para>
+      <listitem>
+        <para>Explains the file comparison/merge window, available operations, methods of navigation, and modes.</para>
+      </listitem>
+    </varlistentry>
 
-  <itemizedlist>
-    <listitem>
-      <simpara>The <link linkend="OpenPaths">Opening Files and Folders</link>
-      chapter introduces several ways (there are many!) to open files and
-      folders to WinMerge. For example, do you know how to use the Shell
-      Extension context menu in advanced mode?</simpara>
-    </listitem>
+    <varlistentry>
+      <term><link linkend="Configuration">Options and configuration</link></term>
 
-    <listitem>
-      <simpara>The <link linkend="Plugins">Plugins</link> chapter introduces
-      plugins.</simpara>
-    </listitem>
+      <listitem>
+        <para>Explains how to customize WinMerge, including handling whitespace, colours, and text encoding.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 
-    <listitem>
-      <simpara>The <link linkend="Filters">Filters</link> chapter explains the
-      use of both file filters and line filters.</simpara>
-    </listitem>
+  <para>To learn to use WinMerge more efficiently, read these topics:</para>
 
-    <listitem>
-      <simpara>The <link linkend="CommandLine">Commandline</link> chapter
-      lists commandline parameters for WinMerge (for using with other tools,
-      or from a script).</simpara>
-    </listitem>
+  <variablelist>
+    <varlistentry>
+      <term><link linkend="OpenPaths">Opening files and folders</link></term>
 
-    <listitem>
-      <simpara>The <link linkend="Faq">FAQ chapter</link> contains answers to
-      many common questions asked of developers. Please check first if your
-      question is answered there before submitting questions to <ulink
-      url="http://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>.</simpara>
-    </listitem>
-  </itemizedlist>
-</sect1>
\ No newline at end of file
+      <listitem>
+        <para>Introduces several ways to open files and folders in WinMerge - there are many! For example, do you know how to use the Shell Extension context menu in advanced mode?</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><link linkend="Plugins">Plugins</link></term>
+
+      <listitem>
+        <para>Describes the optional, extra features that you can add to WinMerge using its plugin mechanism.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><link linkend="Filters">Filters</link></term>
+
+      <listitem>
+        <para>Explains how to control what is compared in the folder or file comparison window.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><link linkend="CommandLine">Commandline</link></term>
+
+      <listitem>
+        <para>Lists command-line parameters for using WinMerge with other tools or from a script.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><link linkend="Faq">FAQ</link></term>
+
+      <listitem>
+        <para>Contains answers to many common questions asked of developers.</para>
+
+        <para>Before submitting questions to <ulink url="http://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>, please check the FAQ first to see if your question is answered there.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</sect1>

Modified: trunk/Docs/Users/Manual/Install.xml
===================================================================
--- trunk/Docs/Users/Manual/Install.xml	2008-06-24 21:44:47 UTC (rev 5522)
+++ trunk/Docs/Users/Manual/Install.xml	2008-06-25 13:26:26 UTC (rev 5523)
@@ -1,343 +1,292 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sect1 id="Installing">
-  <title>Getting and Installing WinMerge</title>
+  <title>Getting and installing WinMerge</title>
 
-  <para>WinMerge can be installed using installer or by unzipping files from
-  archive. Using the installer is the recommended method.</para>
+  <para>WinMerge can be installed using the installer or by unzipping files from an archive. Using the installer is the recommended method.</para>
 
   <note>
-    <para>Currently WinMerge installer works natively only for 32-bit Windows.
-    There is no separate version of WinMerge for 64-bit Windows
-    (WinXP/2003/Vista). 64-bit Windows versions can run the installer and
-    WinMerge as 32-bit application. For the Shell Integration there is the
-    64-bit version of extension included in the installer.</para>
+    <para>Currently the WinMerge installer works natively only for 32-bit Windows. There is no separate version of WinMerge for 64-bit Windows (WinXP/2003/Vista). 64-bit Windows versions can run the installer and WinMerge as 32-bit applications. For the shell Integration, the installer includes the 64-bit version of the extension.</para>
   </note>
 
   <sect2>
-    <title>Getting Files</title>
+    <title>Getting files</title>
 
-    <para>Latest releases can be always downloaded from WinMerge homepage:
-    <ulink url="http://winmerge.org/">WinMerge.org</ulink>. Note that
-    there may be some delay updating homepages for the latest releases, but
-    project statuspage at <ulink
-    url="https://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>
-    shows the latest files. There is also a mailing-list for release
-    announcements. Stable releases are also available in several file download
-    sites.</para>
+    <para>The latest release can be always downloaded from the WinMerge home page: <ulink url="http://winmerge.org/">WinMerge.org</ulink>. Note that delays can occur in updating home pages for the latest releases, but the project status page at <ulink url="https://sourceforge.net/projects/winmerge/">SourceForge.net</ulink> shows the latest files. There is also a mailing list for release announcements. Stable releases are also available in several file download sites.</para>
   </sect2>
 
   <sect2>
-    <title>Using the Installer (recommended)</title>
+    <title>Using the installer (recommended)</title>
 
     <note>
-      <para>Installer requires Admin-user privileges in Windows NT4/2000/XP.
-      If you don't have Admin-user privileges you can install WinMerge by
-      unzipping from an archive file (see <link
-      linkend="InstallFromArchive">Installing from an Archive</link>).</para>
+      <para>The installer requires Administrator user privileges in Windows NT4/2000/XP. If you don't have admin user privileges, you can install WinMerge by unzipping from an archive file (see <link linkend="InstallFromArchive">Installing from an archive</link>).</para>
     </note>
 
-    <para>This is recommended for most users. Installer asks location where
-    WinMerge is installed, installs files, configures shell integration and
-    adds WinMerge to <guimenu>Start</guimenu>-menu. To install
-    WinMerge:</para>
+    <para>Using the installer is recommended for most users. The installer prompts for the location where WinMerge is installed. It then installs the files, configures the shell integration, and adds WinMerge to the Start menu. To install WinMerge:</para>
 
     <orderedlist>
       <listitem>
-        <simpara>Start installer executable (usually named
-        <filename>WinMerge-<replaceable>version</replaceable>-setup.exe</filename>)</simpara>
+        <simpara>Start the installer executable (usually named <filename>WinMerge-<replaceable>version</replaceable>-setup.exe</filename>).</simpara>
       </listitem>
 
       <listitem>
-        <simpara>Select <guibutton>Next</guibutton>-button in welcome
-        screen</simpara>
+        <simpara>Click <guibutton>Next</guibutton> in the Welcome screen.</simpara>
       </listitem>
 
       <listitem>
-        <simpara>Select <guibutton>Next</guibutton>-button in licence
-        screen</simpara>
+        <simpara>Click <guibutton>Next</guibutton> in the License Agreement screen.</simpara>
       </listitem>
 
       <listitem>
-        <simpara>Select location for WinMerge and select
-        <guibutton>Next</guibutton>-button. It is recommended to install
-        WinMerge in own folder.</simpara>
+        <simpara>In the Select Destination Location page, accept the location for WinMerge or, if you choose another location, we recommend that you install WinMerge in its own folder. Click <guibutton>Next</guibutton>. </simpara>
       </listitem>
 
       <listitem>
-        <simpara>Select components installed or one of pre-configured
-        combinations. <guilabel>Typical</guilabel> configuration is
-        recommended for most users. In addition to components already selected
-        by <guilabel>Typical</guilabel>, language file(s) could be chosen.
-        Components are:</simpara>
+        <simpara>In the Select Components page, choose one of the preconfigured installations in the top control. We recommend the <guilabel>Typical</guilabel> configuration for most users. The lower box shows all the available components. You can modify a preconfigured installation by checking or unchecking components. For example, you might choose additional language files. Components are:</simpara>
 
-        <itemizedlist>
-          <listitem>
-            <simpara><guilabel>WinMerge core files</guilabel> - cannot be
-            unselected - WinMerge executable, user's guide and other needed
-            files</simpara>
-          </listitem>
+        <variablelist>
+          <varlistentry>
+            <term>WinMerge core files</term>
 
-          <listitem>
-            <simpara><guilabel>Filters</guilabel> - file filter
-            files</simpara>
-          </listitem>
+            <listitem>
+              <para>WinMerge executable, Help, and other needed files. Cannot be unchecked.</para>
+            </listitem>
+          </varlistentry>
 
+          <varlistentry>
+            <term>Filters</term>
+
+            <listitem>
+              <para>File filter files</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>Plugins</term>
+
+            <listitem>
+              <para>Plugins and scripts</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>Languages</term>
+
+            <listitem>
+              <para>WinMerge translation files. After installing translation file user interface language can be selected from menu <menuchoice>
+                  <guimenu>View</guimenu>
+
+                  <guimenuitem>Language</guimenuitem>
+                </menuchoice>.</para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+
+        <para>Click <guibutton>Next</guibutton>.</para>
+      </listitem>
+
+      <listitem>
+        <simpara>In the Select Start Menu Folder page, configure WinMerge shortcuts.</simpara>
+
+        <itemizedlist>
           <listitem>
-            <simpara><guilabel>Plugins</guilabel> - plugins and
-            scripts</simpara>
+            <para>Accept the default setting to create a program shortcut, or specify a different folder.</para>
           </listitem>
 
           <listitem>
-            <simpara><guilabel>Languages</guilabel> - WinMerge translation
-            files. After installing translation file user interface language
-            can be selected from menu <menuchoice>
-                <guimenu>View</guimenu>
-
-                <guimenuitem>Language</guimenuitem>
-              </menuchoice>.</simpara>
+            <para>Optionally, check the option, <guilabel>Don't create a Start Menu folder</guilabel>.</para>
           </listitem>
         </itemizedlist>
-      </listitem>
 
-      <listitem>
-        <simpara>Select <guimenu>Start</guimenu>-menu folder or disable
-        creating it.</simpara>
+        <para>Click <guibutton>Next</guibutton>.</para>
       </listitem>
 
       <listitem>
-        <para>Select additional tasks:<itemizedlist>
+        <para>In the Select Additional Tasks page, specify any additional tasks:</para>
+
+        <variablelist>
+          <varlistentry>
+            <term>Enable Explorer context menu integration</term>
+
             <listitem>
-              <simpara><guilabel>Enable Explorer context menu
-              integration</guilabel> - Enables basic WinMerge shell
-              integration (can be later enabled from options).</simpara>
+              <para>Enables basic WinMerge shell integration (can be enabled later in WinMerge options).</para>
             </listitem>
+          </varlistentry>
 
+          <varlistentry>
+            <term>Integrate with TortoiseCVS</term>
+
             <listitem>
-              <simpara><guilabel>Integrate with TortoiseCVS</guilabel> - sets
-              WinMerge to TortoiseCVS diff application.</simpara>
+              <para>Sets WinMerge to be the TortoiseCVS diff application.</para>
             </listitem>
+          </varlistentry>
 
+          <varlistentry>
+            <term>Integrate with TortoiseSVN</term>
+
             <listitem>
-              <simpara><guilabel>Integrate with TortoiseSVN</guilabel> - sets
-              WinMerge to TortoiseSVN diff application.</simpara>
+              <para>Sets WinMerge to be the TortoiseSVN diff application</para>
             </listitem>
+          </varlistentry>
 
+          <varlistentry>
+            <term>Integrate with ClearCase</term>
+
             <listitem>
-              <simpara><guilabel>Integrate with ClearCase</guilabel> - sets
-              WinMerge to ClearCase diff and merge application.</simpara>
+              <para>Sets WinMerge to be the ClearCase diff and merge application</para>
             </listitem>
+          </varlistentry>
 
+          <varlistentry>
+            <term>Create a Desktop shortcut</term>
+
             <listitem>
-              <simpara><guilabel>Create a Desktop Icon</guilabel> - adds
-              WinMerge icon to Desktop.</simpara>
+              <para>Adds the WinMerge shortcut to your Desktop.</para>
             </listitem>
+          </varlistentry>
 
+          <varlistentry>
+            <term>Create a Quick Launch shortcut</term>
+
             <listitem>
-              <simpara><guilabel>Create a Quick Launch Icon</guilabel> - adds
-              WinMerge icon to Quick Launch bar.</simpara>
+              <para>Adds the WinMerge shortcut to Quick Launch bar.</para>
             </listitem>
-          </itemizedlist></para>
+          </varlistentry>
+        </variablelist>
+
+        <para>Click <guibutton>Next</guibutton>.</para>
       </listitem>
 
       <listitem>
-        <simpara>Verify install selections and select
-        <guibutton>Install</guibutton> button to continue.</simpara>
+        <simpara>In the Ready to Install page, verify your install selections. If necessary, click <guibutton>Back</guibutton> to change anything in a previous page. When you are sure that you are ready to proceed, click <guibutton>Install</guibutton>.</simpara>
       </listitem>
 
       <listitem>
-        <simpara>After installer has copied files final screen appears with
-        two checkboxes asking if created WinMerge Start-menu folder should be
-        opened and if WinMerge application should be started.</simpara>
+        <simpara>After the installer has copied files, the final screen appears. Using the two check boxes, confirm whether the created WinMerge Start menu folder should be opened, and whether the WinMerge application should be started.</simpara>
       </listitem>
     </orderedlist>
   </sect2>
 
   <sect2>
-    <title id="InstallFromArchive">Installing from an Archive</title>
+    <title id="InstallFromArchive">Installing from an archive</title>
 
-    <para>WinMerge is pretty much independent from other system components. It
-    doesn't integrate tightly to Windows or use lots of DLLs.
-    <filename>WinMerge[U].exe</filename> itself is dependent of
-    <filename>MFC71[U].dll</filename> , <filename>MSVCR71.dll and
-    MSVCP71.dll</filename> in addition to some system DLLs. So if mentioned
-    DLLs already are installed to system, only
-    <filename>WinMerge[U].exe</filename> is needed to run WinMerge. Mentioned
-    DLL files are available also as Runtimes-package to download.</para>
+    <para>WinMerge is pretty much independent of other system components. It is not tightly integrated with Windows, and does not use many DLLs. </para>
 
+    <para><filename>WinMerge[U].exe</filename> itself depends on <filename>MFC71[U].dll</filename> , <filename>MSVCR71.dll and MSVCP71.dll</filename>, in addition to some system DLLs. So if these DLLs are already installed on a system, only <filename>WinMerge[U].exe</filename> is needed to run WinMerge. The DLL files listed above are also available as a downloadable runtime package.</para>
+
     <note>
-      <para>WinMerge 2.6.0 and later versions require a new version of runtime
-      libraries. When updating from older WinMerge versions using archive
-      files, new runtime files form Runtime-package are needed.</para>
+      <para>WinMerge 2.6.0 and later versions require a new version of runtime libraries. When you update from older WinMerge versions using archive files, you need the new runtime files from the runtime package.</para>
     </note>
 
-    <para>Archive files have correct folder structure. WinMerge should be
-    unzipped preserving folder structure to destination folder, for example
-    <filename class="directory">C:\Program Files\</filename>. Root folder
-    created has name <filename
-    class="directory">/WinMerge-<replaceable>version</replaceable></filename>,
-    for example <filename class="directory">/WinMerge-2.6.0</filename>. This
-    folder can be renamed or files copied to other folder (preserving the
-    folder structure!).</para>
+    <para>Archive files have the correct folder structure. WinMerge should be unzipped preserving this folder structure in the destination folder. For example, the root folder created under <filename class="directory">C:\Program Files\</filename> has the name, <filename class="directory">WinMerge-<replaceable>version</replaceable></filename> (for example, <filename class="directory">WinMerge-2.6.0</filename>). You can rename this folder or copy its files to another folder (preserving the folder structure!).</para>
 
-    <para>After unzipping files WinMerge is ready to run! Shell Integration
-    and Archive Integration may need additional steps (see below).</para>
+    <para>After the files are unzipped, WinMerge is ready to run! Shell integration and archive integration may need additional steps, as described in the next section.</para>
   </sect2>
 
   <sect2>
-    <title>Shell Integration</title>
+    <title>Shell integration</title>
 
-    <para>Choose "<guilabel>Enable Explorer context menu
-    integration</guilabel>" from installer's additional features to install
-    Shell Integration.</para>
+    <para>The installer enables shell integration when you choose the <guilabel>Enable Explorer context menu integration</guilabel> option in the Select Additional Tasks page. If you do not use the install program: you must register the shell integration DLL (<filename>ShellExtension*.dll</filename>) separately. </para>
 
-    <para>If install program is not used, Shell Integration DLL
-    (<filename>ShellExtension*.dll</filename>) must be registered separately.
-    This is done by running <filename>register.bat</filename> from WinMerge
-    directory. Restarting the computer is recommended after installing Shell
-    Integration so that Windows updates all its references.</para>
-
     <note>
-      <para>Installing shell Integration requires administrative user
-      privileges.</para>
+      <para>Installing shell integration requires Administrator user privileges.</para>
     </note>
 
-    <para>Updating the Shell Integration outside the installer requires first
-    uninstalling current Shell Integration version. Uninstalling can be done
-    by running <filename>unregister.bat</filename> from WinMerge directory.
-    After that the computer should be restarted so Windows completes
-    uninstallation. Then the new version can be installed like described
-    above.</para>
+    <para>First, uninstall the current shell integration version by running <filename>unregister.bat</filename> from the WinMerge directory. Then restart the computer so that Windows completes the uninstall. </para>
 
+    <para>To register the shell integration DLL (<filename>ShellExtension*.dll</filename>), run <filename>register.bat</filename> from the WinMerge directory. We recommend that you restart the computer after installing shell integration, so that Windows updates all its references.</para>
+
     <sect3>
-      <title>64-Bit Shell Integration</title>
+      <title>64-bit shell integration</title>
 
-      <para>WinMerge version 2.6 includes a partial support for 64-bit Windows
-      versions by including 64-bit Shell Integration. WinMerge installer
-      recognizes 64-bit versions of Windows and can install correct version of
-      Shell Integration.</para>
+      <para>WinMerge version 2.6 includes partial support for 64-bit Windows versions by including 64-bit shell integration. The WinMerge installer recognizes 64-bit versions of Windows and can install the correct shell integration version.</para>
 
-      <para>When installing Shell Integration by hand from an archive file,
-      Shell Integration DLL is named as
-      <filename>ShellExtensionX64.dll</filename>. Registering/unregistering
-      can be done with <filename>register.bat</filename> and
-      <filename>unregister.bat</filename> like with 32-bit versions.</para>
+      <para>When you install shell integration manually from an archive file, the shell integration DLL is named <filename>ShellExtensionX64.dll</filename>. You can register and unregister this file by using <filename>register.bat</filename> and <filename>unregister.bat</filename>, as with 32-bit versions.</para>
     </sect3>
   </sect2>
 
   <sect2>
     <title><indexterm>
-        <primary>Installing Archive Support</primary>
-      </indexterm>7-Zip and Archive Support</title>
+        <primary>installing archive support</primary>
+      </indexterm>7-Zip and archive support</title>
 
-    <para>WinMerge uses <ulink url="http://www.7-zip.org/">7-Zip</ulink> for
-    archive support, but WinMerge installer does not install 7-Zip or archive
-    support. Installing 7-Zip application is recommended but not required for
-    archive support. 7-Zip installer can be downloaded from <ulink
-    url="http://www.7-zip.org/">7-Zip.org</ulink>.</para>
+    <para>WinMerge uses <ulink url="http://www.7-zip.org/">7-Zip</ulink> for archive support, but the WinMerge installer does not install 7-Zip or archive support. Installing the 7-Zip application is recommended but not required for archive support. The 7-Zip installer is available for downloading from <ulink url="http://www.7-zip.org/">7-Zip.org</ulink>.</para>
 
     <important>
-      <para>There are 7-Zip MSI installers that do not install all the files
-      WinMerge needs (namely <filename>7zip_pad.xml</filename> in 7-Zip
-      program folder). If there are problems with archive support enabling,
-      try running the EXE version of the 7-Zip installer.</para>
+      <para>There are 7-Zip MSI installers that do not install all the files WinMerge needs (specifically, <filename>7zip_pad.xml</filename> in the 7-Zip program folder). If there are problems with archive support enabling, try running the EXE version of the 7-Zip installer.</para>
     </important>
 
-    <para>To install archive support, download and install 7-Zip plugin
-    (Merge7zInstaller, see below) from <ulink
-    url="http://winmerge.org/">WinMerge.org</ulink>.</para>
+    <para>To install archive support, download and install the7-Zip plugin from <ulink url="http://winmerge.org/">WinMerge.org</ulink>, as described in the <link linkend="Install_merge7zinstaller">Merge7zInstaller</link> section of this topic.</para>
 
-    <para>WinMerge automatically detects installed 7-zip in system, there is
-    no need to any configuration.</para>
+    <para>WinMerge automatically detects an installed 7-zip in the system, so no configuration is needed.</para>
 
-    <para>7-zip integration needs compatible <filename>Merge7z*.dll</filename>
-    file in WinMerge program directory. <filename>*</filename> comes from
-    7-Zip version installed. For example 7-Zip version 4.42 needs
-    <filename>Merge7z442.dll</filename>. And if
-    <filename>WinMergeU.exe</filename> (Unicode version) is used, then
-    "<filename>U</filename>" is also added to filename:
-    <filename>Merge7z442U.dll</filename>. If needed DLL file is for some
-    reason missing it can be copied to WinMerge directory, for example from
-    7z-Plugin archive downloadable in WinMerge download page.</para>
+    <para>7-zip integration needs a compatible <filename>Merge7z*.dll</filename> file in the WinMerge program directory, where <filename>*</filename> is the 7-Zip version installed. For example, 7-Zip version 4.42 requires <filename>Merge7z442.dll</filename>. And if <filename>WinMergeU.exe</filename> (the Unicode version) is used, then <literal><filename>U</filename></literal> is also added to filename, as in: <filename>Merge7z442U.dll</filename>. If the required DLL file is missing for any reason, you can copy it to the WinMerge directory, for example from the <filename>7z-Plugin</filename> archive that is available from the WinMerge download page.</para>
 
-    <para>If <filename>Merge7z*.dll</filename> file is missing, WinMerge
-    informs user with message showing filename of needed file and recommended
-    version of 7-Zip. This message can also be opened from
-    <guimenu>Help</guimenu>-menu item "<guimenuitem>Archive Support
-    Disabled</guimenuitem>".</para>
+    <para>If the <filename>Merge7z*.dll</filename> file is missing, WinMerge displays a message that includes the name of the missing file and the recommended version of 7-Zip. You can also display this message by clicking <menuchoice>
+        <guimenu>Help</guimenu>
 
-    <sect3>
+        <guimenuitem>Archive Support Disabled</guimenuitem>
+      </menuchoice>.</para>
+
+    <sect3 id="Install_merge7zinstaller">
       <title>Merge7zInstaller</title>
 
-      <para>This is a stand-alone installer for 7-Zip integration.</para>
+      <para><filename>Merge7zInstaller</filename> is a stand-alone installer for 7-Zip integration.</para>
 
-      <para>Installer filenames may seem weird at first, but there is reason
-      for them: they show supported versions. Filename is formatted
-      <filename>Merge7zInstallerXXX-YYY-ZZZ.exe</filename>. XXX is build
-      number, YYY earliest 7-Zip version supported and ZZZ latest 7-Zip
-      version supported. For example
-      <filename>Merge7zInstaller0014-311-426.exe</filename> means build
-      version 14, and support for 7-Zip versions 3.11 - 4.26.</para>
+      <para>Installer file names may seem strange at first, but there is reason for them: they show the supported versions. The file name is formatted as</para>
 
-      <para>This separate installer is much more flexible since we can update
-      it whenever 7-Zip is updated. And we don't add files users don't need to
-      base installer.</para>
+      <para><synopsis>Merge7zInstaller<replaceable>XXX-YYY-ZZZ</replaceable>.exe</synopsis></para>
 
-      <para>The latest version is always available directly in our downloads
-      at SourceForge.net: <ulink
-      url="https://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=143957"
-      userlevel="">7-Zip plugin</ulink> and of course from our homepage at
-      <ulink url="http://winmerge.org/">WinMerge.org</ulink>.</para>
+      <para>where <replaceable>XXX</replaceable> is the build number, <replaceable>YYY</replaceable> is the earliest 7-Zip version supported, and <replaceable>ZZZ</replaceable> is the latest 7-Zip version supported. </para>
 
+      <para>For example, <filename>Merge7zInstaller0014-311-426.exe</filename> means build version 14, support for 7-Zip versions 3.11 to 4.26.</para>
+
+      <para>This separate installer is much more flexible, because we can update it whenever 7-Zip is updated, and we don't add files to the base installer that users don't need.</para>
+
+      <para>The latest version is always available at <ulink url="https://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=143957" userlevel="">7-Zip plugin</ulink> in our download page at SourceForge.net, and of course from our home page at <ulink url="http://winmerge.org/">WinMerge.org</ulink>.</para>
+
       <tip>
-        <para>If you want to know immediately when we release new versions,
-        you can Monitor our releases. When monitoring release, you get sent
-        e-mail notifications about new releases when they happen.</para>
+        <para>If you want to know immediately when we release new versions, you can monitor our releases. You are then notified through e-mail of new releases when they happen.</para>
       </tip>
 
-      <para>Running installer is simple:</para>
+      <para>Running the <filename>Merge7zInstaller</filename> is simple:</para>
 
       <para><orderedlist>
           <listitem>
-            <simpara>Start installer executable</simpara>
+            <para>Start the installer executable.</para>
           </listitem>
 
           <listitem>
-            <simpara>Select installation type and DLL files (supported 7-zip
-            versions) to install</simpara>
+            <para>Select the installation type and the DLL files (supported 7-zip versions) to install:</para>
 
-            <itemizedlist>
-              <listitem>
-                <simpara><guilabel>Shared installation</guilabel> copies 7-Zip
-                plugin files to system directory so they can be shared between
-                multiple WinMerge installations and other programs using 7-zip
-                plugin. This is recommended installation.</simpara>
-              </listitem>
+            <variablelist>
+              <varlistentry>
+                <term>Shared installation</term>
 
-              <listitem>
-                <simpara><guilabel>Application specific
-                installation</guilabel> copies 7-zip plugin files to program
-                directory. Files are then usable only by that
-                program.</simpara>
+                <listitem>
+                  <para>Copies the 7-Zip plugin files to the system directory so they can be shared between multiple WinMerge installations and other programs using the 7-zip plugin. This is the recommended installation.</para>
+                </listitem>
+              </varlistentry>
 
-                <para>This selection requires user to select executable in
-                directory where plugin files are installed. Select WinMerge
-                executable file when installing to WinMerge directory.</para>
-              </listitem>
+              <varlistentry>
+                <term>Application specific installation</term>
 
-              <listitem>
-                <simpara><guilabel>Enable standalone operation</guilabel>
-                installs also required 7-Zip files to program's (application
-                specific installation) directory. This allows minimal usable
-                installation of 7-Zip for archive support. This can be used
-                when 7-Zip application is not wanted or needed.</simpara>
+                <listitem>
+                  <para>Copies the 7-zip plugin files to the program directory. Files are then usable only by that program.</para>
 
-                <para>This installation type does contain only needed files
-                for WinMerge (or other application) to enable archive support.
-                It does not install 7-Zip user interface or other related
-                tools or files. After this install it is not possible to open
-                or create 7-Zip archive files outside WinMerge.</para>
-              </listitem>
-            </itemizedlist>
+                  <para>When you shoose this option, you must select the executable in the directory where the plugin files are installed. Select the WinMerge executable file when installing to the WinMerge directory.</para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term>Enable standalone operation</term>
+
+                <listitem>
+                  <para>Also installs the required 7-Zip files to the program's application-specific installation directory. This allows the minimal usable installation of 7-Zip for archive support. You can use this option when the 7-Zip application is not wanted or needed.</para>
+
+                  <para>This installation type contains only the files needed for WinMerge (or other application) to enable archive support. It does not install the 7-Zip user interface or other related tools or files. After this installation it is not possible to open or create 7-Zip archive files outside of WinMerge.</para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
           </listitem>
         </orderedlist></para>
     </sect3>

Modified: trunk/Docs/Users/Manual/Introduction.xml
===================================================================
--- trunk/Docs/Users/Manual/Introduction.xml	2008-06-24 21:44:47 UTC (rev 5522)
+++ trunk/Docs/Users/Manual/Introduction.xml	2008-06-25 13:26:26 UTC (rev 5523)
@@ -2,239 +2,115 @@
 <sect1 id="Introduction">
   <title>Introduction to WinMerge</title>
 
-  <para>WinMerge is an <ulink url="http://www.opensource.org/">Open
-  Source</ulink> visual text file differencing and merging tool for Windows.
-  WinMerge can compare folders and files and present differences in easy to
-  understand and handle format.</para>
+  <para>WinMerge is an <ulink url="http://www.opensource.org/">Open Source</ulink> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.</para>
 
-  <para>WinMerge is highly useful for determining what has changed between
-  project versions, and then merging changes between versions. WinMerge can be
-  used as external differencing/merging tool or as standalone
-  application.</para>
+  <para>WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application.</para>
 
-  <para>In addition WinMerge has a lot of helping and supporting features
-  making comparing and synching/merging as easy and useful as possible.
-  Several programming languages and other fileformats are syntax
-  highlighted.</para>
+  <para>In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible. Several programming languages and other file formats are syntax-highlighted.</para>
 
-  <para>WinMerge is not an hex-editor. WinMerge can show binary files contents
-  and differences in them. But that information is meant for viewing only, and
-  editing binary files with WinMerge can break the files.</para>
+  <para>WinMerge is not a hex editor. WinMerge can show binary files contents and differences between them. But the information is meant for viewing only: editing binary files with WinMerge can break the files.</para>
 
-  <para>Goal of WinMerge development is to make comparing and synch/merge of
-  folders and files easy and fast. While maintaining maximum reliability. Easy
-  of use reduces errors. Latest 2.8 version is considered a stable and
-  reliable program to use.</para>
+  <para>The goal of WinMerge development is to make comparing, synchronizing, and merging folders and files easy and fast, while maintaining maximum reliability. Ease of use is of key importance for reducing errors. The latest 2.8 version is considered a stable and reliable program to use.</para>
 
-  <para>Please note that WinMerge is not a freeware (unlike lots of sites in
-  web say), but it is <ulink
-  url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> licenced. We have
-  given you a good tool for free, so please follow our licence and submit your
-  improvements back to us. We are happy to get help improving WinMerge
-  further. It is advantage for all WinMerge users.</para>
+  <para>Please note that WinMerge is not freeware (as many sites on the Web have stated): it is <ulink url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> licensed. We provide you with a good tool for free, so please honor your license agreement and submit improvements to us. We are happy to get help improving WinMerge, to the advantage of all WinMerge users.</para>
 
   <sect2>
-    <title>WinMerge Versions</title>
+    <title>WinMerge versions</title>
 
-    <para>There are three kind of versions available in <ulink
-    url="https://sourceforge.net/project/showfiles.php?group_id=13216">downloads</ulink>
-    page.</para>
+    <para>There are three kind of versions available in the <ulink url="https://sourceforge.net/project/showfiles.php?group_id=13216">downloads</ulink> page.</para>
 
     <sect3>
       <title><indexterm>
-          <primary>Stable Versions</primary>
-        </indexterm>Stable Versions</title>
+          <primary>Stable versions</primary>
+        </indexterm>Stable versions</title>
 
-      <para><ulink
-      url="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248">Stable
-      versions</ulink> are recommended for most users. If you are unsure about
-      what version to use - use latest stable version. Stable versions have
-      even second number, for example 2.4, 2.6 and 2.8.</para>
+      <para><ulink url="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248">Stable versions</ulink> are recommended for most users. If you are unsure about what version to use, use the latest stable version. Stable versions have an even second number, for example, 2.4, 2.6 and 2.8.</para>
     </sect3>
 
     <sect3>
       <title><indexterm>
-          <primary>Beta Versions</primary>
-        </indexterm>Beta Versions</title>
+          <primary>Beta versions</primary>
+        </indexterm>Beta versions</title>
 
-      <para><ulink
-      url="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=29158">Beta
-      versions</ulink> are for people who want to test latest features and
-      improvements done after last stable version. Beta versions are not so
-      extensively tested as stable versions are and probably have some bugs.
-      Beta versions have odd second number, for example 2.5 and 2.7. Beta
-      versions can be used in production, they are not expected to have major
-      bugs. But there is always a risk with using beta-level release, so
-      consider it carefully. We have tried to release new stable series once a
-      year, so it may be worth waiting for few months for next stable
-      release...</para>
+      <para><ulink url="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=29158">Beta versions</ulink> are for people who want to test latest features and improvements made after last stable version. Beta versions are not tested as extensively as stable versions and probably have some bugs. Beta versions have an odd second number, for example 2.5 and 2.7. Beta versions can be used in production, because they are not expected to have major bugs. But there is always a risk with using beta-level releases, so consider it carefully. We have tried to release a new stable series once a year, so it may be worth waiting for few months for the next stable release...</para>
     </sect3>
 
     <sect3>
       <title><indexterm>
-          <primary>Experimental Versions</primary>
-        </indexterm>Experimental Versions</title>
+          <primary>Experimental versions</primary>
+        </indexterm>Experimental versions</title>
 
-      <para><ulink
-      url="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=92246">Experimental
-      versions</ulink> are snapshot releases from version control
-      (Subversion). They have all the latest features and improvements. Some
-      features may still be buggy and/or incomplete. These releases are made
-      available to allow users to try out the current code without needing to
-      compile, and participate in development discussions concerning new and
-      changing features. We also appreciate any help testing the current code.
-      Use with care and enable backups! And please <ulink
-      url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=113216">report
-      bugs</ulink> you find using these builds, it really helps with WinMerge
-      development!</para>
+      <para><ulink url="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=92246">Experimental versions</ulink> are snapshot releases from our version control system (Subversion). They have all the latest features and improvements. Some features may still be buggy or incomplete. These releases are made available to allow users to try out the current code without needing to compile, and to participate in development discussions concerning new and changing features. We also appreciate any help testing the current code. Use experimental versions with care and enable backups! And please <ulink url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=113216">report bugs</ulink> that you find while using these builds: it really helps with WinMerge development!</para>
     </sect3>
 
     <sect3>
-      <title>Version Tree</title>
+      <title>Version tree</title>
 
-      <para>All this text about different versions may sound confusing if you
-      never have worked with this kind of model. Lets see this with picture
-      below:</para>
+      <para>All this talk about different versions might be confusing if you never have worked with this kind of model. Lets illustrate with a picture:</para>
 
       <para><mediaobject>
           <imageobject>
             <imagedata fileref="art/WinMerge_versions.png" format="PNG" />
           </imageobject>
 
-          <caption><para> WinMerge stable and development
-          versions</para></caption>
-        </mediaobject>This picture presents how our releases and different
-      versions relate to each other. Development always happens with
-      development versions (experimental versions and beta versions). At
-      proper points we create a new branch for stable releases. In above
-      picture arrows for 2.2.x and 2.4.x are two current stable branches.
-      Picture does not show 2.6 which is the latest stable branch.</para>
+          <caption><para> WinMerge stable and development versions</para></caption>
+        </mediaobject>The preceding diagram shows the relationships between different releases and versions. Development always happens within experimental and beta development versions. At the appropriate points we create new branches for stable releases. In the diagram, the arrows for 2.4.x and 2.6.x versions are two current stable branches. (The diagram is a snapshot; it is not updated to show the current stable branch).</para>
 
       <important>
-        <para>Branch always means a separate development. There is no any
-        automation to copy improvements or fixes from development versions to
-        stable versions. Or in opposite direction. Changes are always selected
-        by hand and then merged (with WinMerge, of course..).</para>
+        <para>A branch always indicates a separate development effort. There is no any automation to copy improvements or fixes from development versions to stable versions, or in the opposite direction. Changes are always selected by hand and then merged (using WinMerge, of course).</para>
       </important>
 
-      <para>After a branch is created, we try to keep code in it as stable as
-      possible. Usually this means we copy only tested bugfixes from
-      development versions to stable versions. Unfortunately this is not
-      always an easy task and errors can happen. And new bugs appear also in
-      stable versions sometimes. It is just a real-life software development.
-      However, in general quality in branches increases and 2.6.14 is better
-      release than 2.4.0, and using the latest stable branch release is always
-      recommended.</para>
+      <para>After a branch is created, we try to keep the code in it as stable as possible. Usually this means that we copy only tested bug fixes from development versions to stable versions. Unfortunately this is not always an easy task, and errors can occur. New bugs can also appear in stable versions: this is real-life software development. However, in general, quality increases in branches. For example, 2.6.14 was a better release than 2.4.0. So we always recommend using the latest stable branch release.</para>
 
-      <para>What this branching also means is that stable versions don't get
-      many new features after a branch is created. Stable versions 2.6.0 and
-      2.6.14 are pretty much similar feature-wise. After 2.6 stable branch we
-      have already a created new stable branch 2.8. It has many improvements
-      and fixes done after 2.6 branch was created.</para>
+      <para>This branching also means that stable versions don't get many new features after a branch is created. Stable versions 2.6.0 and 2.6.14 had pretty similar features. After the 2.6 stable branch, we created a new stable branch, 2.8, where we added many improvements and fixes.</para>
 
-      <para>Many software vendors always increase their version numbers and
-      say version with biggest version number is what people should use. If
-      WinMerge was developed as closed-source software users would see only
-      versions from stable branches and that would be true for WinMerge too.
-      But as WinMerge is an open source software project we want to keep our
-      development as open as possible. And do a lots of development version
-      releases. The latest development version can have version number 2.9.1.0
-      and the latest stable version can have version number 2.6.14.</para>
+      <para>Many software vendors always increase their version numbers and advise people to use the version with the biggest number. If WinMerge were developed as proprietary software, users would see only versions from stable branches. But because WinMerge is an open source software project, we want to keep our development as open as possible and to release many development versions. The latest development version can have version number 2.9.1.0 and the latest stable version can be version 2.6.14.</para>
     </sect3>
   </sect2>
 
   <sect2>
     <title><indexterm>
-        <primary>Support</primary>
+        <primary>support</primary>
 
-        <secondary>Reporting Bugs</secondary>
-      </indexterm>Getting Support and Reporting Bugs</title>
+        <secondary>reporting bugs</secondary>
+      </indexterm>Getting support and reporting bugs</title>
 
-    <para><ulink
-    url="http://sourceforge.net/forum/forum.php?forum_id=41637">Open
-    discussion forum</ulink> is the fastest way to get help. Please be
-    patient, it may take some time anybody answers.</para>
+    <para>The <ulink url="http://sourceforge.net/forum/forum.php?forum_id=41637">Open Discussion forum</ulink> is the fastest way to get help. Please be patient, it may take some time for somebody to answer.</para>
 
-    <para>If you have found a bug, please submit it as a <ulink
-    url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=113216">bug
-    report</ulink>. Please attach as much information as you can, at least the
-    version number of WinMerge you are using. If you can, attach also
-    configuration log which you can see from menu <menuchoice>
+    <para>If you find a bug, please submit it as a <ulink url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=113216">bug report</ulink>. Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <menuchoice>
         <guimenu>Help</guimenu>
 
-        <guimenuitem>Configuration...</guimenuitem>
-      </menuchoice> Good information in bug report means better change for bug
-    to be fixed faster.</para>
+        <guimenuitem>Configuration</guimenuitem>
+      </menuchoice> in the WinMerge window. Good information in a bug report makes it more likely that your bug will be fixed quickly.</para>
 
     <important>
-      <para>Include version number in bug reports. Version number can be
-      checked from <menuchoice>
+      <para>Include the version number in bug reports. You can check the version number by clicking <menuchoice>
           <guimenu>Help</guimenu>
 
           <guimenuitem>About WinMerge</guimenuitem>
-        </menuchoice> dialog.</para>
+        </menuchoice>.</para>
     </important>
 
-    <para>We prefer that you <ulink
-    url="https://sourceforge.net/account/registration/">register</ulink>
-    with <ulink url="http://sourceforge.net/">SourceForge.net</ulink> before
-    posting a bug report (registration is public and free), so that you may
-    get email notifications if we post follow-up questions to your bug. It is
-    not at this time required that you register to post a bug report
-    (although, we do generally give less priority to unregistered bug reports,
-    because it has been our experience that unregistered posters often do not
-    remember to return and check to answer follow-on questions).</para>
+    <para>We prefer that you <ulink url="https://sourceforge.net/account/registration/">register</ulink> with <ulink url="http://sourceforge.net/">SourceForge.net</ulink> before posting a bug report (registration is public and free), so that you receive email notifications if we post follow-up questions to your bug. Registration is not currently required for you to post a bug report. However, we generally give less priority to unregistered bug reports, because it has been our experience that unregistered posters often do not return to answer follow-up questions.</para>
   </sect2>
 
   <sect2>
     <title><indexterm>
-        <primary>WinMerge Development</primary>
-      </indexterm>WinMerge Source Codes and Development</title>
+        <primary>WinMerge development</primary>
+      </indexterm>WinMerge source code and development</title>
 
-    <para>WinMerge source codes are available in <ulink
-    url="https://sourceforge.net/project/showfiles.php?group_id=13216">downloads</ulink>
-    page and from <ulink
-    url="https://sourceforge.net/cvs/?group_id=13216">public Subversion
-    server</ulink>. We welcome everybody to download the sources, study them
-    and alter them. If you find (and fix) bugs, improve something etc, please
-    submit your changes back to us as <ulink
-    url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=313216">patches</ulink>
-    and help improve this product! If you publish your altered version, you
-    are required to publish changes source code too, it is what <ulink
-    url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> licence is
-    about. Please respect it.</para>
+    <para>WinMerge source code is available in the <ulink url="https://sourceforge.net/project/showfiles.php?group_id=13216">downloads</ulink> page and from the <ulink url="https://sourceforge.net/cvs/?group_id=13216">public Subversion server</ulink>. Anyone can download the sources, study them, and alter them. If you find (and fix) bugs, improve something, and so on, please submit your changes to us as <ulink url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=313216">patches</ulink> and help improve this product! If you publish your altered version, you are required to publish the changes to source code too. This is what the <ulink url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> license is about: please respect it.</para>
 
-    <para>While WinMerge development has been fast in last couple of years,
-    all this work is done by people in their spare time. Nobody gets paid for
-    improving WinMerge. We try to fix bugs as we find them or somebody reports
-    them to us. We really try - we use WinMerge too. But there is absolutely
-    no promises for new features. We always appreciate any help with WinMerge,
-    be it testing, documenting, translating or coding.</para>
+    <para>While WinMerge development has been fast in the last couple of years, all this work is done by people in their spare time. Nobody gets paid for improving WinMerge. We try to fix bugs as we find them or when somebody reports them to us. We really try — we use WinMerge too. But there are absolutely no promises for new features. We always appreciate any help with WinMerge, be it testing, documenting, translating, or coding.</para>
 
     <sect3>
-      <title>Participating to WinMerge Development</title>
+      <title>Participating in WinMerge development</title>
 
-      <para>As mentioned above, we look for help in many areas, not just
-      coding. Translations, documentation and testing are important
-      too.</para>
+      <para>As mentioned above, we look for help in many areas, not just coding. Translation, documentation, and testing are important too.</para>
 
-      <para>The <ulink url="http://wiki.winmerge.org/">Developers-Wiki</ulink>
-      is a good source of information if you want to help with WinMerge
-      development. There is a <ulink
-      url="http://winmerge.org/Wiki/Help_Needed">Help Needed</ulink> -page in
-      the wiki for more information about how to help with WinMerge
-      development.</para>
+      <para>The <ulink url="http://wiki.winmerge.org/">Development Wiki</ulink> is a good source of information if you want to help with WinMerge development. The <ulink url="http://winmerge.org/Wiki/Help_Needed">Help Needed</ulink> page in the wiki has more information about how to help with WinMerge development.</para>
 
-      <para><ulink url="http://winmerge.org/support/mailing-lists.php">
-      Development-mailing</ulink> list is the preferred place for development
-      discussions. Another place is in <ulink
-      url="http://sourceforge.net/forum/forum.php?forum_id=41639">Developers-forum</ulink>.
-      If you are interested in helping with WinMerge development, let us know.
-      If you want to fix one of our <ulink
-      url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=113216"
-      userlevel="">bugs</ulink> or implement a <ulink
-      url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=363216">new
-      feature</ulink>, let us know.</para>
+      <para>The <ulink url="http://winmerge.org/support/mailing-lists.php">development-mailing</ulink> list is the preferred place for development discussions. Another place is in the <ulink url="http://sourceforge.net/forum/forum.php?forum_id=41639">developers-forum</ulink>. If you are interested in helping with WinMerge development, let us know. If you want to fix one of our <ulink url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=113216" userlevel="">bugs</ulink> or implement a <ulink url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=363216">new feature</ulink>, let us know.</para>
     </sect3>
   </sect2>
-</sect1>
\ No newline at end of file
+</sect1>

Modified: trunk/Docs/Users/Manual/Quick_start.xml
===================================================================
--- trunk/Docs/Users/Manual/Quick_start.xml	2008-06-24 21:44:47 UTC (rev 5522)
+++ trunk/Docs/Users/Manual/Quick_start.xml	2008-06-25 13:26:26 UTC (rev 5523)
@@ -1,145 +1,221 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sect1 id="QuickStart">
-  <title>Quick Start</title>
+  <title>Quick start</title>
 
   <sect2>
     <title><indexterm>
-        <primary>Open Dialog</primary>
-      </indexterm>Opening Files and Folders</title>
+        <primary>Open dialog</primary>
+      </indexterm>Opening files and folders</title>
 
-    <para>Start WinMerge and either select <guimenuitem>Open</guimenuitem>
-    from the <guimenu>File</guimenu>-menu, or click the yellow folder icon on
-    the toolbar, or press <keycombo>
-        <keycap>Ctrl</keycap>
+    <para>After you have installed WinMerge, step through the procedure and discussions in this topic to learn basic WinMerge operations and concepts. The methods shown are not the only ways to do things: there are usually several ways to do each task. When you are done, you can go on to learn other methods and more advanced skills, which are covered in other help topics.</para>
 
-        <keycap>O</keycap>
-      </keycombo>. The file/folder selection dialog opens:</para>
+    <orderedlist>
+      <listitem>
+        <para>Open the WinMerge window. Here are some of the methods you can use:</para>
 
-    <para><mediaobject>
-        <imageobject>
-          <imagedata fileref="screenshots/OpenDlg1.png" format="PNG" />
-        </imageobject>
-      </mediaobject></para>
+        <itemizedlist>
+          <listitem>
+            <para>Double-click the <inlinemediaobject>
+                <imageobject>
+                  <imagedata contentwidth="32" fileref="screenshots/wm_icon.png" />
+                </imageobject>
 
-    <para>Two topmost fields in Open dialog are for selecting files and
-    folders to compare. Comparison objects can be specified in one of four
-    ways:</para>
+                <textobject>
+                  <phrase>WinMerge desktop shortcut</phrase>
+                </textobject>
+              </inlinemediaobject> WinMerge desktop shortcut.</para>
+          </listitem>
 
-    <para><orderedlist>
-        <listitem>
-          <simpara>Enter the path names directly into the edit
-          fields</simpara>
-        </listitem>
+          <listitem>
+            <para>Navigate to the WinMerge launcher in your Start menu.</para>
+          </listitem>
 
-        <listitem>
-          <simpara>Click the <guibutton>Browse</guibutton> button and use the
-          file chooser to navigate to the desired path</simpara>
-        </listitem>
+          <listitem>
+            <para>In a Command Prompt window, cd to the WinMerge installation folder and enter <command>WinMergeU</command>.</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
 
-        <listitem>
-          <simpara>Expand the combo box and select a previously used
-          path</simpara>
-        </listitem>
+      <listitem>
+        <para>In the WinMerge window select the files or folders that you want to operate on. For example:</para>
 
-        <listitem>
-          <simpara>Drag &amp; drop path into the dialog or left/right edit
-          field</simpara>
-        </listitem>
-      </orderedlist></para>
+        <itemizedlist>
+          <listitem>
+            <para>Click <menuchoice>
+                <guimenu>File</guimenu>
 
-    <para>If <guilabel>Open-dialog Auto-completion</guilabel> -option is
-    enabled in options WinMerge shows a list of paths available when typing
-    into the fields. Auto-completion can be restricted to earlier used paths
-    only, which makes selecting frequently used paths fast.</para>
+                <guimenuitem>Open</guimenuitem>
+              </menuchoice>.</para>
+          </listitem>
 
-    <para>Folder can be selected from Windows Open dialog (opens when
-    <guibutton>Browse</guibutton>-button is selected) by browsing into folder
-    and selecting <guibutton>Open</guibutton>-button. It does not require
-    selecting a file. When <guilabel>Filename</guilabel> field in Windows Open
-    dialog contains text "<guilabel>Folder Selection</guilabel>" selecting
-    <guibutton>Open</guibutton> button selects currently visible folder. Also
-    if filename in Windows Open dialog does not match any real file parent
-    folder is selected. The Open dialog always shows a backslash "\" at end of
-    folder name.</para>
+          <listitem>
+            <para>Click the <inlinemediaobject>
+                <imageobject>
+                  <imagedata contentwidth="16" fileref="screenshots/open_icon.png" />
+                </imageobject>
 
-    <para><note>
-        <para>There can be only file &amp; file or folder &amp; folder
-        selected to open for compare. If there is file &amp; folder selected
-        or other one of files/folders cannot be found WinMerge disables
-        <guibutton>OK</guibutton>-button in dialog.</para>
-      </note></para>
+                <textobject>
+                  <phrase>WinMerge open button</phrase>
+                </textobject>
+              </inlinemediaobject> Open tool bar button.</para>
+          </listitem>
 
-    <para><guilabel>Filter</guilabel> field can be used to select files by
-    extension to compare. Default value is "*.*" which includes all files. But
-    listing one or more extensions restricts compare to only files with those
-    extensions. Multiple extensions are separated with space or semicolon. For
-    example, entering the file filter <filename>*.cpp;*.hpp;*.c;*.h</filename>
-    will cause WinMerge to ignore all files except C and C++ source files. You
-    can only filter by file extension, not by filename.</para>
+          <listitem>
+            <para>Press <keycombo>
+                <keycap>Ctrl</keycap>
 
-    <para>File filters are a much more powerful way (than extension filters)
-    to select files and folders. Use the <guibutton>Select</guibutton> button
-    next to the <guilabel>Filters</guilabel> field to see a list of available
-    filters, and to choose a file filter to use.</para>
+                <keycap>O</keycap>
+              </keycombo>.</para>
+          </listitem>
+        </itemizedlist>
 
-    <para>If the <guilabel>Include Subfolders</guilabel> checkbox is checked
-    then WinMerge compares all subfolders and shows all files and folders it
-    finds in one view. Otherwise only the current folder is compared, and
-    subfolders are listed by name (without their contents), so the user can
-    browse into them.</para>
+        <para>The Select Files or Folders dialog opens:</para>
 
-    <para>Unpacker selection is for plugins.</para>
+        <para><mediaobject>
+            <imageobject>
+              <imagedata fileref="screenshots/OpenDlg1.png" format="PNG" />
+            </imageobject>
+          </mediaobject></para>
+      </listitem>
 
-    <tip>
-      <para>Status of currently selected files or folders is shown with text
-      in bottom of the dialog. If one of the paths is invalid this text tells
-      which one it is.</para>
-    </tip>
+      <listitem>
+        <para>In the <guilabel>Left</guilabel> and <guilabel>Right</guilabel> fields, specify the files and folders to compare. Use any of these methods:</para>
 
-    <para>Project files are the easiest and fastest way to open frequently
-    used paths. Usually project files are opened using separate dialog
-    accessible from <guimenu>File</guimenu>-menu. A project file can be also
-    selected as left path in Open-dialog. Selecting project files to
-    <guilabel>Left</guilabel>- and <guilabel>Right</guilabel>-paths WinMerge
-    compares selected project files. See <link linkend="OpenPaths">Opening
-    Files and Folders</link> for more information about project files.</para>
+        <para><itemizedlist>
+            <listitem>
+              <para>Enter the path names directly into the fields.</para>
+            </listitem>
 
+            <listitem>
+              <para>Click the <guibutton>Browse</guibutton> button to navigate to the desired path.</para>
+
+              <para>In the Open dialog, the text, <literal>Folder Selection</literal>, is initially displayed in the <guilabel>File name</guilabel> field. Your selection depends on the type of comparison you want to do:</para>
+
+              <itemizedlist>
+                <listitem>
+                  <para>If you are comparing files, select the target file. The <literal>Folder Selection</literal> text is overwritten with your selection.</para>
+                </listitem>
+
+                <listitem>
+                  <para>If you are comparing folders, open the target folder; do not select a file. The <literal>Folder Selection</literal> text remains in place.</para>
+                </listitem>
+              </itemizedlist>
+
+              <para>Click <guibutton>Open</guibutton> to dismiss the Open dialog and load your selection in the <guilabel>Left</guilabel> or <guilabel>Right</guilabel> field. If you specified folders, the field includes a backslash ( \ ) at end of the path.</para>
+            </listitem>
+
+            <listitem>
+              <para>Click the combo box and choose a previously-used path.</para>
+
+              <tip>
+                <para>To make it easier to select frequently-used paths, consider enabling the <guilabel>Open-dialog Auto-completion</guilabel> option. With this option, WinMerge shows a list of paths available as you type in the fields. See <link linkend="Configuration">Options &amp; configuration</link> for details.</para>
+              </tip>
+            </listitem>
+
+            <listitem>
+              <para>Drag and drop a file or folder into the dialog or the <guilabel>Left</guilabel> or <guilabel>Right</guilabel> field.</para>
+            </listitem>
+          </itemizedlist></para>
+
+        <para><note>
+            <para>You can select only one pair of files or one pair of folders to compare. If you select a file and a folder or if one of the files or folders is not found, WinMerge disables the <guibutton>OK</guibutton> button in the dialog.</para>
+
+            <para>The status message at the bottom of the dialog also informs you if one of the paths is invalid.</para>
+          </note></para>
+      </listitem>
+
+      <listitem>
+        <para>If you are comparing folders, you can use the <guilabel>Filter</guilabel> field to eliminate some files from the operation. The field specifies a subset of files in the selected paths that are to be included; all unspecified files are excluded. There are two methods of filtering:</para>
+
+        <variablelist>
+          <varlistentry>
+            <term>File extension</term>
+
+            <listitem>
+              <para>In this method, you specify the types of files to include in the operation; all other files are excluded (filtered). With no filter value or a value of <literal>*.*</literal>, all files in the paths are included, so no filtering is performed. To add filtering, enter one or more file extension specifications. Separate multiple items with spaces or semicolons.</para>
+
+              <para>For example, this expression filters all files from the operation except C and C++ source files:</para>
+
+              <para><filename><userinput>*.cpp;*.hpp;*.c;*.h</userinput></filename></para>
+
+              <para>You cannot filter by file name, which is represented in the file extension expression only by the <literal>*</literal> wildcard character. For example, these expressions are not valid:</para>
+
+              <para><userinput>mybook.xml</userinput></para>
+
+              <para><userinput>yourbook.*</userinput></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>File filtering</term>
+
+            <listitem>
+              <para>File filtering is more powerful than extension filtering. Click the <guibutton>Select</guibutton> button next to the <guilabel>Filters</guilabel> field to choose from a list of available filters. See <link linkend="Filters">Filters</link> for full details.</para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </listitem>
+
+      <listitem>
+        <para>The <guilabel>Include Subfolders</guilabel> check box provides another way to control the scope of folder comparisons. If you check this option, WinMerge recursively compares subfolders, and shows all the files and folders it finds in one view. If you disable the option, only the current folder is compared, and subfolders are listed by name (without their contents), so you can browse into them.</para>
+      </listitem>
+
+      <listitem>
+        <para>The Unpacker field enables you to perform compare operations on plug-ins.</para>
+      </listitem>
+    </orderedlist>
+
     <sect3>
-      <title>Other Ways to Open Files and Folders</title>
+      <title>Other ways to open files and folders</title>
 
-      <para>Open-dialog is the main interface for opening files and folders.
-      But WinMerge allows many other ways too:</para>
+      <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>
 
       <itemizedlist>
         <listitem>
-          <simpara>Shell integration allows selecting files and folders to
-          compare from Windows Explorer</simpara>
+          <para>Project files are the easiest and fastest way to open frequently used paths. To open a project file, use one of these methods:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>From the WinMerge window, click <menuchoice>
+                  <guimenuitem>File</guimenuitem>
+
+                  <guimenuitem>Open Project</guimenuitem>
+                </menuchoice>.</para>
+            </listitem>
+
+            <listitem>
+              <para>From a command line.</para>
+            </listitem>
+
+            <listitem>
+              <para>From the Opening Files and Folders dialog, specify a project file in the <guilabel>Left</guilabel> field.</para>
+
+              <note>
+                <para>If you specify project files in both the the <guilabel>Left</guilabel> and <guilabel>Right</guilabel> fields, WinMerge does not open either project file; it simply compares the XML content of the two files.</para>
+              </note>
+            </listitem>
+          </itemizedlist>
+
+          <para>See <link linkend="OpenPaths">Opening files and folders</link> for more information about project files.</para>
         </listitem>
 
         <listitem>
-          <simpara>Command line allows starting WinMerge from other
-          applications, command prompt or batch/script file</simpara>
+          <simpara>Right-clicking files or folders in Windows Explorer, choosing WinMerge in the shortcut menu.</simpara>
         </listitem>
 
         <listitem>
-          <simpara>Files and folders can be drag&amp;drop'ed directly to
-          WinMerge window</simpara>
+          <simpara>The command line allows you to start WinMerge from other applications, from a command prompt, or a batch or script file.</simpara>
         </listitem>
 
         <listitem>
-          <simpara>Project-file can be opened from command-line or from
-          <menuchoice>
-              <guimenu>File</guimenu>
-
-              <guimenuitem>Open Project...</guimenuitem>
-            </menuchoice> -menuitem</simpara>
+          <simpara>You can drag and drop files and folders directly into the WinMerge window or on the WinMerge desktop shortcut.</simpara>
         </listitem>
       </itemizedlist>
     </sect3>
   </sect2>
 
   <sect2>
-    <title>Comparing Folders</title>
+    <title>Comparing folders</title>
 
     <para><inlinemediaobject>
         <imageobject>
@@ -147,50 +223,47 @@
         </imageobject>
       </inlinemediaobject></para>
 
-    <para>If two folders were selected in the Open dialog then the folder
-    compare window is opened. Folder compare is basically a list of found
-    items. Found file- and folder-names are shown in rightmost column and
-    other columns show other related information.</para>
+    <para>If you selected two folders in the Open dialog, the Folder Compare window is opened. The Folder Compare window is a tabular list of items found in the compared folders. Each row displays information about a found file, with the file name in the left column and additional information in the other columns.</para>
 
-    <para>WinMerge does not have a concept of "original" and "changed" sides.
-    WinMerge just shows what is different between two selected folders. This
-    is especially the case for files and folders that are found only in other
-    side. WinMerge does not show them as "added" or "removed" but unique
-    items.</para>
+    <para>WinMerge does not have a concept of <wordasword>original</wordasword> and <wordasword>changed</wordasword> sides. Instead, it simply shows what is different between two selected folders. For example, a file or folder that is found only on one side is simply shown as a unique item on that side. It is not shown as added or removed. In the preceding figure, notice that the <guilabel>Comparison result </guilabel>column lists <filename>Merge.aps</filename> and <filename>Merge.rc.bak</filename> as found only in the left comparison folder.</para>
 
-    <para>Using <guimenu>Merge</guimenu> menu items, toolbar items, or context
-    menu items, files and folders can be managed in many ways. Most important
-    action is making files and folders identical in both sides. This is done
-    by selecting one of several Copy -items. When file or folder is copied to
-    other side it becomes identical.</para>
+    <para>You can manage files and folders in many ways using the <guimenu>Merge</guimenu> menu, toolbar buttons, or shortcut (right-click) menu. The most important action is making files or folders identical in both sides by selecting one of several Copy items. When you copy a file or folder to other side, the Comparison result value changes to <literal>Identical</literal>.</para>
 
-    <para>If the selected file exists in both sides (and it is not a binary
-    file) it can be opened to file compare. File can be opened by:<orderedlist>
+    <para>If a file or folder exists in both sides (and it is not a binary file) it can be opened for file comparison using one of these methods:<itemizedlist>
         <listitem>
-          <simpara>selecting <guimenuitem>Compare</guimenuitem> from
-          <guimenu>Merge</guimenu> menu</simpara>
+          <simpara>Click <menuchoice>
+              <guimenuitem>Compare</guimenuitem>
+
+              <guimenuitem>Merge</guimenuitem>
+            </menuchoice> in the WinMerge menu.</simpara>
         </listitem>
 
         <listitem>
-          <simpara>selecting <guimenuitem>Compare</guimenuitem> from context
-          menu</simpara>
+          <simpara>Right-click the row and choose the <guimenuitem>Compare</guimenuitem> shortcut.</simpara>
         </listitem>
 
         <listitem>
-          <simpara>double-clicking with mouse</simpara>
+          <simpara>Double-click the row.</simpara>
         </listitem>
 
         <listitem>
-          <simpara>pressing <keycap>Enter</keycap> key</simpara>
+          <simpara>Select the row and press <keycap>Enter</keycap>.</simpara>
         </listitem>
-      </orderedlist></para>
+      </itemizedlist>If you compare a subfolder, the new folder's comparison table is loaded in the current Folder Compare window . When you are done with that folder's comparison, you can navigate back to its parent folder by double-clicking the <inlinemediaobject>
+        <imageobject>
+          <imagedata contentwidth="23" fileref="screenshots/nav_uparrow_btn.png" />
+        </imageobject>
 
-    <para>After file compare is closed file's status is updated to folder
-    compare.</para>
+        <textobject>
+          <phrase>Navigator up arrow button</phrase>
+        </textobject>
+      </inlinemediaobject> up arrow at the top of the Filename column.</para>
+
+    <para>If you compare a file, WinMerge opens File Compare window with a new tab, as shown in the figure in the next section. Then, if you make changes in the File Compare window, the file's data is updated in the Folder Compare window.</para>
   </sect2>
 
-  <sect2>
-    <title>Comparing Files</title>
+  <sect2 id="QuickStart_comparingfiles">
+    <title>Comparing files</title>
 
     <para><inlinemediaobject>
         <imageobject>
@@ -198,28 +271,24 @@
         </imageobject>
       </inlinemediaobject></para>
 
-    <para>File compare shows two files side by side. Different lines are
-    highlighted with background color. One or more consecutive different lines
-    form one difference (or "diff"). WinMerge mostly works with these
-    differences, not separate lines.</para>
+    <para>The File Compare window shows the two versions of the selected files side by side. Different lines are highlighted with a background color. One or more consecutive different lines form one difference (or <glossterm>diff</glossterm>). WinMerge mainly works with these differences, not separate lines.</para>
 
     <para><important>
-        <para>Notice how WinMerge fills missing lines in other side. Similar
-        lines are always side by side. This is different from most other
-        compare/merge programs and can take a while to learn.</para>
-      </important>With merging commands (in <guimenu>Merge</guimenu> menu)
-    lines in difference can be copied between sides. Missing lines can be
-    copied also. When missing lines are copied from one side to another,
-    matching existing lines are removed. In the above screenshot, copying
-    lines in second difference from the left to the right would remove
-    matching lines from the left side.</para>
+        <para>Notice how WinMerge fills missing lines, so that similar lines are always aligned vertically, side by side. This is different from most other compare/merge programs, and can take a while to learn.</para>
+      </important>During merging operations, lines in a difference can be copied between sides. Missing lines can also be be copied. When missing lines are copied from one side to the other, matching existing lines are removed. In the preceding screenshot, a merge that copied lines in the second difference from left to right would remove the matching lines in the left side.</para>
 
-    <para>WinMerge has an simple integrated editor. Typing, copying, cutting
-    and pasting text works. If <guilabel>Automatic rescan</guilabel> is
-    enabled then WinMerge updates file differences while files are edited. If
-    <guilabel>Automatic rescan</guilabel> is disabled files can be updated
-    selecting <guimenuitem>Refresh</guimenuitem> from
-    <guimenu>Edit</guimenu>-menu, clicking toolbar button with two yellow
-    arrows or pressing <keycap>F5</keycap> key.</para>
+    <para>WinMerge has a simple integrated editor that features basic typing, copying, cutting and pasting of text. If <guilabel>Automatic rescan</guilabel> is enabled, WinMerge updates file differences while you edit a file. If <guilabel>Automatic rescan</guilabel> is disabled, you can update files by selecting <menuchoice>
+        <guimenu>Edit</guimenu>
+
+        <guimenuitem>Refresh</guimenuitem>
+      </menuchoice>, clicking the <inlinemediaobject>
+        <imageobject>
+          <imagedata contentwidth="16" fileref="screenshots/refresh_btn.png" />
+        </imageobject>
+
+        <textobject>
+          <phrase>Refresh button</phrase>
+        </textobject>
+      </inlinemediaobject> toolbar button, or pressing <keycap>F5</keycap>.</para>
   </sect2>
 </sect1>

Modified: trunk/Docs/Users/Manual/screenshots/foldercomp1.png
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/nav_uparrow_btn.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/nav_uparrow_btn.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/screenshots/open_icon.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/open_icon.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/screenshots/refresh_btn.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/refresh_btn.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/screenshots/wm_icon.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/wm_icon.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5524
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5524&view=rev
Author:   kimmov
Date:     2008-06-25 07:35:25 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
PATCH: [ 2002431 ] Revised install doc after review
 Submitted by Denis Bradford

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Manual/Install.xml

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-06-25 13:26:26 UTC (rev 5523)
+++ trunk/Docs/Users/ChangeLog.txt	2008-06-25 14:35:25 UTC (rev 5524)
@@ -5,6 +5,7 @@
 
 WinMerge 2.9.1.5
   Manual: Copy editing (#2000322)
+  Manual: Clarify 64-bit support (#2002431)
 
 WinMerge 2.9.1.4 - 2008-06-24 (r5518)
   Use PCRE regular expressions in the editor (#1991259)

Modified: trunk/Docs/Users/Manual/Install.xml
===================================================================
--- trunk/Docs/Users/Manual/Install.xml	2008-06-25 13:26:26 UTC (rev 5523)
+++ trunk/Docs/Users/Manual/Install.xml	2008-06-25 14:35:25 UTC (rev 5524)
@@ -37,7 +37,7 @@
       </listitem>
 
       <listitem>
-        <simpara>In the Select Destination Location page, accept the location for WinMerge or, if you choose another location, we recommend that you install WinMerge in its own folder. Click <guibutton>Next</guibutton>. </simpara>
+        <simpara>In the Select Destination Location page, accept the location for WinMerge or, if you choose another location, we recommend that you install WinMerge in its own folder. Click <guibutton>Next</guibutton>.</simpara>
       </listitem>
 
       <listitem>
@@ -169,7 +169,7 @@
   <sect2>
     <title id="InstallFromArchive">Installing from an archive</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>
+    <para>WinMerge is pretty much independent of other system components. It is not tightly integrated with Windows, and does not use many DLLs.</para>
 
     <para><filename>WinMerge[U].exe</filename> itself depends on <filename>MFC71[U].dll</filename> , <filename>MSVCR71.dll and MSVCP71.dll</filename>, in addition to some system DLLs. So if these DLLs are already installed on a system, only <filename>WinMerge[U].exe</filename> is needed to run WinMerge. The DLL files listed above are also available as a downloadable runtime package.</para>
 
@@ -185,20 +185,20 @@
   <sect2>
     <title>Shell integration</title>
 
-    <para>The installer enables shell integration when you choose the <guilabel>Enable Explorer context menu integration</guilabel> option in the Select Additional Tasks page. If you do not use the install program: you must register the shell integration DLL (<filename>ShellExtension*.dll</filename>) separately. </para>
+    <para>The installer enables shell integration when you choose the <guilabel>Enable Explorer context menu integration</guilabel> option in the Select Additional Tasks page. If you do not use the install program: you must register the shell integration DLL (<filename>ShellExtension*.dll</filename>) separately.</para>
 
     <note>
       <para>Installing shell integration requires Administrator user privileges.</para>
     </note>
 
-    <para>First, uninstall the current shell integration version by running <filename>unregister.bat</filename> from the WinMerge directory. Then restart the computer so that Windows completes the uninstall. </para>
+    <para>First, uninstall the current shell integration version by running <filename>unregister.bat</filename> from the WinMerge directory. Then restart the computer so that Windows completes the uninstall.</para>
 
     <para>To register the shell integration DLL (<filename>ShellExtension*.dll</filename>), run <filename>register.bat</filename> from the WinMerge directory. We recommend that you restart the computer after installing shell integration, so that Windows updates all its references.</para>
 
     <sect3>
       <title>64-bit shell integration</title>
 
-      <para>WinMerge version 2.6 includes partial support for 64-bit Windows versions by including 64-bit shell integration. The WinMerge installer recognizes 64-bit versions of Windows and can install the correct shell integration version.</para>
+      <para>Starting with Version 2.6, WinMerge supports 64-bit Windows versions by including 64-bit shell integration. The WinMerge installer recognizes 64-bit versions of Windows and can install the correct shell integration version.</para>
 
       <para>When you install shell integration manually from an archive file, the shell integration DLL is named <filename>ShellExtensionX64.dll</filename>. You can register and unregister this file by using <filename>register.bat</filename> and <filename>unregister.bat</filename>, as with 32-bit versions.</para>
     </sect3>
@@ -236,7 +236,7 @@
 
       <para><synopsis>Merge7zInstaller<replaceable>XXX-YYY-ZZZ</replaceable>.exe</synopsis></para>
 
-      <para>where <replaceable>XXX</replaceable> is the build number, <replaceable>YYY</replaceable> is the earliest 7-Zip version supported, and <replaceable>ZZZ</replaceable> is the latest 7-Zip version supported. </para>
+      <para>where <replaceable>XXX</replaceable> is the build number, <replaceable>YYY</replaceable> is the earliest 7-Zip version supported, and <replaceable>ZZZ</replaceable> is the latest 7-Zip version supported.</para>
 
       <para>For example, <filename>Merge7zInstaller0014-311-426.exe</filename> means build version 14, support for 7-Zip versions 3.11 to 4.26.</para>
 
@@ -273,7 +273,7 @@
                 <listitem>
                   <para>Copies the 7-zip plugin files to the program directory. Files are then usable only by that program.</para>
 
-                  <para>When you shoose this option, you must select the executable in the directory where the plugin files are installed. Select the WinMerge executable file when installing to the WinMerge directory.</para>
+                  <para>When you choose this option, you must select the executable in the directory where the plugin files are installed. Select the WinMerge executable file when installing to the WinMerge directory.</para>
                 </listitem>
               </varlistentry>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5551
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5551&view=rev
Author:   kimmov
Date:     2008-07-02 15:35:00 -0700 (Wed, 02 Jul 2008)

Log Message:
-----------
PATCH: [ 2007673 ] Update release notes for shutdown hang

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/ReleaseNotes.html

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-07-02 09:08:49 UTC (rev 5550)
+++ trunk/Docs/Users/ChangeLog.txt	2008-07-02 22:35:00 UTC (rev 5551)
@@ -7,6 +7,7 @@
   Manual: Copy editing (#2000322, #2005418)
   Manual: Clarify 64-bit support (#2002431)
   Reduce executable sizes (#2003203)
+  Release Notes update (#2007673)
   BugFix: Possible crash when enabling line filter (#2004160)
   BugFix: Location Pane flickers when scrolling (#1938177, #2005031)
   Translation updates:

Modified: trunk/Docs/Users/ReleaseNotes.html
===================================================================
--- trunk/Docs/Users/ReleaseNotes.html	2008-07-02 09:08:49 UTC (rev 5550)
+++ trunk/Docs/Users/ReleaseNotes.html	2008-07-02 22:35:00 UTC (rev 5551)
@@ -122,6 +122,10 @@
       updating IE to version 6.0 or later.</p>
   </li>
   <li>
+    <p><strong>Supercopier application causes WinMerge to hang.</strong></p>
+    <p><i>Workaround</i>: Disable the Supercopier when using WinMerge.</p>
+  </li>
+  <li>
     <p><strong>There is no way to specify the codepage for a particular file.</strong></p>
     <p><i>Workaround</i>: Specify the default codepages for all files in Edit-&gt;Options-&gt;Codepage-&gt;Custom codepage.</p>
   </li>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5557
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5557&view=rev
Author:   kimmov
Date:     2008-07-03 12:56:45 -0700 (Thu, 03 Jul 2008)

Log Message:
-----------
Update release notes for 2.9.10 beta.

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/ReleaseNotes.html

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-07-03 19:45:15 UTC (rev 5556)
+++ trunk/Docs/Users/ChangeLog.txt	2008-07-03 19:56:45 UTC (rev 5557)
@@ -7,7 +7,7 @@
   Manual: Copy editing (#2000322, #2005418)
   Manual: Clarify 64-bit support (#2002431)
   Reduce executable sizes (#2003203)
-  Release Notes update (#2007673)
+  Release Notes update (#2007673, r5557)
   BugFix: Possible crash when enabling line filter (#2004160)
   BugFix: Location Pane flickers when scrolling (#1938177, #2005031)
   BugFix: Use system codepage for paths (#1979429, #2008581)

Modified: trunk/Docs/Users/ReleaseNotes.html
===================================================================
--- trunk/Docs/Users/ReleaseNotes.html	2008-07-03 19:45:15 UTC (rev 5556)
+++ trunk/Docs/Users/ReleaseNotes.html	2008-07-03 19:56:45 UTC (rev 5557)
@@ -51,13 +51,13 @@
 </head>
 <body>
 
-<h2>WinMerge 2.9.10 Release Notes</h2>
+<h2>WinMerge 2.9.10 Beta Release Notes</h2>
 <ul>
   <li><a href="#about">About This Release</a></li>
   <li><a href="#new2910">What Is New in 2.9.10?</a></li>
   <li><a href="#issues">Known Issues</a></li>
 </ul>
-<p>June 2008</p>
+<p>July 2008</p>
 
 <h3><a name="about">About This Release</a></h3>
 
@@ -101,7 +101,8 @@
 <h4>Changes</h4>
 <ul>
   <li>Fix location pane flickering, optimize location pane</li>
-  <li>Open conflict files by drag&dropping file to main window</li>
+  <li>Open conflict files by drag&amp;dropping file to main window</li>
+  <li>Manual improvements</li>
 </ul>
 
 <h4>Translation updates</h4>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5569
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5569&view=rev
Author:   kimmov
Date:     2008-07-07 00:30:55 -0700 (Mon, 07 Jul 2008)

Log Message:
-----------
PATCH: [ 2011365 ] Incorporate dev review comments in Intro_diffs help topic
 Submitted by Denis Bradford

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Manual/Intro_diffs.xml
    trunk/Docs/Users/Manual/screenshots/filemerged1.png
    trunk/Docs/Users/Manual/screenshots/missing_lines.png

Added Paths:
-----------
    trunk/Docs/Users/Manual/screenshots/currentdiff_btn.png
    trunk/Docs/Users/Manual/screenshots/filecomp_diffpane1.png
    trunk/Docs/Users/Manual/screenshots/firstdiff_btn.png

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-07-05 10:23:20 UTC (rev 5568)
+++ trunk/Docs/Users/ChangeLog.txt	2008-07-07 07:30:55 UTC (rev 5569)
@@ -3,6 +3,9 @@
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
+WinMerge 2.11.1.1
+  Manual: Introduction update (#2011365)
+
 WinMerge 2.10.x (R_210) branch created (r5561)
 
 WinMerge 2.9.1.5 - 2008-07-04 (r5560)

Modified: trunk/Docs/Users/Manual/Intro_diffs.xml
===================================================================
--- trunk/Docs/Users/Manual/Intro_diffs.xml	2008-07-05 10:23:20 UTC (rev 5568)
+++ trunk/Docs/Users/Manual/Intro_diffs.xml	2008-07-07 07:30:55 UTC (rev 5569)
@@ -2,146 +2,292 @@
 <sect1 id="IntroDiff">
   <title>Overview of file comparing and merging</title>
 
-  <para>This topic introduces the concept of differences in files, how WinMerge displays differences in the File Compare window, and how you can merge differences between files.</para>
+  <para>This topic describes how WinMerge detects and displays differences within files, and demonstrates simple file comparing and merging operations.</para>
 
   <sect2>
-    <title>What are file differences?</title>
+    <title>Comparing files</title>
 
-    <para>If you compare two files, you can probably easily identify several types of differences: different characters and words, different lines, even entire blocks of text that are different. A spell checker is a commonly-used utility that handles simple differences: it highlights words in a document that are different from those in its stored dictionary. You step through the document, resolving each highlighted word in turn.</para>
+    <para>If you compare two files, you can easily identify several types of differences: different characters and words, different lines, even entire blocks of text that are different. But trying understanding all the differences between two files by scanning them in your favorite editor can be tedious and error-prone. Specialized difference/merging tools like WinMerge can make this work much easier and more efficient.</para>
 
-    <para>However, looking only at characters and words is not an effective way to do more complicated comparisons. For this reason, many text utilities use lines as the basic unit of comparison instead. WinMerge's compare engine also uses lines as the basic unit for comparing and merging. WinMerge detects smaller differences, but they are not the basis for comparing and merging operations. To illustrate: if two files have identical lines except for one line, and that line has five words that are different, then we say that the file has one difference, not five.</para>
+    <para>A spell checker is a useful difference utility: it can systematically step you through a document, highlight words that are different from those in its dictionary, and help you resolve each spelling problem. However, looking only at characters and words is not an effective way to do more complicated comparisons: many text utilities use lines as the basic unit of comparison instead.</para>
 
-    <para>It's simple to compare files by identifying single lines that are different. But what it your files have many consecutive different lines? WinMerge handles the entire block of lines as a single difference. This makes it easier for you to step through files and identify their differences. As we will see later, it makes merging quicker too.</para>
+    <para>WinMerge also uses lines as its basic unit of difference. Words and spaces are not treated individually in comparing and merging operations. To illustrate: if two files have identical lines except that in one file, the last line has four different words and an extra space, then we say that the file has one difference, not five.</para>
 
-    <para>Let's look at a simple example that shows what we have discussed so far. First, examine these two files:</para>
+    <para>It's easy to identify individual lines that are different. But sometimes it is useful to treat an entire block of lines that are different as a single difference, instead of comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too.</para>
 
-    <informalexample>
-      <formalpara>
-        <title>File1</title>
+    <sect3>
+      <title>Simple compare operation</title>
 
-        <para><screen>It's hard to compare words
+      <para>This section offers a simple example that demonstrates how to compare line difference between two files in WinMerge:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Using a text editor, create two files with the names and contents shown here, being careful to preserve the words and line breaks exactly:</para>
+
+          <formalpara>
+            <title>Fle1:</title>
+
+            <para><screen>It's hard to compare words
 and merge them. So instead 
 WinMerge compares lines.
 Believe it or else.</screen></para>
-      </formalpara>
+          </formalpara>
 
-      <formalpara>
-        <title>File2</title>
+          <formalpara>
+            <title>File2:</title>
 
-        <para><screen>It's hard to compare words.
+            <para><screen>It's hard to compare words.
 WinMerge compares lines.
 Believe it or not.</screen></para>
-      </formalpara>
-    </informalexample>
+          </formalpara>
 
-    <para>If we open these two files in WinMerge, here is how they initially display in the File Compare window:</para>
+          <para>The files are similar enough that they might be later versions of the same file.</para>
+        </listitem>
 
-    <mediaobject>
-      <imageobject>
-        <imagedata contentwidth="593" fileref="screenshots/missing_lines.png" />
-      </imageobject>
+        <listitem>
+          <para>Start WinMerge. For example, double-click the <inlinemediaobject>
+              <imageobject>
+                <imagedata contentwidth="32" fileref="screenshots/wm_icon.png" />
+              </imageobject>
 
-      <textobject>
-        <phrase>Compare Files screen shot</phrase>
-      </textobject>
-    </mediaobject>
+              <textobject>
+                <phrase>WinMerge desktop shortcut</phrase>
+              </textobject>
+            </inlinemediaobject> WinMerge desktop shortcut.</para>
+        </listitem>
 
-    <para>Notice the status message at the bottom right of the window: It tells you that two differences were detected. Can you identify them? The File Compare window indicates differences by adding a background color (which you can customize) to the text. </para>
+        <listitem>
+          <para>In the Select Files and Folders dialog, specify <filename>File1</filename> as the <guilabel>Left</guilabel> file and <filename>File2</filename> as the <guilabel>Right</guilabel> file, then click <guibutton>OK</guibutton>. The File Compare window displays the two files in the left and right pane, like this:</para>
 
-    <para>The following notes explain each of the callout numbers in the screenshot:</para>
+          <mediaobject>
+            <imageobject>
+              <imagedata contentwidth="592" fileref="screenshots/missing_lines.png" />
+            </imageobject>
 
-    <orderedlist>
-      <listitem>
-        <para>The first difference is a multiline difference: it compares lines 1 and 2 on the left with line 1 on the right.</para>
+            <textobject>
+              <phrase>Compare Files screen shot</phrase>
+            </textobject>
+          </mediaobject>
 
-        <para>Dark gold is the default background color that identifies <glossterm>line differences</glossterm>. Also notice the second, lighter color within the differences. This color identifies <glossterm>word differences</glossterm>: the specific words and spaces within the lines that are different.</para>
-      </listitem>
+          <para>The window elements are described in more detail in <link linkend="CompareFiles">Comparing Files</link>. Here are some features you should notice in this example:</para>
 
-      <listitem>
-        <para>In the right pane, difference 1 includes an empty line with a gray background. We know that line 2 in <filename>File2</filename> is</para>
+          <variablelist>
+            <varlistentry>
+              <term>Number of differences</term>
 
-        <programlisting>WinMerge compares lines.</programlisting>
+              <listitem>
+                <para>The message in the status bar (at the bottom) tells you that two differences were detected. Read on to learn how to identify them.</para>
+              </listitem>
+            </varlistentry>
 
-        <para>Because this line is not part of difference 1, WinMerge inserts a blank line in its place. It then moves the line down so that it aligns with its matching line in the left pane (which happens to be line 3 in <filename>File1</filename>. If you understand this principle, you can always tell which lines WinMerge is comparing.</para>
+            <varlistentry>
+              <term>Difference colors</term>
 
-        <para>Empty gray lines are ignored, and are not part of the source file. What do you think happens if you enter text in an empty gray line? You are adding content to the source file, and the gray background disappears from the line to which you add text.</para>
+              <listitem>
+                <para>WinMerge marks detected differences with various background colors (which you can configure in WinMerge options). The basic difference color is gold, by default. Within each line difference, WinMerge marks words and characters that are different with a lighter background color. Identical lines (like the third line in the example) are unmarked: they have white backgrounds.</para>
+              </listitem>
+            </varlistentry>
 
-        <tip>
-          <para>One consequence of this alignment method is that both panes in the File Compare window always display the same number of lines, even if their source files do not.</para>
-        </tip>
-      </listitem>
+            <varlistentry>
+              <term>Blank lines</term>
 
-      <listitem>
-        <para>This line is not highlighted because it is identical in both files, and does not need merging. As with differences, the WinMerge display aligns matching lines even when they occur in different places in the source files.</para>
-      </listitem>
+              <listitem>
+                <para>Notice that in the left comparison pane, the second line has text: the other pane has a blank gray line in the same location. This blank line does not exist in the <filename>File2</filename> source file, so what is it doing in WinMerge?</para>
 
-      <listitem>
-        <para>The last line is difference 2. Again, we know it is a difference because of its gold background color. Can you identify the specific word differences?</para>
-      </listitem>
-    </orderedlist>
-  </sect2>
+                <para>WinMerge inserts one or more gray blank lines in one version of a difference when the other version has more lines. These empty gray lines do not represent blank lines in the source file; they are only placeholders in the display. The purpose of placeholder lines is to keep the left and right versions of differences vertically aligned. Thus in our example, the text, <code>WinMerge compares lines</code>, appears side by side in the Comparison window, even though they are on different lines in the source files. This makes it easier to compare differences in WinMerge than in a conventional editor.</para>
 
-  <sect2>
-    <title>What is file merging?</title>
+                <tip>
+                  <para>One consequence of the blank lines is that both panes in the File Compare window always display the same total number of lines, even if their source files do not.</para>
+                </tip>
+              </listitem>
+            </varlistentry>
+          </variablelist>
 
-    <para>After you compare two files in the File Compare window, you might want to merge them. In WinMerge, merging is nothing more than copying differences from one file to the other. If a difference includes multiple lines, all of them are copied at once.</para>
+          <para>Now that you understand how WinMerge detects and displays differences, you can use the comparing functions effectively, as shown in the next steps.</para>
+        </listitem>
 
-    <para>WinMerge provides controls in the toolbar that make it easy to navigate through the differences, and to merge selected differences (or even all differences) in either direction.</para>
+        <listitem>
+          <para>Click <inlinemediaobject>
+              <imageobject>
+                <imagedata contentdepth="15" fileref="screenshots/currentdiff_btn.png" />
+              </imageobject>
 
-    <para>Let's show how you can use the controls in the File Compare window to merge the simple files shown earlier. You can perform the following merge operation using only four mouse clicks:</para>
+              <textobject>
+                <phrase>Current Difference button</phrase>
+              </textobject>
+            </inlinemediaobject> <guibutton>Current Difference</guibutton> in the toolbar (or press <keycombo>
+              <keycap>Alt</keycap>
 
-    <orderedlist>
-      <listitem>
-        <para>Click <inlinemediaobject>
-            <imageobject>
-              <imagedata contentwidth="16" fileref="screenshots/nextdiff_btn.png" />
-            </imageobject>
+              <keycap>Enter</keycap>
+            </keycombo>). If this button is not enabled (for example, if your cursor is in a different line of the file), click <inlinemediaobject>
+              <imageobject>
+                <imagedata contentdepth="15" fileref="screenshots/firstdiff_btn.png" />
+              </imageobject>
 
-            <textobject>
-              <phrase>Next Difference button</phrase>
-            </textobject>
-          </inlinemediaobject> <guibutton>Next Difference</guibutton> to select difference 1.</para>
-      </listitem>
+              <textobject>
+                <phrase>First Difference button</phrase>
+              </textobject>
+            </inlinemediaobject> First Difference (or press <keycombo>
+              <keycap>Alt</keycap>
 
-      <listitem>
-        <para>Click <inlinemediaobject>
+              <keycap>Home</keycap>
+            </keycombo>) instead.</para>
+
+          <para>When you select a difference, the two versions are loaded in the Diff pane. The Diff pane is useful for confirming which lines are included, and for examining them in isolation from the rest of the file. In our example, Difference 1 clearly has two lines.</para>
+
+          <mediaobject>
             <imageobject>
-              <imagedata contentwidth="17" fileref="screenshots/copyr_button.png" />
+              <imagedata contentwidth="573" fileref="screenshots/filecomp_diffpane1.png" />
             </imageobject>
 
             <textobject>
-              <phrase>Copy Right button</phrase>
+              <phrase>Compare Files Diff Pane</phrase>
             </textobject>
-          </inlinemediaobject> <guibutton>Copy Right</guibutton> to merge difference 1 from <filename>File1</filename> to <filename>File2</filename>. In <filename>File</filename> 2, notice that the single difference line is replaced by the two lines from <filename>File1</filename>, and the gray empty line is now gone.</para>
-      </listitem>
+          </mediaobject>
+        </listitem>
 
-      <listitem>
-        <para>Click <guibutton>Next Difference</guibutton> again to select difference 2. This is easier than finding and selecting the difference yourself. It's especially useful if you want to step through all differences without accidentally missing any. </para>
-      </listitem>
+        <listitem>
+          <para>Click <inlinemediaobject>
+              <imageobject>
+                <imagedata contentdepth="15" fileref="screenshots/nextdiff_btn.png" />
+              </imageobject>
 
-      <listitem>
-        <para>Click <inlinemediaobject>
+              <textobject>
+                <phrase>Current Difference button</phrase>
+              </textobject>
+            </inlinemediaobject> <guibutton>Next Difference</guibutton> in the toolbar (or click <keycombo>
+              <keycap>Alt</keycap>
+
+              <keycap>Enter</keycap>
+            </keycombo>). This jumps over the identical line (which is not a difference) and selects the last line.</para>
+
+          <para>You have reached the end of the file and had a chance to examine every difference. This was a trivial example — there were only two differences, and there are other ways to compare differences in WinMerge — but it demonstrates the efficiency of using the WinMerge navigation controls.</para>
+        </listitem>
+      </orderedlist>
+    </sect3>
+  </sect2>
+
+  <sect2>
+    <title>Merging files</title>
+
+    <para>The purpose of merging is to combine changes from two files into one file. Merging concepts and functions build on the comparing operation: please read the preceding section before beginning this section. In addition to detecting differences between two file versions, we resolve the differences and save the result in a single <glossterm>target</glossterm> version.</para>
+
+    <para>An environment without merging is simple but constrained: you must always update files sequentially. Two people cannot work on the same file concurrently, and once you create two versions of a file, they must be maintained separately.</para>
+
+    <para>Merging files makes concurrent development possible, and it is a common occurrence in team environments. For example, suppose you and another person want to add code to the same program file at the same time. You both begin with an identical copy of the file, but during development you create separate versions that are not identical. At some point, the two versions must be merged into one version that preserves the changes from each contributor.</para>
+
+    <para>Merging can be prompted (or even initiated) by version control systems like Subversion and ClearCase. For example, your version control system might prevent you from submitting changes to its repository because of a conflict. A conflict can occur if someone else checked in a different version of the same file while you were working on your version, and the version control system was not able to automatically merge the differences. When that happens, you might need to merge the conflicting versions before trying again to contribute your version. Many systems have integrated difference and merge tools, but you might prefer to use WinMerge instead.</para>
+
+    <para>Just as with comparing, you use WinMerge's toolbar controls (or keyboard shortcuts) to systematically step through each difference. Resolve each difference by copying either its left or right <glossterm>candidate</glossterm> to the other side. When you have resolved all the differences, WinMerge lets you know that all differences are resolved (the versions are identical), and you are done merging.</para>
+
+    <sect3>
+      <title>Simple merge operation</title>
+
+      <para>This short exercise demonstrates how use the controls in the File Compare window to merge the simple files shown earlier, in only a few steps:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Click <inlinemediaobject>
+              <imageobject>
+                <imagedata contentdepth="15" fileref="screenshots/currentdiff_btn.png" />
+              </imageobject>
+
+              <textobject>
+                <phrase>Current Difference button</phrase>
+              </textobject>
+            </inlinemediaobject> <guibutton>Current Difference</guibutton> in the toolbar to select the first difference. If this button is not enabled, click <inlinemediaobject>
+              <imageobject>
+                <imagedata contentdepth="15" fileref="screenshots/firstdiff_btn.png" />
+              </imageobject>
+
+              <textobject>
+                <phrase>First Difference button</phrase>
+              </textobject>
+            </inlinemediaobject> First Difference instead.</para>
+        </listitem>
+
+        <listitem>
+          <para>Click <inlinemediaobject>
+              <imageobject>
+                <imagedata contentwidth="17" fileref="screenshots/copyr_button.png" />
+              </imageobject>
+
+              <textobject>
+                <phrase>Copy Right button</phrase>
+              </textobject>
+            </inlinemediaobject> <guibutton>Copy Right</guibutton> to merge difference 1 from <filename>File1</filename> to <filename>File2</filename>. In <filename>File</filename> 2, notice that the single difference line is replaced by the two lines from <filename>File1</filename>, and the gray blank line is now gone.</para>
+        </listitem>
+
+        <listitem>
+          <para>Click <inlinemediaobject>
+              <imageobject>
+                <imagedata contentdepth="15" fileref="screenshots/nextdiff_btn.png" />
+              </imageobject>
+
+              <textobject>
+                <phrase>Next Difference button</phrase>
+              </textobject>
+            </inlinemediaobject> <guibutton>Next Difference</guibutton> to select difference 2. This is easier than finding and selecting the difference yourself. It's especially useful if you want to step through all differences without accidentally missing any.</para>
+        </listitem>
+
+        <listitem>
+          <para>Click <inlinemediaobject>
+              <imageobject>
+                <imagedata contentwidth="17" fileref="screenshots/copyl_button.png" />
+              </imageobject>
+
+              <textobject>
+                <phrase>Copy Left button</phrase>
+              </textobject>
+            </inlinemediaobject> <guibutton>Copy Left</guibutton> to merge difference 2 from <filename>File2</filename> to <filename>File1</filename>.</para>
+
+          <para>The message that the the files are identical tells you that the merge is complete:</para>
+
+          <mediaobject>
             <imageobject>
-              <imagedata contentwidth="17" fileref="screenshots/copyl_button.png" />
+              <imagedata contentwidth="592" fileref="screenshots/filemerged1.png" format="PNG" />
             </imageobject>
+          </mediaobject>
+        </listitem>
 
-            <textobject>
-              <phrase>Copy Left button</phrase>
-            </textobject>
-          </inlinemediaobject> <guibutton>Copy Left</guibutton> to merge difference 2 from <filename>File2</filename> to <filename>File1</filename>.</para>
-      </listitem>
-    </orderedlist>
+        <listitem>
+          <para>Click <guibutton>OK</guibutton> to dismiss the message. The status Difference message changes from <computeroutput>Difference of 1</computeroutput> to <computeroutput>identical</computeroutput>.</para>
+        </listitem>
 
-    <para>Here is the result of our merge:</para>
+        <listitem>
+          <para>Press <keycombo>
+              <keycap>Ctrl</keycap>
 
-    <informalexample>
-      <mediaobject>
-        <imageobject>
-          <imagedata contentwidth="573" fileref="screenshots/filemerged1.png" format="PNG" />
-        </imageobject>
-      </mediaobject>
-    </informalexample>
+              <keycap>S</keycap>
+            </keycombo> to save your changes.</para>
+        </listitem>
+      </orderedlist>
+    </sect3>
 
-    <para>Remember that in addition to its specialized comparing and merging functions, the File Compare window also enables you to edit your files directly using its conventional editing functions (including searching, copying and pasting text).</para>
+    <sect3>
+      <title>Choosing a merge result file</title>
+
+      <para>You control where your merge result is preserved. The WinMerge Compare window does not have a separate result pane, unlike some merge tools. So the simplest strategy is to save your changes in one or both source files. Press <keycombo>
+          <keycap>Ctrl</keycap>
+
+          <keycap>S</keycap>
+        </keycombo> at any time to save the current changes to both files; alternatively, click <menuchoice>
+          <guimenu>File</guimenu>
+
+          <guimenuitem>Save Left</guimenuitem>
+        </menuchoice> or <menuchoice>
+          <guimenu>File</guimenu>
+
+          <guimenuitem>Save Right</guimenuitem>
+        </menuchoice> to save only one file.</para>
+
+      <para>To write to a third file instead of either source file, use <menuchoice>
+          <guimenu>File</guimenu>
+
+          <guimenuitem>Save As</guimenuitem>
+        </menuchoice>. For example, your target file might be the difference or conflict file generated by a version control system.</para>
+
+      <para>Similarly, in the WinMerge command line, you can leave both source versions unchanged by using the optional <option>outputfile</option> argument, as described in <link linkend="CommandLine">Command Line</link>.</para>
+    </sect3>
   </sect2>
 </sect1>

Added: trunk/Docs/Users/Manual/screenshots/currentdiff_btn.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/currentdiff_btn.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/screenshots/filecomp_diffpane1.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/filecomp_diffpane1.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/Docs/Users/Manual/screenshots/filemerged1.png
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/firstdiff_btn.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/firstdiff_btn.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/Docs/Users/Manual/screenshots/missing_lines.png
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5578
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5578&view=rev
Author:   kimmov
Date:     2008-07-09 01:05:00 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
PATCH: [ 2011924 ] Reorganize help components
 Submitted by Denis Bradford

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Manual/About_Doc.xml
    trunk/Docs/Users/Manual/Command_line.xml
    trunk/Docs/Users/Manual/Compare_dirs.xml
    trunk/Docs/Users/Manual/Compare_files.xml
    trunk/Docs/Users/Manual/Configuration.xml
    trunk/Docs/Users/Manual/Faq.xml
    trunk/Docs/Users/Manual/Filters.xml
    trunk/Docs/Users/Manual/Install.xml
    trunk/Docs/Users/Manual/Intro_diffs.xml
    trunk/Docs/Users/Manual/Locales.xml
    trunk/Docs/Users/Manual/Open_paths.xml
    trunk/Docs/Users/Manual/Plugins.xml
    trunk/Docs/Users/Manual/Quick_start.xml
    trunk/Docs/Users/Manual/Text_encoding.xml
    trunk/Docs/Users/Manual/Version_control.xml
    trunk/Docs/Users/Manual/WinMerge_help.xml
    trunk/Docs/Users/Manual/build/build_html.xsl
    trunk/Docs/Users/Manual/build/build_htmlhelp.xsl
    trunk/Docs/Users/Manual/css/all.css

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/ChangeLog.txt	2008-07-09 08:05:00 UTC (rev 5578)
@@ -5,6 +5,7 @@
 
 WinMerge 2.11.1.1
   Manual: Introduction update (#2011365)
+  Manual: Reorganize structure (#2011924)
   Add ShellExtension menu for drive letters (root folders) (#2011602)
   BugFix: Use system codepage for paths (#1979429, #2008581)
 

Modified: trunk/Docs/Users/Manual/About_Doc.xml
===================================================================
--- trunk/Docs/Users/Manual/About_Doc.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/About_Doc.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="AboutDoc">
+<article id="AboutDoc">
   <title>About this document</title>
 
   <para>This document is the user manual for WinMerge 2.8. It explains the capabilities and limitations of WinMerge. This manual is recommended reading for both new and experienced users.</para>
@@ -85,4 +85,4 @@
       </listitem>
     </varlistentry>
   </variablelist>
-</sect1>
+</article>

Modified: trunk/Docs/Users/Manual/Command_line.xml
===================================================================
--- trunk/Docs/Users/Manual/Command_line.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Command_line.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="CommandLine">
+<article id="CommandLine">
   <title><indexterm>
       <primary>Command line</primary>
     </indexterm>Command Line</title>
@@ -199,7 +199,7 @@
   <emphasis>resolved</emphasis>" about these three files. And those paths
   should be given in that order for WinMerge.</para>
 
-  <sect2>
+  <section>
     <title>Conflict File</title>
 
     <para>Conflict file can be given to command line as one path to the
@@ -207,5 +207,5 @@
     After WinMerge opens the given conflict file, it can be resolved like
     described in <link linkend="ResolveConflictFiles">Resolving Conflict
     Files</link>.</para>
-  </sect2>
-</sect1>
\ No newline at end of file
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Compare_dirs.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_dirs.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Compare_dirs.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="CompareDirs">
+<article id="CompareDirs">
   <title>Comparing Folders</title>
 
   <para>The Folder compare window displays all of the files and subfolders
@@ -56,7 +56,7 @@
   big text files) it can be changed via registry value: <screen>HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimit</screen>.
   As usual be careful when changing values directly to registry!</para>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Folder Compare Result</primary>
       </indexterm>Compare Results</title>
@@ -137,9 +137,9 @@
           </inlinemediaobject> Aborted item. WinMerge did not finish comparing
         this item when compare was stopped. Result is unknown.</member>
       </simplelist></para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Folder Compare Status</title>
 
     <para>During the folder comparison WinMerge shows status panel:</para>
@@ -187,9 +187,9 @@
 
         <guimenuitem>Compare Statistics</guimenuitem>
       </menuchoice>.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Selecting Items to Show</title>
 
     <para>In "<guimenu>View</guimenu>" menu there are several choices for
@@ -226,9 +226,9 @@
         hides files and directories filtered out by file filters</simpara>
       </listitem>
     </itemizedlist>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Folder Compare Columns</primary>
       </indexterm>Columns in Folder Compare</title>
@@ -334,9 +334,9 @@
         style (linefeed style) of files.</simpara>
       </listitem>
     </itemizedlist>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Browsing Folders</title>
 
     <para>Browsing folders is only possible when subfolders are not included
@@ -375,7 +375,7 @@
     folder. This can be used in situation explained in previous paragraph when
     there is same folder compared as both sides.</para>
 
-    <sect3>
+    <section>
       <title><indexterm>
           <primary>Open Unique Folders</primary>
         </indexterm>Unique Folders</title>
@@ -400,10 +400,10 @@
       menu. WinMerge shows a message asking if the missing folder should be
       created. Answer <guilabel>Yes</guilabel> to create the folder, or
       <guilabel>No</guilabel> to cancel the action.</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Navigation in Folder Compare</title>
 
     <para>In addition moving selection using mouse or keyboard, also
@@ -417,12 +417,12 @@
 
     <para>Multiple files/folders can be selected. However not all operations
     are possible with multi-selection.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>File Operations in Folder Compare</title>
 
-    <sect3>
+    <section>
       <title>Copying, moving and deleting</title>
 
       <para>Folder compare allows user to copy and delete files and folders.
@@ -462,9 +462,9 @@
         <para>File/folder deletion cannot be undone if <guilabel>Recycle
         Bin</guilabel> is not used!</para>
       </warning>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Renaming</title>
 
       <para>Renaming files and folders is available through context menu item
@@ -473,9 +473,9 @@
       cancelled by pressing <keycap>Esc</keycap> -key. Note that items in both
       sides are renamed. Renaming just other side is not currently
       possible.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Opening files</title>
 
       <para>There are three items in <guimenu>Open</guimenu>-menus:</para>
@@ -505,9 +505,9 @@
         folder is selected usually opens that folder into new Explorer
         window.</para>
       </tip>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Archiving</title>
 
       <para><guimenu>Zip</guimenu>-menu in directory compare context menu
@@ -566,10 +566,10 @@
       file. But WinMerge does not update archive contents for files
       added/deleted/copied. User can create a new archive file using above
       menuitems instead.</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Copying Path- or Filenames</title>
 
     <para>In context menu there are items for copying selected items' paths or
@@ -588,9 +588,9 @@
         filenames without paths.</simpara>
       </listitem>
     </itemizedlist>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Customising Folder Compare</title>
 
     <para>There are many ways to customize folder compare:<itemizedlist>
@@ -614,9 +614,9 @@
           dropping column names with mouse.</simpara>
         </listitem>
       </itemizedlist></para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Protecting Folders / Read-only Folders</title>
 
     <para>If user wants to protect one or both sides from changes, user can
@@ -634,9 +634,9 @@
 
     <para>Protection status is shown in statusbar, there are own panes for
     left and right side.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Hiding Files and Folders</primary>
       </indexterm>Hiding Items</title>
@@ -654,9 +654,9 @@
     So when you have merged files, use context menu item to hide them. It is a
     lot easier to see what items are left to merge. Get used to it! It saves
     your time!</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Refreshing Only Selected Items</title>
 
     <para>Full refresh of large folders can take a long time. In 2.2 and
@@ -668,5 +668,5 @@
 
         <guimenuitem>Refresh Selected</guimenuitem>
       </menuchoice> from the main menu.</para>
-  </sect2>
-</sect1>
\ No newline at end of file
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_files.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Compare_files.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="CompareFiles">
+<article id="CompareFiles">
   <title>Comparing Files</title>
 
   <para>File compare window is basically two files opened to editor into two
@@ -29,7 +29,7 @@
     refresh is recommended after editing.</para>
   </tip>
 
-  <sect2>
+  <section>
     <title>Showing the Differences</title>
 
     <para>WinMerge uses different (user configurable) colors to highlight and
@@ -37,9 +37,9 @@
     background and missing lines with gray background. If user selects the
     difference, it is shown with red background and missing lines with milder
     red.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Tabs</title>
 
     <para>WinMerge can show open windows in tab bar below toolbar. Tab bar can
@@ -50,9 +50,9 @@
       </menuchoice>. When the tab bar is shown it has one tab for every open
     window. The tab contains last part of the folder names or file
     names.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>File Headerbar</title>
 
     <para>The file headerbar has several functionalities. See screenshot
@@ -82,9 +82,9 @@
 
     <para>Headerbar has a context menu with items to copy full path or
     filename to clipboard.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Statusbar</title>
 
     <para><inlinemediaobject>
@@ -173,9 +173,9 @@
           difference (<guilabel>X</guilabel>)</simpara>
         </listitem>
       </itemizedlist></para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Editor Margin</title>
 
     <para>The editor panes (file panes) have optional gray margin area for
@@ -230,9 +230,9 @@
     that with linenumbers the margin width is set so that the longest line
     number fits into it. So with large files with lots of lines it needs space
     for several numbers.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Difference Navigation</primary>
 
@@ -248,7 +248,7 @@
         </imageobject>
       </inlinemediaobject></para>
 
-    <sect3>
+    <section>
       <title>Selecting a difference</title>
 
       <para>Before difference can be merged, it must be selected. Selecting
@@ -265,9 +265,9 @@
           <guimenuitem>Current Difference</guimenuitem>.</simpara>
         </listitem>
       </itemizedlist>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Navigating differences</title>
 
       <para><guimenu>Merge</guimenu>-menu has items for navigating to
@@ -280,9 +280,9 @@
         <para>When difference is selected with navigation commands cursor is
         moved to begin of first line of difference. In both files.</para>
       </note>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><guimenuitem>Current Difference</guimenuitem>-command</title>
 
       <para>This command has two important functions:<itemizedlist>
@@ -299,9 +299,9 @@
             contents and quickly return back to selected difference.</simpara>
           </listitem>
         </itemizedlist></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Go To line or difference</title>
 
       <para>Using <guimenuitem>Go To</guimenuitem> from
@@ -315,10 +315,10 @@
         using <guimenuitem>Find</guimenuitem> or difference navigation it is
         faster to jump to first line of difference.</para>
       </tip>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Merging Differences</primary>
       </indexterm>Merging Differences</title>
@@ -377,9 +377,9 @@
       linkend="Configuration">Options &amp; Configuration</link> -chapter for
       more information.</para>
     </tip>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Merge Mode</primary>
       </indexterm>Merge Mode</title>
@@ -420,9 +420,9 @@
 
     <para>When merge mode is enabled <guilabel>Merge</guilabel> text is shown
     in statusbar.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Refreshing</title>
 
     <para>Refreshing updates differences after changes are made to files. It
@@ -433,9 +433,9 @@
       updated files etc, those changes are not seen. Refresh updates
       differences according changes user has done.</para>
     </note>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>View Whitespaces</title>
 
     <para>When enabled from <guimenu>View</guimenu> menu <guimenuitem>View
@@ -444,9 +444,9 @@
     spaces in other file and tabulators in other. Also, if <guilabel>Preserve
     original EOL chars</guilabel> is enabled, WinMerge shows type of EOL
     (<guilabel>Windows</guilabel>/<guilabel>Unix</guilabel>/<guilabel>Mac</guilabel>).</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Editing Files</title>
 
     <para>Normal editing features work in WinMerge editor. User can type and
@@ -455,9 +455,9 @@
     only in other side). Anyway these customisations are not usually visible
     to users otherwise that lines can sometimes "jump" when WinMerge has to
     relocate matching/non-matching files.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Line Difference Highlight</title>
 
     <para>WinMerge can automatically highlight all differences it finds in
@@ -488,9 +488,9 @@
       </menuchoice> and <guilabel>Editor</guilabel> page). See <link
     linkend="Configuration">Options &amp; Configuration</link> -chapter for
     more information.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Line Difference Selection</title>
 
     <para>Many times it is useful to see exact differences inside lines.
@@ -505,9 +505,9 @@
         <imagedata fileref="screenshots/linediff.png" format="PNG" />
       </imageobject>
     </mediaobject>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Location Pane</title>
 
     <para>Location pane is a handy side-pane showing a overall (difference)
@@ -546,9 +546,9 @@
     background color) can be used like a scrollbar thumb - after pressing down
     the left mouse button over it can be dragged upwards and downwards to
     scroll the files.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Context Menu</title>
 
     <para>File compare context menu contains items for frequently used
@@ -565,9 +565,9 @@
     (system) registered application or with external editor. Also context menu
     merge-commands are not relative to active file. They always merge the
     selected difference.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Fonts</title>
 
     <para>Font used by editor can be changed from <menuchoice>
@@ -603,9 +603,9 @@
         fixed-width mode)</simpara>
       </listitem>
     </itemizedlist>
-  </sect2>
+  </section>
 
-  <sect2 id="ResolveConflictFiles">
+  <section id="ResolveConflictFiles">
     <title><indexterm>
         <primary>Conflict Files</primary>
       </indexterm>Resolving Conflict Files</title>
@@ -617,7 +617,7 @@
     compare. So conflicted file can be resolved using normal WinMerge file
     compare functionality.</para>
 
-    <sect3>
+    <section>
       <title>Opening Conflict Files</title>
 
       <para>Conflict files can be opened into WinMerge using <menuchoice>
@@ -633,9 +633,9 @@
         wanted to save, it must be copied to another folder or another
         filename before opening it into WinMerge.</para>
       </warning>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Conflict Resolving</title>
 
       <para>WinMerge opens conflict file into normal file compare (see above).
@@ -673,6 +673,6 @@
       command line parameters. See more info from <link
       linkend="CommandLine">Command Line</link> -chapter. Single path to the
       conflict file is also accepted in command line.</para>
-    </sect3>
-  </sect2>
-</sect1>
\ No newline at end of file
+    </section>
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Configuration.xml
===================================================================
--- trunk/Docs/Users/Manual/Configuration.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Configuration.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Configuration">
+<article id="Configuration">
   <title>Options &amp; configuration</title>
 
   <para>Options dialog can be opened from <guimenu>Edit</guimenu>-menu or from
@@ -7,10 +7,10 @@
   <guibutton>OK</guibutton>-button (or pressing
   <keycap>Enter</keycap>-key).</para>
 
-  <sect2>
+  <section>
     <title>General options</title>
 
-    <sect3>
+    <section>
       <title>Automatically scroll to first difference</title>
 
       <para>When this option is enabled:</para>
@@ -26,9 +26,9 @@
           is scrolled visible and selected.</simpara>
         </listitem>
       </itemizedlist>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><indexterm>
           <primary>Disabling splash screen</primary>
         </indexterm>Disable splash screen</title>
@@ -36,9 +36,9 @@
       <para>User can disable splash screen appearing when WinMerge is started.
       It does not make WinMerge start faster (splash screen can be missed by
       clicking it with mouse) but it saves one click.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><indexterm>
           <primary>Esc key</primary>
 
@@ -54,9 +54,9 @@
       <para>Note that -e command line parameter overrides this option. If -e
       parameter is given in command line, WinMerge closes with one
       <keycap>ESC</keycap> key press.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Automatically verify paths in Open-dialog</title>
 
       <para>When enabled: Open-dialog checks both paths given for validity and
@@ -69,9 +69,9 @@
       message is shown if path is not valid. This is faster to use, there is
       no any delay in enabling <guibutton>OK</guibutton>. But user must look
       at error-dialogs.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><indexterm>
           <primary>Single-instance</primary>
         </indexterm>Allow only one instance to run</title>
@@ -81,9 +81,9 @@
       open with paths, new paths replace existing ones in previous instance.
       Or, if multiple compare window support is enabled new compare windows
       are opened for new paths. (See below.)</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Open-dialog Auto-Completion</title>
 
       <para>This option allows user to enable auto-completion for Open-dialog
@@ -102,9 +102,9 @@
           (usually in MRU lists) to compare.</para>
         </listitem>
       </itemizedlist>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Enable multiple compare windows for</title>
 
       <para>Allows opening multiple folder or file compare windows into one
@@ -118,9 +118,9 @@
         can open one file compare window for every folder compare
         window.</para>
       </note>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Reset messageboxes (Reset-button)</title>
 
       <para>WinMerge allows user to hide (suppress) some common messageboxes.
@@ -139,10 +139,10 @@
         installer is not used then it should be done using this
         <guibutton>Reset</guibutton> button.</para>
       </note>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Compare options</title>
 
     <para>Several compare options allow to ignore some specific type of
@@ -162,7 +162,7 @@
       merging files!</para>
     </important>
 
-    <sect3>
+    <section>
       <title><indexterm>
           <primary>Ignore whitespace characters</primary>
         </indexterm>Whitespace</title>
@@ -200,33 +200,33 @@
 
           <para>No spaces between words:<screen format="linespecific">TwoWords</screen></para>
         </example></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Ignore blank lines</title>
 
       <para>Ignores differences that have only blank (empty) lines. Blank
       lines are shown in file view, but difference is shown with ignored
       difference colors and it cannot be merged.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Ignore case</title>
 
       <para>If this option is enabled WinMerge ignores differences between
       lowercase and uppercase letters. For example "LowerCase" and "LOWERCASE"
       and "lowercase" are same.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Ignore carriage return differences (Windows/Unix/Mac)</title>
 
       <para>If this option is not set WinMerge does not detect EOL style
       differences as differences. If two lines differ only by EOL characters
       (e.g. Windows EOL and Unix EOL) WinMerge detects files as identical.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Enable moved block detection</title>
 
       <para>When this option is enabled WinMerge tries to detect lines that
@@ -234,9 +234,9 @@
       location pane can show moved lines with line between bars. This makes it
       easier to visualise changes in files. However if there are a lot of
       moved lines it may get messy looking.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Ignore time differences less than 3 seconds</title>
 
       <para><emphasis>Only for "<guilabel>Modified Date</guilabel>" and
@@ -253,9 +253,9 @@
         <para>This option should be enabled only when the time difference is
         detected. Otherwise it can cause wrong compare results.</para>
       </warning>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>File compare method</title>
 
       <para>File compare method has five choices:</para>
@@ -302,9 +302,9 @@
           not so accurate like the contents methods.</para>
         </listitem>
       </itemizedlist>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Stop after first difference</title>
 
       <note>
@@ -320,13 +320,13 @@
       enable this if you don't know which kind of files you are comparing. If
       you know your files then this is a nice way to make compare even
       faster.</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Editor options</title>
 
-    <sect3>
+    <section>
       <title>Syntax highlighting</title>
 
       <para>From <guilabel>Editor</guilabel>-page user can enable/disable
@@ -334,9 +334,9 @@
       language source codes, web formats etc. Syntax highlighting consumes
       some processing power, so if WinMerge screen updating seems to be slow,
       turning off this option might help.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><indexterm>
           <primary>Automatic rescan</primary>
         </indexterm>Automatic rescan</title>
@@ -358,9 +358,9 @@
       <para>WinMerge 2.2 release delays more edit events than 2.0.x releases,
       so selecting between automatic and manual rescan is mostly a matter of
       taste.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Preserve original EOL chars</title>
 
       <important>
@@ -405,9 +405,9 @@
       fixing, file might be handled in systems with different EOL styles (e.g.
       Windows and Unix). In that case, user can set this option and see
       WinMerge showing EOL style for every line.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Tab options</title>
 
       <para>From <guilabel>General</guilabel>-page user can set size tabulator
@@ -416,9 +416,9 @@
       <para>Another selection is if user wants WinMerge to add tab characters
       or spaces (amount specified by tab size -option) when
       <keycap>Tab</keycap>-key is pressed.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><indexterm>
           <primary>Highlighting line differences</primary>
         </indexterm>Line Difference Coloring</title>
@@ -472,30 +472,30 @@
       <para>WinMerge would highlight whole lines when using <guilabel>Break at
       whitespace</guilabel> but only numbers 20/25 and 40/25 when using
       <guilabel>Break at whitespace or punctuation</guilabel>.</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>System options</title>
 
-    <sect3>
+    <section>
       <title>Send deleted files to Recycle Bin</title>
 
       <para>When this options is enabled files and folders deleted in
       directory compare are moved to Recycle Bin. Note that use of Recycle Bin
       may have disabled from system.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Add to explorer context menu</title>
 
       <para>This option enables/disables shell integration. When enabled, new
       menuitem <guimenuitem>WinMerge</guimenuitem> is added to explorer's
       context menu. User can select one or two files/folders and then select
       that menuitem to open files/folders to WinMerge.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Enable advanced menu</title>
 
       <para>If this option is enabled there are two items shown in explorer's
@@ -507,9 +507,9 @@
 
       <para>Second item (<guimenuitem>Compare...</guimenuitem>) in menu always
       opens WinMerge with selected path(s).</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Include subfolders by default</title>
 
       <para>Shell Integration by default does not include subfolders into
@@ -518,9 +518,9 @@
       <keycap>Control</keycap> key while selecting the
       <guimenuitem>Compare...</guimenuitem> item from the Explorer context
       menu.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><indexterm>
           <primary>Configuring external editor</primary>
         </indexterm>External editor</title>
@@ -540,9 +540,9 @@
         <option>-option1</option> <option>-option2</option>
         <option><replaceable>...</replaceable></option></para>
       </tip>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Filter Folder</title>
 
       <indexterm>
@@ -553,10 +553,10 @@
       filters. By default this folder is user's My Documents folder. When new
       private file filter is created, it is automatically added to this
       folder.</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Backup files</primary>
       </indexterm>Backup Files</title>
@@ -564,16 +564,16 @@
     <para>This page allows user to select several backup-files related
     options.</para>
 
-    <sect3>
+    <section>
       <title>Create backup files in</title>
 
       <para>Selects if backup files are created for folder- and file-compares.
       In file compare backup files are created whenever files are saved. In
       folder compare backup files are created whenever files are written over
       (copied).</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Create backup files into</title>
 
       <para>Selects where backup files are created. The default is to create
@@ -585,9 +585,9 @@
       backup files are created. This allows easy cleanup of backup files. But
       if there are many files with same filename in different folders, then
       those files use the same backup file.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Backup filename</title>
 
       <para>The default is to append a <filename>.bak</filename> extension to
@@ -600,16 +600,16 @@
       basically this allows tracking the work with the file as every time the
       file is saved, new backup copy is created. Beware that this can cause a
       lot of files to be created.</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Archive Support</title>
 
     <para>This page contains download link to 7-zip plugin and contains option
     related to archive support.</para>
 
-    <sect3>
+    <section>
       <title>Enable archive file support</title>
 
       <para>Enables or disables archive file support (based on 7-Zip
@@ -618,9 +618,9 @@
       <para>Like described in Installation section of this manual, there are
       two different methods how 7-zip can be integrated. Integration method
       can be changed using this option dialog after install.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Detect archive type from file signature</title>
 
       <para>Enabling this option allows WinMerge to recognize archive files
@@ -632,17 +632,17 @@
         <para>Enabling this option allows WinMerge to recognize and for
         example Open Office files.</para>
       </tip>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Codepage options</title>
 
     <para>These options allow selecting codepage WinMerge uses for ANSI files
     and if codepage should be read from file contents for specific file
     formats.</para>
 
-    <sect3>
+    <section>
       <title>Default codepage for ANSI files</title>
 
       <para>These three radiobuttons can be used to select default codepage
@@ -658,9 +658,9 @@
         changes to files when saving them. <emphasis>Select codepage before
         loading the files</emphasis>.</para>
       </important>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Detect codepage info for these files: .html .rc .xml</title>
 
       <important>
@@ -696,10 +696,10 @@
         copying to WinMerge, Internet Explorer offers codepage
         selection).</para>
       </caution>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Import and Export of options</title>
 
     <para>Options can be exported to and imported from file. Currently
@@ -707,5 +707,5 @@
     by selecting the <guibutton>Export...</guibutton> button. WinMerge asks
     for location and filename and then saves the file. Importing is done by
     selecting the <guibutton>Import...</guibutton> -button.</para>
-  </sect2>
-</sect1>
\ No newline at end of file
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Faq.xml
===================================================================
--- trunk/Docs/Users/Manual/Faq.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Faq.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Faq">
+<article id="Faq">
   <title>Frequently asked questions</title>
 
-  <sect2>
+  <section>
     <title>General questions</title>
 
     <qandaset>
@@ -204,9 +204,9 @@
         </answer>
       </qandaentry>
     </qandaset>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Installing</title>
 
     <qandaset>
@@ -223,9 +223,9 @@
         </answer>
       </qandaentry>
     </qandaset>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>File Comparing</title>
 
     <qandaset>
@@ -247,9 +247,9 @@
         </answer>
       </qandaentry>
     </qandaset>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Questions about editor</title>
 
     <qandaset>
@@ -341,9 +341,9 @@
         </answer>
       </qandaentry>
     </qandaset>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>WinMerge as external compare or diff-tool</title>
 
     <qandaset>
@@ -407,9 +407,9 @@
         </answer>
       </qandaentry>
     </qandaset>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Archive support</title>
 
     <qandaset>
@@ -474,9 +474,9 @@
         </answer>
       </qandaentry>
     </qandaset>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Text encoding (codepages)</title>
 
     <qandaset>
@@ -579,9 +579,9 @@
         </answer>
       </qandaentry>
     </qandaset>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Patch files</title>
 
     <qandaset>
@@ -615,5 +615,5 @@
     </qandaset>
 
     <para></para>
-  </sect2>
-</sect1>
\ No newline at end of file
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Filters.xml
===================================================================
--- trunk/Docs/Users/Manual/Filters.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Filters.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Filters">
+<article id="Filters">
   <title>Filters</title>
 
   <para>There are two kinds of filters in WinMerge: file filters for filtering
   files and folders in folder compare and line filters for ignoring lines from
   files before comparing.</para>
 
-  <sect2>
+  <section>
     <title>Regular expressions</title>
 
     <para>Filters are based on regular expressions (regexps). Each line filter
@@ -21,7 +21,7 @@
     regular expression engine. There are lots of resources for help with Perl
     regular expression.</para>
 
-    <sect3>
+    <section>
       <title>Help with regexps</title>
 
       <para>There are many guides and help sites in Web, for example:</para>
@@ -63,10 +63,10 @@
           </listitem>
         </varlistentry>
       </variablelist>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>File filters</title>
 
     <para>A file filter is a set of rules saved to one file. Every file and
@@ -97,7 +97,7 @@
     one does not care about the file, WinMerge tries to minimize the effort
     and time for the file.</para>
 
-    <sect3>
+    <section>
       <title>Filter files</title>
 
       <para>Filter files are normal text files, with an extension of <filename
@@ -237,10 +237,10 @@
       character (space or tabulator) and comment-marker
       (<constant>##</constant>). <constant>##</constant> can be used as part
       of rule if there is no whitespace character before it.</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Line filters</title>
 
     <para>Line filters can be used to ignore single lines from compared files.
@@ -327,5 +327,5 @@
 
       <screen>^#</screen>
     </example>
-  </sect2>
-</sect1>
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Install.xml
===================================================================
--- trunk/Docs/Users/Manual/Install.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Install.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Installing">
+<article id="Installing">
   <title>Getting and installing WinMerge</title>
 
   <para>WinMerge can be installed using the installer or by unzipping files from an archive. Using the installer is the recommended method.</para>
@@ -8,13 +8,13 @@
     <para>Currently the WinMerge installer works natively only for 32-bit Windows. There is no separate version of WinMerge for 64-bit Windows (WinXP/2003/Vista). 64-bit Windows versions can run the installer and WinMerge as 32-bit applications. For the shell Integration, the installer includes the 64-bit version of the extension.</para>
   </note>
 
-  <sect2>
+  <section>
     <title>Getting files</title>
 
     <para>The latest release can be always downloaded from the WinMerge home page: <ulink url="http://winmerge.org/">WinMerge.org</ulink>. Note that delays can occur in updating home pages for the latest releases, but the project status page at <ulink url="https://sourceforge.net/projects/winmerge/">SourceForge.net</ulink> shows the latest files. There is also a mailing list for release announcements. Stable releases are also available in several file download sites.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Using the installer (recommended)</title>
 
     <note>
@@ -164,9 +164,9 @@
         <simpara>After the installer has copied files, the final screen appears. Using the two check boxes, confirm whether the created WinMerge Start menu folder should be opened, and whether the WinMerge application should be started.</simpara>
       </listitem>
     </orderedlist>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title id="InstallFromArchive">Installing from an archive</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>
@@ -180,9 +180,9 @@
     <para>Archive files have the correct folder structure. WinMerge should be unzipped preserving this folder structure in the destination folder. For example, the root folder created under <filename class="directory">C:\Program Files\</filename> has the name, <filename class="directory">WinMerge-<replaceable>version</replaceable></filename> (for example, <filename class="directory">WinMerge-2.6.0</filename>). You can rename this folder or copy its files to another folder (preserving the folder structure!).</para>
 
     <para>After the files are unzipped, WinMerge is ready to run! Shell integration and archive integration may need additional steps, as described in the next section.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Shell integration</title>
 
     <para>The installer enables shell integration when you choose the <guilabel>Enable Explorer context menu integration</guilabel> option in the Select Additional Tasks page. If you do not use the install program: you must register the shell integration DLL (<filename>ShellExtension*.dll</filename>) separately.</para>
@@ -195,16 +195,16 @@
 
     <para>To register the shell integration DLL (<filename>ShellExtension*.dll</filename>), run <filename>register.bat</filename> from the WinMerge directory. We recommend that you restart the computer after installing shell integration, so that Windows updates all its references.</para>
 
-    <sect3>
+    <section>
       <title>64-bit shell integration</title>
 
       <para>Starting with Version 2.6, WinMerge supports 64-bit Windows versions by including 64-bit shell integration. The WinMerge installer recognizes 64-bit versions of Windows and can install the correct shell integration version.</para>
 
       <para>When you install shell integration manually from an archive file, the shell integration DLL is named <filename>ShellExtensionX64.dll</filename>. You can register and unregister this file by using <filename>register.bat</filename> and <filename>unregister.bat</filename>, as with 32-bit versions.</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>installing archive support</primary>
       </indexterm>7-Zip and archive support</title>
@@ -227,7 +227,7 @@
         <guimenuitem>Archive Support Disabled</guimenuitem>
       </menuchoice>.</para>
 
-    <sect3 id="Install_merge7zinstaller">
+    <section id="Install_merge7zinstaller">
       <title>Merge7zInstaller</title>
 
       <para><filename>Merge7zInstaller</filename> is a stand-alone installer for 7-Zip integration.</para>
@@ -289,6 +289,6 @@
             </variablelist>
           </listitem>
         </orderedlist></para>
-    </sect3>
-  </sect2>
-</sect1>
+    </section>
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Intro_diffs.xml
===================================================================
--- trunk/Docs/Users/Manual/Intro_diffs.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Intro_diffs.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="IntroDiff">
+<article id="IntroDiff">
   <title>Overview of file comparing and merging</title>
 
   <para>This topic describes how WinMerge detects and displays differences within files, and demonstrates simple file comparing and merging operations.</para>
 
-  <sect2>
+  <section>
     <title>Comparing files</title>
 
     <para>If you compare two files, you can easily identify several types of differences: different characters and words, different lines, even entire blocks of text that are different. But trying understanding all the differences between two files by scanning them in your favorite editor can be tedious and error-prone. Specialized difference/merging tools like WinMerge can make this work much easier and more efficient.</para>
@@ -15,7 +15,7 @@
 
     <para>It's easy to identify individual lines that are different. But sometimes it is useful to treat an entire block of lines that are different as a single difference, instead of comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too.</para>
 
-    <sect3>
+    <section>
       <title>Simple compare operation</title>
 
       <para>This section offers a simple example that demonstrates how to compare line difference between two files in WinMerge:</para>
@@ -164,10 +164,10 @@
           <para>You have reached the end of the file and had a chance to examine every difference. This was a trivial example — there were only two differences, and there are other ways to compare differences in WinMerge — but it demonstrates the efficiency of using the WinMerge navigation controls.</para>
         </listitem>
       </orderedlist>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Merging files</title>
 
     <para>The purpose of merging is to combine changes from two files into one file. Merging concepts and functions build on the comparing operation: please read the preceding section before beginning this section. In addition to detecting differences between two file versions, we resolve the differences and save the result in a single <glossterm>target</glossterm> version.</para>
@@ -180,7 +180,7 @@
 
     <para>Just as with comparing, you use WinMerge's toolbar controls (or keyboard shortcuts) to systematically step through each difference. Resolve each difference by copying either its left or right <glossterm>candidate</glossterm> to the other side. When you have resolved all the differences, WinMerge lets you know that all differences are resolved (the versions are identical), and you are done merging.</para>
 
-    <sect3>
+    <section>
       <title>Simple merge operation</title>
 
       <para>This short exercise demonstrates how use the controls in the File Compare window to merge the simple files shown earlier, in only a few steps:</para>
@@ -262,9 +262,9 @@
             </keycombo> to save your changes.</para>
         </listitem>
       </orderedlist>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Choosing a merge result file</title>
 
       <para>You control where your merge result is preserved. The WinMerge Compare window does not have a separate result pane, unlike some merge tools. So the simplest strategy is to save your changes in one or both source files. Press <keycombo>
@@ -288,6 +288,6 @@
         </menuchoice>. For example, your target file might be the difference or conflict file generated by a version control system.</para>
 
       <para>Similarly, in the WinMerge command line, you can leave both source versions unchanged by using the optional <option>outputfile</option> argument, as described in <link linkend="CommandLine">Command Line</link>.</para>
-    </sect3>
-  </sect2>
-</sect1>
+    </section>
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Locales.xml
===================================================================
--- trunk/Docs/Users/Manual/Locales.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Locales.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Locales">
+<article id="Locales">
   <title>Locale support</title>
 
   <para>WinMerge allows translating the user interface to other languages than
@@ -118,7 +118,7 @@
     Panel.)</para>
   </note>
 
-  <sect2>
+  <section>
     <title>Selecting language</title>
 
     <para>In order to change the current user interface language, do the
@@ -142,9 +142,9 @@
 
     <para>Note that the WinMerge user interface instantly updates to the
     selected language.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Installing translation</title>
 
     <para>The easiest way to install translations is to select them in the
@@ -193,18 +193,18 @@
           <guibutton>OK</guibutton></simpara>
         </listitem>
       </orderedlist></para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Reporting error in translation</title>
 
     <para>Please submit errors you find in translations as bugs to our <ulink
     url="http://sourceforge.net/tracker/?group_id=13216&amp;atid=113216">bug-list</ulink>.
     It would be great if you can provide a corrected version of the translated
     text also.</para>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title>Submitting a new translation</title>
 
     <para>If you would like to add your language to the list, look at the
@@ -216,5 +216,5 @@
     from above link. And if you have problems ask help from us in one of
     <ulink url="http://sourceforge.net/forum/?group_id=13216">WinMerge
     forums</ulink>.</para>
-  </sect2>
-</sect1>
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Open_paths.xml
===================================================================
--- trunk/Docs/Users/Manual/Open_paths.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Open_paths.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="OpenPaths">
+<article id="OpenPaths">
   <title>Opening Files and Folders</title>
 
   <para>WinMerge allows selecting/opening paths in several ways. Using
   Open-dialog is just one of them.</para>
 
-  <sect2>
+  <section>
     <title>Open-Dialog</title>
 
     <para>Basic use of Open-dialog is described in <link
     linkend="QuickStart">Quick start</link>. Here is some more detailed
     information and tips about how to use Open-dialog more efficiently.</para>
 
-    <sect3>
+    <section>
       <title>Environment variables</title>
 
       <para>Environment variables can be used as (part of) paths. An
@@ -27,9 +27,9 @@
         <envar>%WORKDIR%\project1</envar> is expanded to path <filename
         class="directory">c:\workfiles\project1</filename> .</para>
       </example>
-    </sect3>
+    </section>
 
-    <sect3 id="OpeningArchives">
+    <section id="OpeningArchives">
       <title>Opening archive files</title>
 
       <para>Archive file support requires 7-Zip plugin to be installed. See
@@ -55,9 +55,9 @@
         automatically copy the same filename to both sides and open the
         archive file.</para>
       </tip>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Filter selection</title>
 
       <para>Third edit field in <guilabel>Open</guilabel> dialog is for
@@ -93,10 +93,10 @@
         WinMerge selects all files (i.e. uses <filename>*.*</filename> as
         extension list).</para>
       </note>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Shell Integration</primary>
       </indexterm>Shell Integration</title>
@@ -124,7 +124,7 @@
         <caption><para>Simple WinMerge context menu</para></caption>
       </mediaobject></para>
 
-    <sect3>
+    <section>
       <title>Advanced Shell Integration</title>
 
       <para>Selecting "<guilabel>Enable advanced menu</guilabel>" for Shell
@@ -182,9 +182,9 @@
         when you need to compare one file/folder against several
         files/folders.</para>
       </tip>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Including Subfolders</title>
 
       <para>Shell Integration by default does not include subfolders into
@@ -193,10 +193,10 @@
       behavior can be also changed by holding down <keycap>Control</keycap>
       -key while selecting <guimenuitem>Compare</guimenuitem>-item from the
       Explorer context menu.</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Drag and Drop</primary>
       </indexterm>Drag and Drop</title>
@@ -231,9 +231,9 @@
         empty</simpara>
       </listitem>
     </itemizedlist>
-  </sect2>
+  </section>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Project Files</primary>
       </indexterm>Project Files</title>
@@ -242,7 +242,7 @@
     (and filter). The user can easily save currently open paths as project
     file for later use.</para>
 
-    <sect3>
+    <section>
       <title>Opening Project File</title>
 
       <para>Project file can be given to command line like normal file or
@@ -280,9 +280,9 @@
           are compared.</simpara>
         </listitem>
       </itemizedlist>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Editing and Saving Project File</title>
 
       <para>Project files can be edited and saved using <guilabel>Project
@@ -302,9 +302,9 @@
 
         <caption><para>Project File -dialog</para></caption>
       </mediaobject>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Format</title>
 
       <para>Project files are simple XML files with <filename
@@ -361,6 +361,6 @@
 
       <para>None of the fields are required and they can be empty
       (<literal>&lt;left&gt;&lt;/left&gt;</literal>).</para>
-    </sect3>
-  </sect2>
-</sect1>
\ No newline at end of file
+    </section>
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Plugins.xml
===================================================================
--- trunk/Docs/Users/Manual/Plugins.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Plugins.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Plugins">
+<article id="Plugins">
   <title>Plugins</title>
 
   <para>Plugins are extra-features for WinMerge. They are not included in the
@@ -26,14 +26,14 @@
     </listitem>
   </itemizedlist>
 
-  <sect2>
+  <section>
     <title>Three categories of plugins</title>
 
     <para>"<guilabel>Plugins</guilabel>" is a generic name for extra-feature
     dll or scriptlets. Plugins features are spread over three
     categories:</para>
 
-    <sect3>
+    <section>
       <title>Editor complement</title>
 
       <para>Operate custom operations on the currently selected text from the
@@ -42,9 +42,9 @@
       <para>Example plugin: <link linkend="EditorAddin"><filename>editor
       addin.sct</filename></link> (Turn the selection to UPPER CASE or lower
       case.)</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Unpacker - Transform a file to a text format</title>
 
       <para>The plugin transform a file in a viewable format (for example,
@@ -71,9 +71,9 @@
       linkend="DisplayXMLFiles"><filename>DisplayXMLFiles.dll</filename></link>
       (Display XML files nicely, by consistently inserting tabs and
       linebreaks.)</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Prediffer - Preprocess files to hide some differences</title>
 
       <para>The plugin is not apply to the files displayed in the editor. It
@@ -84,13 +84,13 @@
       linkend="IgnoreColumns"><filename>IgnoreColumns.dll</filename></link>
       (Ignore the differences inside given columns, while displaying the
       characters in these columns.)</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Select and apply a plugin</title>
 
-    <sect3>
+    <section>
       <title>"<guilabel>Suggested plugin</guilabel>" and "<guilabel>Automatic
       mode</guilabel>"</title>
 
@@ -109,15 +109,15 @@
         "<guimenuitem>Auto prediffer</guimenuitem>" are two separate options.
         There is no option for editor complements.</para>
       </note>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Editor complement in folder view</title>
 
       <para><emphasis>Not available</emphasis></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Editor complement in editor view</title>
 
       <para>Access list from <menuchoice>
@@ -127,9 +127,9 @@
 
           <guimenuitem>...</guimenuitem>
         </menuchoice> in the main menu.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Unpacker in folder view</title>
 
       <para>Check <menuchoice>
@@ -139,9 +139,9 @@
         </menuchoice> in the main menu. You need to update the results
       (<keycap>F5</keycap>). Each file is loaded again with its suggested
       unpacker and compared.</para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Unpacker in editor view</title>
 
       <orderedlist>
@@ -177,9 +177,9 @@
           view.</para>
         </listitem>
       </orderedlist>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Prediffer in folder view</title>
 
       <para>When the files are selected, right-click to open the context menu.
@@ -199,9 +199,9 @@
         non-recursive compare, the mode is always reset to "<guimenuitem>No
         prediffer</guimenuitem>".</para>
       </note>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title>Prediffer in editor view</title>
 
       <orderedlist>
@@ -225,13 +225,13 @@
           compared again after the selection, you don't need to rescan.</para>
         </listitem>
       </orderedlist>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Available plugins</title>
 
-    <sect3>
+    <section>
       <title><filename>CompareMSExcelFiles.dll</filename></title>
 
       <para>Displays the text content of a <trademark
@@ -261,9 +261,9 @@
             library</link></seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><filename>CompareMSWordFiles.dll</filename></title>
 
       <para>Displays the text content of a <trademark
@@ -293,9 +293,9 @@
             runtime library</link></seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3 id="DisplayXMLFiles">
+    <section id="DisplayXMLFiles">
       <title><filename>DisplayXMLFiles.dll</filename></title>
 
       <para>This plugin display XML files nicely, by consistently inserting
@@ -317,9 +317,9 @@
             <seg>No</seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3 id="EditorAddin">
+    <section id="EditorAddin">
       <title><filename>editor addin.sct</filename></title>
 
       <para>Add two functions to the <menuchoice>
@@ -347,9 +347,9 @@
             <seg>Editor complement</seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3 id="IgnoreColumns">
+    <section id="IgnoreColumns">
       <title><filename>IgnoreColumns.dll</filename></title>
 
       <para>The plugin ignore the characters at specified columns. It does not
@@ -414,9 +414,9 @@
             <seg><filename class="extension">*.txt</filename></seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><filename>IgnoreCommentsC.dll</filename></title>
 
       <para>The plugin ignores comments (<constant>//</constant>... and
@@ -440,9 +440,9 @@
             class="extension">*.js</filename>,</seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><filename>IgnoreFieldsComma.dll</filename></title>
 
       <para>The plugin is for files with fields and <emphasis>comma</emphasis>
@@ -463,9 +463,9 @@
             <seg><filename class="extension">*.csv</filename></seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><filename>IgnoreFieldsTab.dll</filename></title>
 
       <para>The plugin is for files with fields and
@@ -488,9 +488,9 @@
             <seg><filename class="extension">*.txt</filename></seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><filename>IgnoreLeadingLineNumbers.dll</filename></title>
 
       <para>This plugin ignores the leading line numbers in text files (for
@@ -512,9 +512,9 @@
             Basic</application> runtime library</link></seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><filename>insert datetime.sct</filename></title>
 
       <para>Add two functions to the <menuchoice>
@@ -542,9 +542,9 @@
             <seg>Editor complement</seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><filename>RCLocalizationHelper.dll</filename>,
       <filename>RCLocalizationHelperU.dll</filename></title>
 
@@ -566,9 +566,9 @@
             <seg><filename class="extension">*.rc</filename></seg>
           </seglistitem>
         </segmentedlist></para>
-    </sect3>
+    </section>
 
-    <sect3>
+    <section>
       <title><filename>WatchBeginningOfLog.dll</filename>,
       <filename>WatchEndOfLog.dll</filename></title>
 
@@ -606,13 +606,13 @@
       <para>Developers may find information and code of examples in the source
       package, under the folder "<filename
       class="directory">Plugins</filename>".</para>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Requirements</title>
 
-    <sect3>
+    <section>
       <title>Windows Script Host</title>
 
       <para>Some editor complements need this optional component from
@@ -625,9 +625,9 @@
       <ulink
       url="http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp">MSDN
       Library</ulink>.</para>
-    </sect3>
+    </section>
 
-    <sect3 id="MSVBVM60">
+    <section id="MSVBVM60">
       <title><application>Visual Basic</application> runtime library</title>
 
       <para>Some plugins require <application>Visual Basic</application>
@@ -640,6 +640,6 @@
       Redistribution Pack</ulink> from <trademark
       class="registered">Microsoft</trademark>. If you don't need the plugin,
       you can safely remove it.</para>
-    </sect3>
-  </sect2>
-</sect1>
+    </section>
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Quick_start.xml
===================================================================
--- trunk/Docs/Users/Manual/Quick_start.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Quick_start.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="QuickStart">
+<article id="QuickStart">
   <title>Quick start</title>
 
-  <sect2>
+  <section>
     <title><indexterm>
         <primary>Open dialog</primary>
       </indexterm>Opening files and folders</title>
@@ -165,7 +165,7 @@
       </listitem>
     </orderedlist>
 
-    <sect3>
+    <section>
       <title>Other ways to open files and folders</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>
@@ -211,10 +211,10 @@
           <simpara>You can drag and drop files and folders directly into the WinMerge window or on the WinMerge desktop shortcut.</simpara>
         </listitem>
       </itemizedlist>
-    </sect3>
-  </sect2>
+    </section>
+  </section>
 
-  <sect2>
+  <section>
     <title>Comparing folders</title>
 
     <para><inlinemediaobject>
@@ -260,9 +260,9 @@
       </inlinemediaobject> up arrow at the top of the Filename column.</para>
 
     <para>If you compare a file, WinMerge opens File Compare window with a new tab, as shown in the figure in the next section. Then, if you make changes in the File Compare window, the file's data is updated in the Folder Compare window.</para>
-  </sect2>
+  </section>
 
-  <sect2 id="QuickStart_comparingfiles">
+  <section id="QuickStart_comparingfiles">
     <title>Comparing files</title>
 
     <para><inlinemediaobject>
@@ -290,5 +290,5 @@
           <phrase>Refresh button</phrase>
         </textobject>
       </inlinemediaobject> toolbar button, or pressing <keycap>F5</keycap>.</para>
-  </sect2>
-</sect1>
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Text_encoding.xml
===================================================================
--- trunk/Docs/Users/Manual/Text_encoding.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Text_encoding.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,6 +1,6 @@
-<sect1 id="TextEncoding">
+<article id="TextEncoding">
   <title>Text Encoding (codepages)</title>
-  <sect2>
+  <section>
     <title>Common scenarios</title>
     <orderedlist>
       <listitem>
@@ -31,8 +31,8 @@
         <para>You should use <filename>WinMergeU.exe</filename> (if you are on NT/2000/XP/2003) in order to correctly display double-wide characters. See the Font section for font recommendations. If you are on Win95/98/ME, then you may attempt to view the files in <filename>WinMerge.exe</filename>, but it is recommended that you do not attempt to merge them.</para>
       </listitem>
     </orderedlist>
-  </sect2>
-  <sect2>
+  </section>
+  <section>
     <title>Explanation</title>
     <para>Characters (such as "a" or "1" or "&amp;") are represented by computers as numbers, and there is more than one way to do this. A text encoding method is a way to encode the characters into the numbers (bytes) of which a file is comprised. There are four main text encoding families:</para>
     <itemizedlist>
@@ -76,5 +76,5 @@
         <para>Each character may be one, two, three, four, five, or six bytes in the file. This supports the full range of Unicode 3.x.</para>
       </listitem>
     </itemizedlist>
-  </sect2>
-</sect1>
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/Version_control.xml
===================================================================
--- trunk/Docs/Users/Manual/Version_control.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Version_control.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="VersionControl">
+<article id="VersionControl">
   <title>Version control integration</title>
 
   <para>WinMerge provides basic integration with Visual SourceSafe and
@@ -13,7 +13,7 @@
   version control integration is enabled WinMerge assumes file is version
   controlled and shows checkout dialog.</para>
 
-  <sect2>
+  <section>
     <title>Visual SourceSafe</title>
 
     <para>To enable Visual SourceSafe integration for version controlled
@@ -96,5 +96,5 @@
         <para>Your connection to the VSS server computer may be hosed</para>
       </listitem>
     </itemizedlist>
-  </sect2>
-</sect1>
+  </section>
+</article>

Modified: trunk/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- trunk/Docs/Users/Manual/WinMerge_help.xml	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/WinMerge_help.xml	2008-07-09 08:05:00 UTC (rev 5578)
@@ -19,8 +19,8 @@
 <!ENTITY FAQ SYSTEM "Faq.xml">
 <!ENTITY ShortCuts SYSTEM "Shortcut_keys.xml">
 ]>
-<article id="index">
-  <articleinfo>
+<book id="index">
+  <bookinfo>
     <title>WinMerge 2.8 Manual</title>
 
     <productname>WinMerge</productname>
@@ -75,7 +75,7 @@
         <contrib>and all others who helped with this.</contrib>
       </author>
     </authorgroup>
-  </articleinfo>
+  </bookinfo>
 
   &AboutDoc;
 
@@ -112,4 +112,4 @@
   &ShortCuts;
 
   <index id="word_index"/>
-</article>
+</book>

Modified: trunk/Docs/Users/Manual/build/build_html.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_html.xsl	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/build/build_html.xsl	2008-07-09 08:05:00 UTC (rev 5578)
@@ -12,7 +12,10 @@
   <xsl:param name="section.autolabel" select="1"/>
   <xsl:param name="use.id.as.filename" select="1"/>
   <xsl:param name="chunker.output.indent" select="'yes'"></xsl:param>
-  <xsl:param name="chunk.first.sections" select="1" />
+<!--  <xsl:param name="chunk.first.sections" select="1" /> -->
+  <xsl:param name="chunk.section.depth" select="0" />
+  <xsl:param name="generate.toc">book toc,title article noop</xsl:param>
+  <xsl:param name="toc.section.depth">1</xsl:param>
   <xsl:template name="user.head.content">
     <link rel="stylesheet" type="text/css" href="css/all.css" />
     <link rel="stylesheet" type="text/css" media="print" href="css/print.css" />

Modified: trunk/Docs/Users/Manual/build/build_htmlhelp.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_htmlhelp.xsl	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/build/build_htmlhelp.xsl	2008-07-09 08:05:00 UTC (rev 5578)
@@ -12,6 +12,7 @@
   <xsl:param name="html.stylesheet">css/help.css</xsl:param>
   <xsl:param name="use.id.as.filename" select="1"/>
   <xsl:param name="chunker.output.indent" select="'yes'"></xsl:param>
+  <xsl:param name="chunk.section.depth" select="0" />
   <xsl:param name="htmlhelp.use.hhk" select="1"/>
   <xsl:param name="htmlhelp.hhc.show.root" select="0"/>
 </xsl:stylesheet>

Modified: trunk/Docs/Users/Manual/css/all.css
===================================================================
--- trunk/Docs/Users/Manual/css/all.css	2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/css/all.css	2008-07-09 08:05:00 UTC (rev 5578)
@@ -34,13 +34,32 @@
   border-bottom: 1px solid black;
 }
 
+div.navheader>table>tbody>tr>th {
+  display:none;
+}
+
 div.article,
-div.sect1,
+div.section,
 div.appendix,
 div.index {
   padding: 5px;
 }
 
+/* topic title */
+div.article>div>div>div>h2 {
+  font-size: 160%;
+  text-align: center;
+  color: #3333cc;
+}
+
+div.section h2 {
+  font-size: 140%;
+}
+
+div.section h3 {
+  font-size: 120%;
+}
+
 #ads {
   padding-top: 10px;
   text-align: center;
@@ -157,9 +176,10 @@
   margin-top: 0;
 }
 
-.toc .sect1,
+/*.toc .sect1,*/
+.toc .article,
 .toc .appendix,
 .toc .index {
   font-size: 120%;
   font-weight: bold;
-}
\ No newline at end of file
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.