[Winmerge-svn] SF.net SVN: winmerge: [3637] trunk/Docs/Users/Manual

[<ki...@us...>]

Revision: 3637
          http://svn.sourceforge.net/winmerge/?rev=3637&view=rev
Author:   kimmov
Date:     2006-09-25 13:49:08 -0700 (Mon, 25 Sep 2006)

Log Message:
-----------
PATCH: [ 1564535 ] Manual: New folder compare screenshot

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

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

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

Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt	2006-09-25 18:37:15 UTC (rev 3636)
+++ trunk/Docs/Users/Manual/Changes.txt	2006-09-25 20:49:08 UTC (rev 3637)
@@ -1,3 +1,9 @@
+2006-09-25 Kimmo
+ PATCH: [ 1564535 ] Manual: New folder compare screenshot
+  Manual: Compare_dirs.xml Quick_start.xml
+  Manual/screenshots new file: foldercomp1.png
+  Manual/screenshots deleted file: dircomp1.gif
+
 2006-09-14 Tim
  PATCH: [ 1558909 ] Manual: New <screen> layout (XSL)
   Manual/css: all.css help.css print.css

Modified: trunk/Docs/Users/Manual/Compare_dirs.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_dirs.xml	2006-09-25 18:37:15 UTC (rev 3636)
+++ trunk/Docs/Users/Manual/Compare_dirs.xml	2006-09-25 20:49:08 UTC (rev 3637)
@@ -9,7 +9,7 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata fileref="screenshots/dircomp1.gif" format="GIF" />
+      <imagedata fileref="screenshots/foldercomp1.png" format="PNG" />
     </imageobject>
   </mediaobject>
 
@@ -42,15 +42,15 @@
       </listitem>
     </itemizedlist></para>
 
-  <para>WinMerge 2.4 is finally capable to compare large binary files. There
-  is new <guilabel>Compare by Quick Contents</guilabel> -compare method which
-  makes it possible. For more information about different compare methods see
+  <para>In WinMerge version 2.4 and later there is a <guilabel>Compare by
+  Quick Contents</guilabel> -compare method which makes possible to compare
+  big binary files. For more information about different compare methods see
   <link linkend="Configuration">Options &amp; configuration</link> -chapter.
-  In WinMerge 2.4 all files bigger than 4 MB (megabytes) are automatically
-  compared with Compare by Quick Contents -method. Downsides for this method
-  are that linefilters do not work and there is no difference counts
-  information in folder compare UI. For most cases this should not matter
-  since so big files usually are binary files.</para>
+  In WinMerge version 2.4 and later all files bigger than 4 MB (megabytes) are
+  automatically compared with Compare by Quick Contents -method. Downsides for
+  this method are that linefilters do not work and there is no difference
+  counts information in folder compare UI. For most cases this should not
+  matter since so big files usually are binary files.</para>
 
   <para>For advanced users: If that limit does not feel good (you have lots of
   big text files) it can be changed via registry value: <screen>HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimit</screen>.
@@ -59,6 +59,10 @@
   <sect2>
     <title>Compare Results</title>
 
+    <indexterm>
+      <primary>Folder compare result</primary>
+    </indexterm>
+
     <para>Files and folders are compared and divided into several categories.
     Categories are easy to recognize from these icons:<simplelist>
         <member><inlinemediaobject>
@@ -229,6 +233,10 @@
   <sect2>
     <title>Columns in Folder Compare</title>
 
+    <indexterm>
+      <primary>Folder compare columns</primary>
+    </indexterm>
+
     <para>By default these columns are visible:</para>
 
     <itemizedlist>
@@ -582,6 +590,10 @@
   <sect2>
     <title>Hiding Items</title>
 
+    <indexterm>
+      <primary>Hiding files and folders</primary>
+    </indexterm>
+
     <para>Selected items can be hidden from view using context menu item
     <guimenuitem>Hide Items</guimenuitem>. Hidden items are not shown until
     next refresh is done. All hidden items can be re-shown selecting
@@ -605,4 +617,4 @@
     editing files outside WinMerge. WinMerge 2.4 can refresh just selected
     items. Select <guimenuitem>Refresh</guimenuitem> from context menu.</para>
   </sect2>
-</sect1>
\ No newline at end of file
+</sect1>

Modified: trunk/Docs/Users/Manual/Quick_start.xml
===================================================================
--- trunk/Docs/Users/Manual/Quick_start.xml	2006-09-25 18:37:15 UTC (rev 3636)
+++ trunk/Docs/Users/Manual/Quick_start.xml	2006-09-25 20:49:08 UTC (rev 3637)
@@ -145,7 +145,7 @@
 
     <para><inlinemediaobject>
         <imageobject>
-          <imagedata fileref="screenshots/dircomp1.gif" format="GIF" />
+          <imagedata fileref="screenshots/foldercomp1.png" format="PNG" />
         </imageobject>
       </inlinemediaobject></para>
 

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

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


Property changes on: trunk/Docs/Users/Manual/screenshots/foldercomp1.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.