Thread: [Winmerge-svn] SF.net SVN: winmerge: [3638] branches/R2_6/Docs/Users/Manual
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2006-09-25 20:56:04
|
Revision: 3638 http://svn.sourceforge.net/winmerge/?rev=3638&view=rev Author: kimmov Date: 2006-09-25 13:55:54 -0700 (Mon, 25 Sep 2006) Log Message: ----------- PATCH: [ 1564535 ] Manual: New folder compare screenshot Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Compare_dirs.xml branches/R2_6/Docs/Users/Manual/Quick_start.xml Added Paths: ----------- branches/R2_6/Docs/Users/Manual/screenshots/foldercomp1.png Removed Paths: ------------- branches/R2_6/Docs/Users/Manual/screenshots/dircomp1.gif Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-25 20:49:08 UTC (rev 3637) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-25 20:55:54 UTC (rev 3638) @@ -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: branches/R2_6/Docs/Users/Manual/Compare_dirs.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Compare_dirs.xml 2006-09-25 20:49:08 UTC (rev 3637) +++ branches/R2_6/Docs/Users/Manual/Compare_dirs.xml 2006-09-25 20:55:54 UTC (rev 3638) @@ -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 & 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: branches/R2_6/Docs/Users/Manual/Quick_start.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Quick_start.xml 2006-09-25 20:49:08 UTC (rev 3637) +++ branches/R2_6/Docs/Users/Manual/Quick_start.xml 2006-09-25 20:55:54 UTC (rev 3638) @@ -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: branches/R2_6/Docs/Users/Manual/screenshots/dircomp1.gif =================================================================== (Binary files differ) Added: branches/R2_6/Docs/Users/Manual/screenshots/foldercomp1.png =================================================================== (Binary files differ) Property changes on: branches/R2_6/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. |
From: <ki...@us...> - 2006-09-25 21:55:38
|
Revision: 3641 http://svn.sourceforge.net/winmerge/?rev=3641&view=rev Author: kimmov Date: 2006-09-25 14:55:18 -0700 (Mon, 25 Sep 2006) Log Message: ----------- PATCH: [ 1564623 ] Manual: New screenshots for file compare Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Compare_files.xml branches/R2_6/Docs/Users/Manual/Quick_start.xml Added Paths: ----------- branches/R2_6/Docs/Users/Manual/screenshots/file_headerbar1.png branches/R2_6/Docs/Users/Manual/screenshots/filecomp1.png branches/R2_6/Docs/Users/Manual/screenshots/filecomp_context1.png branches/R2_6/Docs/Users/Manual/screenshots/filecomp_inlinediff.png branches/R2_6/Docs/Users/Manual/screenshots/linediff.png branches/R2_6/Docs/Users/Manual/screenshots/merge_menu.png Removed Paths: ------------- branches/R2_6/Docs/Users/Manual/screenshots/File_headerbar1.gif branches/R2_6/Docs/Users/Manual/screenshots/Merge_menu.gif branches/R2_6/Docs/Users/Manual/screenshots/filecomp1.gif branches/R2_6/Docs/Users/Manual/screenshots/filecomp_context1.gif branches/R2_6/Docs/Users/Manual/screenshots/filecomp_inlinediff.gif branches/R2_6/Docs/Users/Manual/screenshots/linediff.gif Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-25 21:48:44 UTC (rev 3640) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-25 21:55:18 UTC (rev 3641) @@ -3,6 +3,14 @@ Manual: Compare_dirs.xml Quick_start.xml Manual/screenshots new file: foldercomp1.png Manual/screenshots deleted file: dircomp1.gif + PATCH: [ 1564623 ] Manual: New screenshots for file compare + Manual: Compare_files.xml Quick_start.xml + Manual/screenshots new files: file_headerbar1.png filecomp1.png + filecomp_context1.png filecomp_inlinediff1.png linediff.png + merge_menu.png + Manual/screenshots deleted files: File_headerbar1.gif filecomp1.gif + filecomp_context1.gif filecomp_inlinediff.gif linediff.gif + Merge_menu.gif 2006-09-14 Tim PATCH: [ 1558909 ] Manual: New <screen> layout (XSL) Modified: branches/R2_6/Docs/Users/Manual/Compare_files.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-09-25 21:48:44 UTC (rev 3640) +++ branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-09-25 21:55:18 UTC (rev 3641) @@ -3,9 +3,9 @@ <title>Comparing Files</title> <para>File compare window is basically two files opened to editor into two - horizontal panes. Editing files is the big difference between 1.7.1 and - newer versions. Editing allows user to easily do small changes without the - need to open the files to other editor or development environment.</para> + horizontal panes. The editor allows user to do basic file editing inside + WinMerge without needing to open files to external editor program or + devepment environment.</para> <para>WinMerge editor is not comparable to specialized editor programs, but it has basic features like @@ -23,7 +23,7 @@ <mediaobject> <imageobject> - <imagedata fileref="screenshots/filecomp1.gif" format="GIF" /> + <imagedata fileref="screenshots/filecomp1.png" format="PNG" /> </imageobject> </mediaobject> @@ -45,7 +45,7 @@ <para><inlinemediaobject> <imageobject> - <imagedata fileref="screenshots/File_headerbar1.gif" format="GIF" /> + <imagedata fileref="screenshots/file_headerbar1.png" format="PNG" /> </imageobject> </inlinemediaobject></para> @@ -53,15 +53,15 @@ than available space one part of the path is replaced with an ellipsis (...). Headerbar also shows:<itemizedlist> <listitem> - <para>the current active file with sunken border (like in the above - screenshot), the non-active file is shown with flat - headerbar.</para> + <simpara>the current active file with sunken border (like in the + above screenshot), the non-active file is shown with flat + headerbar.</simpara> </listitem> <listitem> - <para>if the file has been modified (has unsaved changes). This is - indicated by adding asterisk (<guilabel>*</guilabel>) before the - filename, like in the screenshot.</para> + <simpara>if the file has been modified (has unsaved changes). This + is indicated by adding asterisk (<guilabel>*</guilabel>) before the + filename, like in the screenshot.</simpara> </listitem> </itemizedlist></para> @@ -84,23 +84,23 @@ <itemizedlist> <listitem> - <para><guilabel>Ln</guilabel> : current linenumber</para> + <simpara><guilabel>Ln</guilabel> : current linenumber</simpara> </listitem> <listitem> - <para><guilabel>Col</guilabel>: current column for cursor and total - number of columns in line</para> + <simpara><guilabel>Col</guilabel>: current column for cursor and total + number of columns in line</simpara> </listitem> <listitem> - <para><guilabel>Ch</guilabel> : current char for cursor and total - number of chars in line</para> + <simpara><guilabel>Ch</guilabel> : current char for cursor and total + number of chars in line</simpara> </listitem> <listitem> - <para><guilabel>EOL</guilabel> : current line EOL style (shown only + <simpara><guilabel>EOL</guilabel> : current line EOL style (shown only when <guilabel>Preserve original EOL chars</guilabel>-option is - enabled)</para> + enabled)</simpara> </listitem> </itemizedlist> @@ -127,19 +127,19 @@ <para>Lower line in statusbar shows current difference and amount of differences. Text can be:<itemizedlist> <listitem> - <para><guilabel>Identical</guilabel> : files are identical there are - no differences</para> + <simpara><guilabel>Identical</guilabel> : files are identical there + are no differences</simpara> </listitem> <listitem> - <para><guilabel>X differences</guilabel> : amount of differences, no - difference is selected</para> + <simpara><guilabel>X differences</guilabel> : amount of differences, + no difference is selected</simpara> </listitem> <listitem> - <para><guilabel>Difference X of Y</guilabel> : amount of differences - (<guilabel>Y</guilabel>) and number of selected difference - (<guilabel>X</guilabel>)</para> + <simpara><guilabel>Difference X of Y</guilabel> : amount of + differences (<guilabel>Y</guilabel>) and number of selected + difference (<guilabel>X</guilabel>)</simpara> </listitem> </itemizedlist></para> </sect2> @@ -147,12 +147,16 @@ <sect2> <title>Difference Navigation</title> + <indexterm> + <primary>Difference navigation (File compare)</primary> + </indexterm> + <para>Difference navigation commands are in <guimenu>Merge</guimenu> menu:</para> <para><inlinemediaobject> <imageobject> - <imagedata fileref="screenshots/Merge_menu.gif" format="GIF" /> + <imagedata fileref="screenshots/merge_menu.png" format="PNG" /> </imageobject> </inlinemediaobject></para> @@ -165,12 +169,12 @@ <itemizedlist> <listitem> - <para>Double-click over difference with mouse</para> + <simpara>Double-click over difference with mouse</simpara> </listitem> <listitem> - <para>Move cursor inside difference and select it with - <guimenuitem>Current Difference</guimenuitem>.</para> + <simpara>Move cursor inside difference and select it with + <guimenuitem>Current Difference</guimenuitem>.</simpara> </listitem> </itemizedlist> </sect3> @@ -195,16 +199,16 @@ <para>This command has two important functions:<itemizedlist> <listitem> - <para>When there is no difference selected and cursor is inside + <simpara>When there is no difference selected and cursor is inside difference, it selects this difference. This is very handy way to - select difference from keyboard.</para> + select difference from keyboard.</simpara> </listitem> <listitem> - <para>When there is selected difference, it scrolls to selected + <simpara>When there is selected difference, it scrolls to selected difference. This is handy if user has scrolled selected difference out of screen. So this allows user to scroll files to see other - contents and quickly return back to selected difference.</para> + contents and quickly return back to selected difference.</simpara> </listitem> </itemizedlist></para> </sect3> @@ -229,6 +233,10 @@ <sect2> <title>Merging Differences</title> + <indexterm> + <primary>Merging differences</primary> + </indexterm> + <para>Merging commands are located in <guimenu>Merge</guimenu>-menu after navigation commands. Basically there are only two types of merging commands - copy difference from right to left and copy difference from @@ -288,19 +296,23 @@ <sect2> <title>Merge Mode</title> + <indexterm> + <primary>Merge mode</primary> + </indexterm> + <para>Merge mode can be enabled from the <guimenu>File</guimenu>-menu. It restores the WinMerge 1.7.1 single keys for difference merging and navigating:</para> <itemizedlist> <listitem> - <para><keycap>Up-</keycap> and <keycap>Down arrow</keycap> keys select - previous and next difference</para> + <simpara><keycap>Up-</keycap> and <keycap>Down arrow</keycap> keys + select previous and next difference</simpara> </listitem> <listitem> - <para><keycap>Left-</keycap> and <keycap>Right arrow</keycap> keys - merge difference to left side or right side.</para> + <simpara><keycap>Left-</keycap> and <keycap>Right arrow</keycap> keys + merge difference to left side or right side.</simpara> </listitem> </itemizedlist> @@ -364,12 +376,13 @@ <sect2> <title>Line Difference Highlight</title> - <para>Maybe the greatest new feature in WinMerge 2.4 is the difference - highlight in all differences of the files.</para> + <para>WinMerge can automatically highlight all differences it finds in + lines. This makes it fast to look through and find differences. See + screenshot below for an example of highlighted differences.</para> <mediaobject> <imageobject> - <imagedata fileref="screenshots/filecomp_inlinediff.gif" /> + <imagedata fileref="screenshots/filecomp_inlinediff.png" format="PNG" /> </imageobject> </mediaobject> @@ -398,15 +411,14 @@ <para>Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines. This feature is - called <guilabel>Highlight File Diff</guilabel>. It is available in + called <guilabel>Select Line Difference</guilabel>. It is available in <guimenu>Edit</guimenu>-menu, toolbar and shortcut key (<keycap>F4</keycap>). In screenshot below there is one difference - highlighted. First time whole difference area in one line is highlighted. - Repeating cycles through individual changed words.</para> + highlighted</para> <mediaobject> <imageobject> - <imagedata fileref="screenshots/linediff.gif" format="GIF" /> + <imagedata fileref="screenshots/linediff.png" format="PNG" /> </imageobject> </mediaobject> </sect2> @@ -419,7 +431,7 @@ <para><inlinemediaobject> <imageobject> - <imagedata fileref="screenshots/filecomp_context1.gif" format="GIF" /> + <imagedata fileref="screenshots/filecomp_context1.png" format="PNG" /> </imageobject> </inlinemediaobject></para> @@ -445,25 +457,25 @@ <itemizedlist> <listitem> - <para>Simplified Chinese texts with the <guilabel>SimSun</guilabel> or - <guilabel>SimHei</guilabel> fixed-width fonts</para> + <simpara>Simplified Chinese texts with the <guilabel>SimSun</guilabel> + or <guilabel>SimHei</guilabel> fixed-width fonts</simpara> </listitem> <listitem> - <para>Traditional Chinese texts with the <guilabel>MingLiU</guilabel> - fixed-width font, or</para> + <simpara>Traditional Chinese texts with the + <guilabel>MingLiU</guilabel> fixed-width font, or</simpara> </listitem> <listitem> - <para>Japanese texts with the <guilabel>MS Gothic</guilabel> or - <guilabel>MS Mincho</guilabel> fixed-width fonts</para> + <simpara>Japanese texts with the <guilabel>MS Gothic</guilabel> or + <guilabel>MS Mincho</guilabel> fixed-width fonts</simpara> </listitem> <listitem> - <para>Korean texts with the <guilabel>GulimChe</guilabel> fixed-width - font (not Gulim as this variant uses proportional-spacing glyphs that - are not centered in grid cells and then poorly aligned in fixed-width - mode)</para> + <simpara>Korean texts with the <guilabel>GulimChe</guilabel> + fixed-width font (not Gulim as this variant uses proportional-spacing + glyphs that are not centered in grid cells and then poorly aligned in + fixed-width mode)</simpara> </listitem> </itemizedlist> </sect2> Modified: branches/R2_6/Docs/Users/Manual/Quick_start.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Quick_start.xml 2006-09-25 21:48:44 UTC (rev 3640) +++ branches/R2_6/Docs/Users/Manual/Quick_start.xml 2006-09-25 21:55:18 UTC (rev 3641) @@ -196,7 +196,7 @@ <para><inlinemediaobject> <imageobject> - <imagedata fileref="screenshots/filecomp1.gif" format="GIF" /> + <imagedata fileref="screenshots/filecomp1.png" format="PNG" /> </imageobject> </inlinemediaobject></para> Deleted: branches/R2_6/Docs/Users/Manual/screenshots/File_headerbar1.gif =================================================================== (Binary files differ) Deleted: branches/R2_6/Docs/Users/Manual/screenshots/Merge_menu.gif =================================================================== (Binary files differ) Added: branches/R2_6/Docs/Users/Manual/screenshots/file_headerbar1.png =================================================================== (Binary files differ) Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/file_headerbar1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/R2_6/Docs/Users/Manual/screenshots/filecomp1.gif =================================================================== (Binary files differ) Added: branches/R2_6/Docs/Users/Manual/screenshots/filecomp1.png =================================================================== (Binary files differ) Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/filecomp1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_context1.gif =================================================================== (Binary files differ) Added: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_context1.png =================================================================== (Binary files differ) Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_context1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_inlinediff.gif =================================================================== (Binary files differ) Added: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_inlinediff.png =================================================================== (Binary files differ) Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_inlinediff.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/R2_6/Docs/Users/Manual/screenshots/linediff.gif =================================================================== (Binary files differ) Added: branches/R2_6/Docs/Users/Manual/screenshots/linediff.png =================================================================== (Binary files differ) Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/linediff.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/R2_6/Docs/Users/Manual/screenshots/merge_menu.png =================================================================== (Binary files differ) Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/merge_menu.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. |
From: <ki...@us...> - 2006-09-29 15:23:18
|
Revision: 3656 http://svn.sourceforge.net/winmerge/?rev=3656&view=rev Author: kimmov Date: 2006-09-29 08:23:12 -0700 (Fri, 29 Sep 2006) Log Message: ----------- PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Install.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 15:21:11 UTC (rev 3655) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 15:23:12 UTC (rev 3656) @@ -1,3 +1,7 @@ +2006-09-29 Kimmo + PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing + Manual: Install.xml + 2006-09-25 Kimmo PATCH: [ 1564535 ] Manual: New folder compare screenshot Manual: Compare_dirs.xml Quick_start.xml Modified: branches/R2_6/Docs/Users/Manual/Install.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Install.xml 2006-09-29 15:21:11 UTC (rev 3655) +++ branches/R2_6/Docs/Users/Manual/Install.xml 2006-09-29 15:23:12 UTC (rev 3656) @@ -1,29 +1,38 @@ <?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>Currently WinMerge installer works for natively for 32-bit Windows. + There is no separate version for 64-bit Windows (WinXP/2003/Vista) but those + can run installer and WinMerge as 32-bit application. However there is + 64-bit version of Shell Integration included in 32-bit installer. So Shell + Integration works in 64-bit Windows.</para> + <sect2> - <title>Getting files</title> + <title>Getting Files</title> <para>Latest releases can be always downloaded from WinMerge homepage: <ulink url="http://www.winmerge.org/">WinMerge.org</ulink>. Note that - there may be some delay updating homepages for releases, but project - statuspage at <ulink + 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 latest files. There is also mailing-list for release announcements. - Stable releases are also available in several file download sites.</para> - - <para>WinMerge can be installed using installer or by unzipping files from - archive.</para> + 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 installer (recommended)</title> + <title>Using the Installer (recommended)</title> <note> <para>Installer requires Admin-user priviledges in Windows NT4/2000/XP. If you don't have Admin-user priviledges you can install WinMerge by - unzipping from an archive file (see that section).</para> + unzipping from an archive file (see <link + linkend="InstallingFromArchive">Installing from an + Archive</link>).</para> </note> <para>This is recommended for most users. Installer asks location where @@ -50,7 +59,7 @@ <listitem> <simpara>Select location for WinMerge and select <guibutton>Next</guibutton>-button. It is recommended to install - WinMerge in own directory.</simpara> + WinMerge in own folder.</simpara> </listitem> <listitem> @@ -114,13 +123,23 @@ </listitem> <listitem> + <simpara><guilabel>Integrate with TortoiseSVN</guilabel> - sets + WinMerge to TortoiseSVN diff application.</simpara> + </listitem> + + <listitem> + <simpara><guilabel>Integrate with ClearCase</guilabel> - sets + WinMerge to ClearCase diff and merge application.</simpara> + </listitem> + + <listitem> <simpara><guilabel>Create a Desktop Icon</guilabel> - adds - WinMerge icon to Desktop</simpara> + WinMerge icon to Desktop.</simpara> </listitem> <listitem> <simpara><guilabel>Create a Quick Launch Icon</guilabel> - adds - WinMerge icon to Quick Launch bar</simpara> + WinMerge icon to Quick Launch bar.</simpara> </listitem> </itemizedlist></para> </listitem> @@ -139,7 +158,7 @@ </sect2> <sect2> - <title>Installing from 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. @@ -159,37 +178,53 @@ folder can be renamed or files copied to other folder (preserving folder structure!).</para> - <para>After unzipping files WinMerge is ready to run! ShellExtension and - Archive Integration may need additional steps (see below).</para> + <para>After unzipping files WinMerge is ready to run! Shell Integration + and Archive Integration may need additional steps (see below).</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> + Shell Integration.</para> - <para>If install program is not used, shell integration dll - (<filename>ShellExtension[U].dll</filename>) must be registered - separately. This is done by running <filename>register.bat</filename> from - WinMerge directory. Reboot is recommended after installing so Windows - updates all its references.</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 + <para>Installing shell Integration requires administrative user priviledges.</para> </note> - <para>Updating shell integration outside installer requires first - uninstalling current version. Uninstalling can be done by running - <filename>uninstall.bat</filename> from WinMerge directory. After that - computer should be restarted so Windows completes uninstallation. Then new - version can be installed like described above.</para> + <para>Updating the Shell Integration outside the installer requires first + uninstalling current Shell Intregration 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> + + <sect3> + <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>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> + </sect3> </sect2> <sect2> - <title>7-Zip and archive support</title> + <title>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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-29 15:49:43
|
Revision: 3658 http://svn.sourceforge.net/winmerge/?rev=3658&view=rev Author: kimmov Date: 2006-09-29 08:49:30 -0700 (Fri, 29 Sep 2006) Log Message: ----------- PATCH: [ 1567323 ] Manual: OpenPaths talks about ShellExtension Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Open_paths.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 15:47:56 UTC (rev 3657) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 15:49:30 UTC (rev 3658) @@ -1,6 +1,8 @@ 2006-09-29 Kimmo PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing Manual: Install.xml + PATCH: [ 1567323 ] Manual: OpenPaths talks about ShellExtension + Manual: Open_paths.xml 2006-09-25 Kimmo PATCH: [ 1564535 ] Manual: New folder compare screenshot Modified: branches/R2_6/Docs/Users/Manual/Open_paths.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Open_paths.xml 2006-09-29 15:47:56 UTC (rev 3657) +++ branches/R2_6/Docs/Users/Manual/Open_paths.xml 2006-09-29 15:49:30 UTC (rev 3658) @@ -99,27 +99,32 @@ </sect2> <sect2> - <title>Shell Extension</title> + <title>Shell Integration</title> - <para>Shell extension is convenient way to select paths using Windows - Explorer. Shell Extension must be first enabled from - <guilabel>Options</guilabel>/<guilabel>System</guilabel> before use. When - Shell Extension is enabled item <guimenuitem>WinMerge</guimenuitem> is - added to context menu (click right mouse button over file or folder in - Explorer).</para> + <indexterm> + <primary>Shell Integration</primary> + </indexterm> + <para>The Shell Integration is a convenient way to select the paths using + Windows Explorer. Installer enables Shell Integration if choosen so. Shell + Integration can be enabled or disabled from + <guilabel>Options</guilabel>/<guilabel>System</guilabel>. When the Shell + Integration is enabled item <guimenuitem>WinMerge</guimenuitem> is added + to the Explorer context menu (click right mouse button over file or folder + in Explorer).</para> + <para>WinMerge accepts one or two paths. When one path is selected through - Shell Extension WinMerge places it as "<guilabel>Left</guilabel>" path and - open Open-dialog for user to select "<guilabel>Right</guilabel>" path. + Shell Integration WinMerge places it as "<guilabel>Left</guilabel>" path + and open Open-dialog for user to select "<guilabel>Right</guilabel>" path. Also if two paths are selected but another path couldn't be opened for reason or another WinMerge shows Open-dialog for selecting valid paths.</para> <sect3> - <title>Advanced Shell Extension</title> + <title>Advanced Shell Integration</title> - <para>Selecting "<guilabel>Enable advanced menu</guilabel>" for shell - extension from options adds more choices for path selection. Now + <para>Selecting "<guilabel>Enable advanced menu</guilabel>" for Shell + Integration from options adds more choices for path selection. Now WinMerge adds two menuitems to Explorer context menu: "<guimenuitem>Compare To</guimenuitem>" and "<guimenuitem>Compare...</guimenuitem>". <guimenuitem>Compare @@ -167,9 +172,9 @@ </sect3> <sect3> - <title>Including subfolders</title> + <title>Including Subfolders</title> - <para>Shell Extension by default does not include subfolders into + <para>Shell Integration by default does not include subfolders into comparison. This default behavior can be changed using <guilabel>Include Subfolders by Default</guilabel> option in System options. Default behavior can be also changed by holding down Control -key while This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-29 16:17:45
|
Revision: 3660 http://svn.sourceforge.net/winmerge/?rev=3660&view=rev Author: kimmov Date: 2006-09-29 09:17:28 -0700 (Fri, 29 Sep 2006) Log Message: ----------- PATCH: [ 1567345 ] Manual: Add documentation for location pane Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Compare_files.xml Added Paths: ----------- branches/R2_6/Docs/Users/Manual/screenshots/filecomp_locpane.png Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 16:10:17 UTC (rev 3659) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 16:17:28 UTC (rev 3660) @@ -3,6 +3,9 @@ Manual: Install.xml PATCH: [ 1567323 ] Manual: OpenPaths talks about ShellExtension Manual: Open_paths.xml + PATCH: [ 1567345 ] Manual: Add documentation for location pane + Manual: Compare_files.xml + Manual/screenshots new file: filecomp_locpane.png 2006-09-25 Kimmo PATCH: [ 1564535 ] Manual: New folder compare screenshot Modified: branches/R2_6/Docs/Users/Manual/Compare_files.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-09-29 16:10:17 UTC (rev 3659) +++ branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-09-29 16:17:28 UTC (rev 3660) @@ -424,6 +424,47 @@ </sect2> <sect2> + <title>Location Pane</title> + + <para>Location pane is a handy side-pane showing a overall (difference) + map of files compared.</para> + + <para><inlinemediaobject> + <imageobject> + <imagedata fileref="screenshots/filecomp_locpane.png" format="PNG" /> + </imageobject> + </inlinemediaobject></para> + + <para>Location Pane shows differences as they are located in the files. So + it gives a good overall view for files compared. Location Pane shows + differences with same colors than editor panes. There are different + indicators in Location Pane:</para> + + <itemizedlist> + <listitem> + <simpara>small triangles point to begin of the selected + difference</simpara> + </listitem> + + <listitem> + <simpara>selected difference is shown with different color</simpara> + </listitem> + + <listitem> + <simpara>area visible in editor panes is shown with different + background color</simpara> + </listitem> + </itemizedlist> + + <para>Clicking with mouse in Location Pane moves cursor to place clicked + in file. Right-clicking with mouse opens the context menu with items to + select line to go to. And the visible area locator (area with different + background color) can be used like a scrollbar thumb - after pressing down + the left mouse butto over it it can be dragged upwards and downwards to + scroll the files.</para> + </sect2> + + <sect2> <title>Context Menu</title> <para>File compare context menu contains items for frequently used Added: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_locpane.png =================================================================== (Binary files differ) Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_locpane.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. |
From: <ge...@us...> - 2006-10-02 10:50:48
|
Revision: 3668 http://svn.sourceforge.net/winmerge/?rev=3668&view=rev Author: gerundt Date: 2006-10-02 03:50:38 -0700 (Mon, 02 Oct 2006) Log Message: ----------- PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/build/build_html.bat Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 10:49:20 UTC (rev 3667) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 10:50:38 UTC (rev 3668) @@ -1,3 +1,7 @@ +2006-10-02 Tim + PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument + Manual/build: build_html.bat + 2006-09-29 Kimmo PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing Manual: Install.xml Modified: branches/R2_6/Docs/Users/Manual/build/build_html.bat =================================================================== --- branches/R2_6/Docs/Users/Manual/build/build_html.bat 2006-10-02 10:49:20 UTC (rev 3667) +++ branches/R2_6/Docs/Users/Manual/build/build_html.bat 2006-10-02 10:50:38 UTC (rev 3668) @@ -4,9 +4,23 @@ set docbook_inputfile=..\WinMerge_help.xml set docbook_use_stylesheet=build_html.xsl -if "%1" == "withads" set docbook_use_stylesheet=build_html_withads.xsl set docbook_outputdir=%docbook_build_path%\html +if "%1" == "withads" goto withads +if not "%1" == "" goto withadserror +goto start +:withads +set docbook_use_stylesheet=build_html_withads.xsl +echo ************************************** +echo * The manual includes advertisements * +echo ************************************** +goto start + +:withadserror +echo "%1" is a invalid argument. Please use "withads", if you want advertisements in the manual. +goto end + +:start if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%" echo Copy images... @@ -32,4 +46,5 @@ echo Finished! +:end @echo on \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-10-02 11:06:35
|
Revision: 3670 http://svn.sourceforge.net/winmerge/?rev=3670&view=rev Author: gerundt Date: 2006-10-02 04:06:21 -0700 (Mon, 02 Oct 2006) Log Message: ----------- PATCH: [ 1568945 ] Manual: Use <simpara> for all list items in Whatsnew Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/WinMerge_help.xml Added Paths: ----------- branches/R2_6/Docs/Users/Manual/Whatsnew.xml Removed Paths: ------------- branches/R2_6/Docs/Users/Manual/Whatsnew_2_1.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 11:01:00 UTC (rev 3669) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 11:06:21 UTC (rev 3670) @@ -1,6 +1,9 @@ 2006-10-02 Tim PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument Manual/build: build_html.bat + PATCH: [ 1568945 ] Manual: Use <simpara> for all list items in Whatsnew + Manual: WinMerge_help.xml + Manual renamed file: Whatsnew_2_1.xml to Whatsnew.xml 2006-09-29 Kimmo PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing Copied: branches/R2_6/Docs/Users/Manual/Whatsnew.xml (from rev 3666, branches/R2_6/Docs/Users/Manual/Whatsnew_2_1.xml) =================================================================== --- branches/R2_6/Docs/Users/Manual/Whatsnew.xml (rev 0) +++ branches/R2_6/Docs/Users/Manual/Whatsnew.xml 2006-10-02 11:06:21 UTC (rev 3670) @@ -0,0 +1,387 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sect1 id="Whatsnew"> + <title>What's new in release</title> + + <sect2> + <title>What's new in 2.5</title> + + <para>WinMerge 2.5 is our development version. It contains lots of fixes + and improvements done after 2.4 releases. This list contains few most + important ones:</para> + + <itemizedlist> + <listitem> + <simpara>New icons and splash screen</simpara> + </listitem> + + <listitem> + <simpara>Simpler and auto-closing folder compare progress + bar</simpara> + </listitem> + + <listitem> + <simpara>Line numbers in file compare</simpara> + </listitem> + + <listitem> + <simpara>Word-wrap in file compare</simpara> + </listitem> + + <listitem> + <simpara>GUI for bookmarks in file compare</simpara> + </listitem> + + <listitem> + <simpara>Better character-level difference indication in file + compare</simpara> + </listitem> + + <listitem> + <simpara>New Short size- columns in folder compare</simpara> + </listitem> + + <listitem> + <simpara>Merge difference which has cursor inside it (no need to + select difference first)</simpara> + </listitem> + + <listitem> + <simpara>Improved Project file saving and editing</simpara> + </listitem> + + <listitem> + <simpara>Creating patch file from multiple files (selected in folder + compare)</simpara> + </listitem> + + <listitem> + <simpara>User-defined folder for file filters</simpara> + </listitem> + + <listitem> + <simpara>New folder compare types to compare by sizes or modify + times</simpara> + </listitem> + + <listitem> + <simpara>Renaming items in folder compare</simpara> + </listitem> + </itemizedlist> + </sect2> + + <sect2> + <title>What's new in 2.4</title> + + <para>WinMerge 2.4 is an important update to 2.2. Great new features and + usability improvements. And bug fixes.</para> + + <sect3> + <title>Multi-document support</title> + + <para>Now it is possible to open (after enabled from Options) several + folder- and file-compare windows inside one WinMerge instance. This + changes the way work is done with WinMerge.</para> + </sect3> + + <sect3> + <title>Limit to single-instance</title> + + <para>WinMerge can be now limited to one instance. Opening new files + from commandline, shell extension or external application opens new + windows instead of new instances.</para> + </sect3> + + <sect3> + <title>Active compare paths are shown in WinMerge caption</title> + + <para>This helps when switching between different instances in Task + Manager or in Task Switcher (<keycombo> + <keycap>Alt</keycap> + + <keycap>Tab</keycap> + </keycombo>).</para> + </sect3> + + <sect3> + <title>Improved archive files support</title> + + <para>Archive file support is greatly improved:</para> + + <itemizedlist> + <listitem> + <simpara>Archive files can be opened from folder compare</simpara> + </listitem> + + <listitem> + <simpara>WinMerge can (optionally) detect archive files from file + signature. This allows for example Open Office files to be detected + as archive files and opened.</simpara> + </listitem> + + <listitem> + <simpara>Path to archive file and path inside archive is shown instead + of path to temporary folder</simpara> + </listitem> + </itemizedlist> + </sect3> + + <sect3> + <title>Faster folder compare</title> + + <para>Lots of important improvements have been implemented:</para> + + <itemizedlist> + <listitem> + <simpara>New <guilabel>Quick Contents</guilabel> -compare methdod + allows faster compares</simpara> + </listitem> + + <listitem> + <simpara>Available memory does not anymore restrict maximun + filesize</simpara> + </listitem> + + <listitem> + <simpara>Compare statepane shows progressbar and compared/total amount + of items</simpara> + </listitem> + + <listitem> + <simpara>Possible to re-compare only selected items (from context + menu)</simpara> + </listitem> + + <listitem> + <simpara>Items can be hidden from view</simpara> + </listitem> + + <listitem> + <simpara>Simple reports</simpara> + </listitem> + </itemizedlist> + </sect3> + + <sect3> + <title>More usable file compare</title> + + <para>Showing line difference for all diffs (enabled from View-menu) is + the most important change. Others include:</para> + + <itemizedlist> + <listitem> + <simpara>Character difference highlighting (more fine-grained + differences)</simpara> + </listitem> + + <listitem> + <simpara>Selecting syntax highligh colors</simpara> + </listitem> + + <listitem> + <simpara>Merge all selected differences with normal merge commands + (separate commands removed)</simpara> + </listitem> + + <listitem> + <simpara>Opening files to external editor from file compare</simpara> + </listitem> + + <listitem> + <simpara>Punctuation characters can break diffs in line differences (so + numbers separated by commas get properly highlighted as + diffs)</simpara> + </listitem> + </itemizedlist> + </sect3> + + <sect3> + <title>Project files user interface</title> + + <para>Project files can be loaded from menu <menuchoice> + <guimenu>File</guimenu> + + <guimenuitem>Open Project...</guimenuitem> + </menuchoice>. And project files can be saved from + <guilabel>Open</guilabel> dialog.</para> + </sect3> + </sect2> + + <sect2> + <title>What's new in 2.2</title> + + <para>WinMerge 2.2 is distributed with an ANSI executable + (<filename>WinMerge.exe</filename>) for Windows 95/98/ME, and a Unicode + executable (<filename>WinMergeU.exe</filename>) for Windows NT /200/XP. + The unicode executable supports UCS-2 and UTF-8 files and + filenames.</para> + + <note> + <para>It is unfortunate that two executable files are needed. But there + is no current way to get only one executable working. MS Unicode layer + does not help WinMerge since WinMerge needs to be able to compare files + in different codepages.</para> + </note> + + <sect3> + <title>Archive support</title> + + <para>WinMerge 2.2 can open and save several archive types. Archive + support requires installing 7-zip. Refer to <filename>Read + Me.rtf</filename> file for info about compatible 7-zip versions. 7-zip + can be downloaded from <ulink + url="http://www.7-zip.org/">7-zip.org</ulink>.</para> + </sect3> + + <sect3> + <title>Shell integration</title> + + <para>WinMerge 2.2 can be integrated into the Windows Shell. Shell + integration adds a "<guimenuitem>WinMerge</guimenuitem>" menuitem to + Windows Explorer's context menu for easy and fast comparing files and + directories.</para> + </sect3> + + <sect3> + <title>Selecting filter from commandline</title> + + <para>New <option>-f</option> commandline switch allows selecting used + filter or mask for files.</para> + </sect3> + + <sect3> + <title>Project files</title> + + <para>WinMerge can read paths to open from project files. Project files + are simple XML files storing one or two paths, and also possibly the + choice of which filter to use and whether to include subfolders.</para> + </sect3> + + <sect3> + <title>Generating patches</title> + + <para><ulink + url="http://www.gnu.org/software/diffutils/diffutils.html">GNU/diffutils</ulink> + compatible patch files can be created from two files. Several formats + and compare options are supported.</para> + </sect3> + + <sect3> + <title>Plugins</title> + + <para>Plugins are now supported to preprocess files before actual + comparison, or to extend editor functionality. Plugins can be programmed + using several languages supporting COM. Example plugins are + included.</para> + </sect3> + + <sect3> + <title>Improved directory compare</title> + + <para>Many new features and improvements:</para> + + <itemizedlist> + <listitem> + <simpara>More columns have been added (e.g. file sizes and attributes), + and columns may be reordered, hidden, and displayed.</simpara> + </listitem> + + <listitem> + <simpara>Filtered items now have a distinct category + (<guilabel>Skipped</guilabel>) and icons. Filtered items can be set + to hidden/visible from <guimenu>View</guimenu>-menu.</simpara> + </listitem> + + <listitem> + <simpara>There is a new floating statusbar during the compare process, + and comparison may be aborted, and the the files/dirs compared so + far are shown.</simpara> + </listitem> + + <listitem> + <simpara>Newer file/directory is indicated with asterisk + (<guilabel>*</guilabel>) in date field.</simpara> + </listitem> + + <listitem> + <simpara>One or both directories can be set read-only, preventing + accidental overwriting.</simpara> + </listitem> + + <listitem> + <simpara>The number of selected items is shown in the statusbar.</simpara> + </listitem> + </itemizedlist> + </sect3> + + <sect3> + <title>Improved file compare</title> + + <para>Many new features and improvements:</para> + + <itemizedlist> + <listitem> + <simpara>Rewritten undo/redo code.</simpara> + </listitem> + + <listitem> + <simpara>Fixed "<guilabel>Ignore blank lines</guilabel>" + feature.</simpara> + </listitem> + + <listitem> + <simpara>Enhanced EOL handling (files can contain different EOL styles + in one file).</simpara> + </listitem> + + <listitem> + <simpara>Linenumber, current column and char, line length and char + count shown in statusbar.</simpara> + </listitem> + + <listitem> + <simpara>One ot both files can be set read-only to prevent accidental + edits.</simpara> + </listitem> + + <listitem> + <simpara>Copy difference to left/right and advance to next makes + merging faster.</simpara> + </listitem> + + <listitem> + <simpara>Diff pane to show current difference in two vertical + panes.</simpara> + </listitem> + + <listitem> + <simpara>Highlight word differences in lines.</simpara> + </listitem> + + <listitem> + <simpara>Merge-mode (or 1.7 mode) to navigate and merge differences + easier and faster.</simpara> + </listitem> + + <listitem> + <simpara>Goto -dialog for moving fast to certain line or + difference.</simpara> + </listitem> + + <listitem> + <simpara>Location pane showing overall picture from files and allowing + moving to location by double-clicking.</simpara> + </listitem> + + <listitem> + <simpara>Moved lines detection. Moved lines can be shown with different + color in file area and location pane.</simpara> + </listitem> + + <listitem> + <simpara>More color options. Text color, missing line colors and moved + line colors can be configured.</simpara> + </listitem> + </itemizedlist> + </sect3> + </sect2> +</sect1> Deleted: branches/R2_6/Docs/Users/Manual/Whatsnew_2_1.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Whatsnew_2_1.xml 2006-10-02 11:01:00 UTC (rev 3669) +++ branches/R2_6/Docs/Users/Manual/Whatsnew_2_1.xml 2006-10-02 11:06:21 UTC (rev 3670) @@ -1,387 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sect1 id="Whatsnew"> - <title>What's new in release</title> - - <sect2> - <title>What's new in 2.5</title> - - <para>WinMerge 2.5 is our development version. It contains lots of fixes - and improvements done after 2.4 releases. This list contains few most - important ones:</para> - - <itemizedlist> - <listitem> - <simpara>New icons and splash screen</simpara> - </listitem> - - <listitem> - <simpara>Simpler and auto-closing folder compare progress - bar</simpara> - </listitem> - - <listitem> - <simpara>Line numbers in file compare</simpara> - </listitem> - - <listitem> - <simpara>Word-wrap in file compare</simpara> - </listitem> - - <listitem> - <simpara>GUI for bookmarks in file compare</simpara> - </listitem> - - <listitem> - <simpara>Better character-level difference indication in file - compare</simpara> - </listitem> - - <listitem> - <simpara>New Short size- columns in folder compare</simpara> - </listitem> - - <listitem> - <simpara>Merge difference which has cursor inside it (no need to - select difference first)</simpara> - </listitem> - - <listitem> - <simpara>Improved Project file saving and editing</simpara> - </listitem> - - <listitem> - <simpara>Creating patch file from multiple files (selected in folder - compare)</simpara> - </listitem> - - <listitem> - <simpara>User-defined folder for file filters</simpara> - </listitem> - - <listitem> - <simpara>New folder compare types to compare by sizes or modify - times</simpara> - </listitem> - - <listitem> - <simpara>Renaming items in folder compare</simpara> - </listitem> - </itemizedlist> - </sect2> - - <sect2> - <title>What's new in 2.4</title> - - <para>WinMerge 2.4 is an important update to 2.2. Great new features and - usability improvements. And bug fixes.</para> - - <sect3> - <title>Multi-document support</title> - - <para>Now it is possible to open (after enabled from Options) several - folder- and file-compare windows inside one WinMerge instance. This - changes the way work is done with WinMerge.</para> - </sect3> - - <sect3> - <title>Limit to single-instance</title> - - <para>WinMerge can be now limited to one instance. Opening new files - from commandline, shell extension or external application opens new - windows instead of new instances.</para> - </sect3> - - <sect3> - <title>Active compare paths are shown in WinMerge caption</title> - - <para>This helps when switching between different instances in Task - Manager or in Task Switcher (<keycombo> - <keycap>Alt</keycap> - - <keycap>Tab</keycap> - </keycombo>).</para> - </sect3> - - <sect3> - <title>Improved archive files support</title> - - <para>Archive file support is greatly improved:</para> - - <itemizedlist> - <listitem> - <para>Archive files can be opened from folder compare</para> - </listitem> - - <listitem> - <para>WinMerge can (optionally) detect archive files from file - signature. This allows for example Open Office files to be detected - as archive files and opened.</para> - </listitem> - - <listitem> - <para>Path to archive file and path inside archive is shown instead - of path to temporary folder</para> - </listitem> - </itemizedlist> - </sect3> - - <sect3> - <title>Faster folder compare</title> - - <para>Lots of important improvements have been implemented:</para> - - <itemizedlist> - <listitem> - <para>New <guilabel>Quick Contents</guilabel> -compare methdod - allows faster compares</para> - </listitem> - - <listitem> - <para>Available memory does not anymore restrict maximun - filesize</para> - </listitem> - - <listitem> - <para>Compare statepane shows progressbar and compared/total amount - of items</para> - </listitem> - - <listitem> - <para>Possible to re-compare only selected items (from context - menu)</para> - </listitem> - - <listitem> - <para>Items can be hidden from view</para> - </listitem> - - <listitem> - <para>Simple reports</para> - </listitem> - </itemizedlist> - </sect3> - - <sect3> - <title>More usable file compare</title> - - <para>Showing line difference for all diffs (enabled from View-menu) is - the most important change. Others include:</para> - - <itemizedlist> - <listitem> - <para>Character difference highlighting (more fine-grained - differences)</para> - </listitem> - - <listitem> - <para>Selecting syntax highligh colors</para> - </listitem> - - <listitem> - <para>Merge all selected differences with normal merge commands - (separate commands removed)</para> - </listitem> - - <listitem> - <para>Opening files to external editor from file compare</para> - </listitem> - - <listitem> - <para>Punctuation characters can break diffs in line differences (so - numbers separated by commas get properly highlighted as - diffs)</para> - </listitem> - </itemizedlist> - </sect3> - - <sect3> - <title>Project files user interface</title> - - <para>Project files can be loaded from menu <menuchoice> - <guimenu>File</guimenu> - - <guimenuitem>Open Project...</guimenuitem> - </menuchoice>. And project files can be saved from - <guilabel>Open</guilabel> dialog.</para> - </sect3> - </sect2> - - <sect2> - <title>What's new in 2.2</title> - - <para>WinMerge 2.2 is distributed with an ANSI executable - (<filename>WinMerge.exe</filename>) for Windows 95/98/ME, and a Unicode - executable (<filename>WinMergeU.exe</filename>) for Windows NT /200/XP. - The unicode executable supports UCS-2 and UTF-8 files and - filenames.</para> - - <note> - <para>It is unfortunate that two executable files are needed. But there - is no current way to get only one executable working. MS Unicode layer - does not help WinMerge since WinMerge needs to be able to compare files - in different codepages.</para> - </note> - - <sect3> - <title>Archive support</title> - - <para>WinMerge 2.2 can open and save several archive types. Archive - support requires installing 7-zip. Refer to <filename>Read - Me.rtf</filename> file for info about compatible 7-zip versions. 7-zip - can be downloaded from <ulink - url="http://www.7-zip.org/">7-zip.org</ulink>.</para> - </sect3> - - <sect3> - <title>Shell integration</title> - - <para>WinMerge 2.2 can be integrated into the Windows Shell. Shell - integration adds a "<guimenuitem>WinMerge</guimenuitem>" menuitem to - Windows Explorer's context menu for easy and fast comparing files and - directories.</para> - </sect3> - - <sect3> - <title>Selecting filter from commandline</title> - - <para>New <option>-f</option> commandline switch allows selecting used - filter or mask for files.</para> - </sect3> - - <sect3> - <title>Project files</title> - - <para>WinMerge can read paths to open from project files. Project files - are simple XML files storing one or two paths, and also possibly the - choice of which filter to use and whether to include subfolders.</para> - </sect3> - - <sect3> - <title>Generating patches</title> - - <para><ulink - url="http://www.gnu.org/software/diffutils/diffutils.html">GNU/diffutils</ulink> - compatible patch files can be created from two files. Several formats - and compare options are supported.</para> - </sect3> - - <sect3> - <title>Plugins</title> - - <para>Plugins are now supported to preprocess files before actual - comparison, or to extend editor functionality. Plugins can be programmed - using several languages supporting COM. Example plugins are - included.</para> - </sect3> - - <sect3> - <title>Improved directory compare</title> - - <para>Many new features and improvements:</para> - - <itemizedlist> - <listitem> - <para>More columns have been added (e.g. file sizes and attributes), - and columns may be reordered, hidden, and displayed.</para> - </listitem> - - <listitem> - <para>Filtered items now have a distinct category - (<guilabel>Skipped</guilabel>) and icons. Filtered items can be set - to hidden/visible from <guimenu>View</guimenu>-menu.</para> - </listitem> - - <listitem> - <para>There is a new floating statusbar during the compare process, - and comparison may be aborted, and the the files/dirs compared so - far are shown.</para> - </listitem> - - <listitem> - <para>Newer file/directory is indicated with asterisk - (<guilabel>*</guilabel>) in date field.</para> - </listitem> - - <listitem> - <para>One or both directories can be set read-only, preventing - accidental overwriting.</para> - </listitem> - - <listitem> - <para>The number of selected items is shown in the statusbar.</para> - </listitem> - </itemizedlist> - </sect3> - - <sect3> - <title>Improved file compare</title> - - <para>Many new features and improvements:</para> - - <itemizedlist> - <listitem> - <para>Rewritten undo/redo code.</para> - </listitem> - - <listitem> - <para>Fixed "<guilabel>Ignore blank lines</guilabel>" - feature.</para> - </listitem> - - <listitem> - <para>Enhanced EOL handling (files can contain different EOL styles - in one file).</para> - </listitem> - - <listitem> - <para>Linenumber, current column and char, line length and char - count shown in statusbar.</para> - </listitem> - - <listitem> - <para>One ot both files can be set read-only to prevent accidental - edits.</para> - </listitem> - - <listitem> - <para>Copy difference to left/right and advance to next makes - merging faster.</para> - </listitem> - - <listitem> - <para>Diff pane to show current difference in two vertical - panes.</para> - </listitem> - - <listitem> - <para>Highlight word differences in lines.</para> - </listitem> - - <listitem> - <para>Merge-mode (or 1.7 mode) to navigate and merge differences - easier and faster.</para> - </listitem> - - <listitem> - <para>Goto -dialog for moving fast to certain line or - difference.</para> - </listitem> - - <listitem> - <para>Location pane showing overall picture from files and allowing - moving to location by double-clicking.</para> - </listitem> - - <listitem> - <para>Moved lines detection. Moved lines can be shown with different - color in file area and location pane.</para> - </listitem> - - <listitem> - <para>More color options. Text color, missing line colors and moved - line colors can be configured.</para> - </listitem> - </itemizedlist> - </sect3> - </sect2> -</sect1> Modified: branches/R2_6/Docs/Users/Manual/WinMerge_help.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2006-10-02 11:01:00 UTC (rev 3669) +++ branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2006-10-02 11:06:21 UTC (rev 3670) @@ -4,7 +4,7 @@ <!ENTITY AboutDoc SYSTEM "About_Doc.xml"> <!ENTITY QuickStart SYSTEM "Quick_start.xml"> <!ENTITY Introduction SYSTEM "Introduction.xml"> -<!ENTITY WhatsNew21 SYSTEM "Whatsnew_2_1.xml"> +<!ENTITY WhatsNew SYSTEM "Whatsnew.xml"> <!ENTITY Install SYSTEM "Install.xml"> <!ENTITY IntroductDiffing SYSTEM "Intro_diffs.xml"> <!ENTITY OpenPaths SYSTEM "Open_paths.xml"> @@ -84,7 +84,7 @@ &Introduction; - &WhatsNew21; + &WhatsNew; &Install; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-10-02 11:11:30
|
Revision: 3672 http://svn.sourceforge.net/winmerge/?rev=3672&view=rev Author: gerundt Date: 2006-10-02 04:11:23 -0700 (Mon, 02 Oct 2006) Log Message: ----------- BUG: [ 1568946 ] Manual: Wrong link in "Install.xml" Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Install.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 11:10:29 UTC (rev 3671) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 11:11:23 UTC (rev 3672) @@ -4,6 +4,8 @@ PATCH: [ 1568945 ] Manual: Use <simpara> for all list items in Whatsnew Manual: WinMerge_help.xml Manual renamed file: Whatsnew_2_1.xml to Whatsnew.xml + BUG: [ 1568946 ] Manual: Wrong link in "Install.xml" + Manual: Install.xml 2006-09-29 Kimmo PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing Modified: branches/R2_6/Docs/Users/Manual/Install.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Install.xml 2006-10-02 11:10:29 UTC (rev 3671) +++ branches/R2_6/Docs/Users/Manual/Install.xml 2006-10-02 11:11:23 UTC (rev 3672) @@ -31,7 +31,7 @@ <para>Installer requires Admin-user priviledges in Windows NT4/2000/XP. If you don't have Admin-user priviledges you can install WinMerge by unzipping from an archive file (see <link - linkend="InstallingFromArchive">Installing from an + linkend="InstallFromArchive">Installing from an Archive</link>).</para> </note> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-03 15:51:24
|
Revision: 3676 http://svn.sourceforge.net/winmerge/?rev=3676&view=rev Author: kimmov Date: 2006-10-03 08:51:17 -0700 (Tue, 03 Oct 2006) Log Message: ----------- PATCH: [ 1569389 ] Manual: fix translations part Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Locales.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-03 15:49:27 UTC (rev 3675) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-03 15:51:17 UTC (rev 3676) @@ -1,3 +1,7 @@ +2006-10-03 Kimmo + PATCH: [ 1569389 ] Manual: fix translations part + Manual: Locales.xml + 2006-10-02 Tim PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument Manual/build: build_html.bat Modified: branches/R2_6/Docs/Users/Manual/Locales.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Locales.xml 2006-10-03 15:49:27 UTC (rev 3675) +++ branches/R2_6/Docs/Users/Manual/Locales.xml 2006-10-03 15:51:17 UTC (rev 3676) @@ -3,10 +3,8 @@ <title>Locale support</title> <para>WinMerge allows translating the user interface to other languages than - English. Several translations have been contributed. At the time of this - writing, translations are available from <ulink - url="http://www.winmerge.org/">WinMerge.org</ulink> for the following - languages:</para> + English. Several translations have been contributed. Translations are + available for the following languages:</para> <itemizedlist> <listitem> @@ -91,14 +89,14 @@ </itemizedlist> <note> - <para>The translations cover interface content, including menus, - dialogs, tooltips, and messages -- essentially the translation of - of all strings displayed. However, they do not provide areas - outside of string translation; they do not handle how numbers - are divided, or how words are alphabetized. (These issues should - be addressed in the conventional Windows manner, which is - via the Regional settings in the Control Panel.) - </para></note> + <para>The translations cover interface content, including menus, dialogs, + tooltips, and messages -- essentially the translation of of all strings + displayed. However, they do not provide areas outside of string + translation; they do not handle how numbers are divided, or how words are + alphabetized. (These issues should be addressed in the conventional + Windows manner, which is via the Regional settings in the Control + Panel.)</para> + </note> <sect2> <title>Selecting language</title> @@ -108,16 +106,17 @@ <orderedlist> <listitem> - <para>Run WinMerge</para> + <simpara>Run WinMerge</simpara> </listitem> <listitem> - <para>Select <guimenuitem>Language</guimenuitem> from the - <guimenu>View</guimenu> menu</para> + <simpara>Select <guimenuitem>Language</guimenuitem> from the + <guimenu>View</guimenu> menu</simpara> </listitem> <listitem> - <para>Select your language and click <guibutton>OK</guibutton></para> + <simpara>Select your language and click + <guibutton>OK</guibutton></simpara> </listitem> </orderedlist> @@ -128,46 +127,39 @@ <sect2> <title>Installing translation</title> - <para>The easiest way to install translations is to select them in the installer. - Translations are selected in the 4th installer dialog (<guilabel>Select - components</guilabel>). The default install (<guilabel>Typical - Installation</guilabel>) does not install translations, but they can be - individually selected from the list.</para> + <para>The easiest way to install translations is to select them in the + installer. Translations are selected in the 4th installer dialog + (<guilabel>Select components</guilabel>). The default install + (<guilabel>Typical Installation</guilabel>) does not install translations, + but they can be individually selected from the list.</para> <para>If you don't want to re-run installer, or didn't install WinMerge with the installer in the first place, then WinMerge translation files are - available in zipped versions and translation updates. To install new - translation file:</para> + available in zipped versions. To install new translation file:</para> <para><orderedlist> <listitem> - <para>Download the zipped release from <ulink + <simpara>Download the zipped release from <ulink url="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=283717">WinMerge - download</ulink> site or updated translation file from <ulink - url="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=283717">Languages - download</ulink>.</para> + download</ulink> site.</simpara> </listitem> <listitem> - <para>If the <filename class="directory">Languages</filename> + <simpara>If the <filename class="directory">Languages</filename> subdirectory does not exist under the WinMerge directory (where <filename>WinMerge.exe</filename> and/or - <filename>WinMergeU.exe</filename> is located) create it.</para> + <filename>WinMergeU.exe</filename> is located) create it.</simpara> </listitem> <listitem> - <para>a) If you downloaded just the language files, unzip them into the - <filename class="directory">Languages</filename> directory.</para> - - <para>b) If you downloaded an entire WinMerge release, then search for - <filename>Merge*.lang</filename> files, where * is a language name - (<filename>MergeSwedish.lang</filename> for Swedish translation). - Unzip that file to the <filename>Languages</filename> - directory.</para> + <simpara>Search for <filename>Merge*.lang</filename> files, where * + is a language name (<filename>MergeSwedish.lang</filename> for + Swedish translation) in archive file. Extract that file to the + <filename>Languages</filename> directory.</simpara> </listitem> <listitem> - <para>Run WinMerge</para> + <simpara>Run WinMerge</simpara> </listitem> <listitem> @@ -176,8 +168,8 @@ </listitem> <listitem> - <para>Select your language and click - <guibutton>OK</guibutton></para> + <simpara>Select your language and click + <guibutton>OK</guibutton></simpara> </listitem> </orderedlist></para> </sect2> @@ -187,8 +179,8 @@ <para>Please submit errors you find in translations as bugs to our <ulink url="http://sourceforge.net/tracker/?group_id=13216&atid=113216">bug-list</ulink>. - It would be great if you can provide a corrected version of the translated text - also.</para> + It would be great if you can provide a corrected version of the translated + text also.</para> </sect2> <sect2> @@ -197,11 +189,11 @@ <para>If you would like to add your language to the list, look at the <ulink url="http://www.winmerge.org/developer/l10n/index.php">on-line documentation</ulink> for the details on how to do it. All translations - are not complete so it would be nice if you can help improving them too. + are not complete so it would be nice if you can help improving them. Translating (or improving translation) does not require you to have all compile tools or knowledge of WinMerge internals. Just read instructions 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> \ No newline at end of file +</sect1> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-03 19:06:58
|
Revision: 3678 http://svn.sourceforge.net/winmerge/?rev=3678&view=rev Author: kimmov Date: 2006-10-03 12:06:48 -0700 (Tue, 03 Oct 2006) Log Message: ----------- PATCH: [ 1569400 ] Manual: Update About Doc chapter Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/About_Doc.xml branches/R2_6/Docs/Users/Manual/Changes.txt Modified: branches/R2_6/Docs/Users/Manual/About_Doc.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/About_Doc.xml 2006-10-03 18:13:24 UTC (rev 3677) +++ branches/R2_6/Docs/Users/Manual/About_Doc.xml 2006-10-03 19:06:48 UTC (rev 3678) @@ -2,38 +2,39 @@ <sect1 id="AboutDoc"> <title>About This Document</title> - <para>This is a manual for WinMerge 2.5.</para> + <para>This is a manual for WinMerge 2.6.</para> - <para>This manual is important reading for experienced and new users of - WinMerge 2.5. There are lot of new features and improvements in version 2.5. - Reading this manual will help ensure the user knows about the various - functions available in WinMerge, and various limitations.</para> + <para>This manual is recommended reading for experienced and new users of + WinMerge 2.6. Reading this manual will help ensure the user knows about the + various functions available in WinMerge, and various limitations.</para> <para>Please read at least the following chapters:</para> <itemizedlist> <listitem> - <para>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.</para> + <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>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.</para> + <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> <listitem> - <para>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.</para> + <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>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.</para> + <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> @@ -42,33 +43,33 @@ <itemizedlist> <listitem> - <para>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?</para> + <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> <listitem> - <para>The <link linkend="Plugins">Plugins</link> chapter introduces - plugins.</para> + <simpara>The <link linkend="Plugins">Plugins</link> chapter introduces + plugins.</simpara> </listitem> <listitem> - <para>The <link linkend="Filters">Filters</link> chapter explains the use of - both file filters and line filters.</para> + <simpara>The <link linkend="Filters">Filters</link> chapter explains the + use of both file filters and line filters.</simpara> </listitem> <listitem> - <para>The <link linkend="CommandLine">Commandline</link> chapter lists - commandline parameters for WinMerge (for using with other tools, or from a - script).</para> + <simpara>The <link linkend="CommandLine">Commandline</link> chapter + lists commandline parameters for WinMerge (for using with other tools, + or from a script).</simpara> </listitem> <listitem> - <para>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>.</para> + <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> Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-03 18:13:24 UTC (rev 3677) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-03 19:06:48 UTC (rev 3678) @@ -1,6 +1,8 @@ 2006-10-03 Kimmo PATCH: [ 1569389 ] Manual: fix translations part Manual: Locales.xml + PATCH: [ 1569400 ] Manual: Update About Doc chapter + Manual: About_Doc.xml 2006-10-02 Tim PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-10-07 08:55:24
|
Revision: 3685 http://svn.sourceforge.net/winmerge/?rev=3685&view=rev Author: gerundt Date: 2006-10-07 01:55:12 -0700 (Sat, 07 Oct 2006) Log Message: ----------- BUG: [ 1572388 ] Wrong link to regex.pdf Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Filters.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-07 08:50:28 UTC (rev 3684) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-07 08:55:12 UTC (rev 3685) @@ -1,3 +1,7 @@ +2006-10-07 Tim + BUG: [ 1572388 ] Wrong link to regex.pdf + Manual: Filters.xml + 2006-10-03 Kimmo PATCH: [ 1569389 ] Manual: fix translations part Manual: Locales.xml Modified: branches/R2_6/Docs/Users/Manual/Filters.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Filters.xml 2006-10-07 08:50:28 UTC (rev 3684) +++ branches/R2_6/Docs/Users/Manual/Filters.xml 2006-10-07 08:55:12 UTC (rev 3685) @@ -55,7 +55,7 @@ <listitem> <para><ulink - url="http://gmckinney.info/resources/regex.pdf">http://gmckinney.info/resources/regex.pdf</ulink></para> + url="http://www.night-ray.com/regex.pdf">http://www.night-ray.com/regex.pdf</ulink></para> </listitem> </varlistentry> </variablelist> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-10 15:36:14
|
Revision: 3699 http://svn.sourceforge.net/winmerge/?rev=3699&view=rev Author: kimmov Date: 2006-10-10 08:36:04 -0700 (Tue, 10 Oct 2006) Log Message: ----------- PATCH: [ 1573933 ] Manual: Update introduction chapter Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Introduction.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 15:33:12 UTC (rev 3698) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 15:36:04 UTC (rev 3699) @@ -1,3 +1,7 @@ +2006-10-10 Kimmo + PATCH: [ 1573933 ] Manual: Update introduction chapter + Manual: Introduction.xml + 2006-10-07 Tim BUG: [ 1572388 ] Wrong link to regex.pdf Manual: Filters.xml Modified: branches/R2_6/Docs/Users/Manual/Introduction.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Introduction.xml 2006-10-10 15:33:12 UTC (rev 3698) +++ branches/R2_6/Docs/Users/Manual/Introduction.xml 2006-10-10 15:36:04 UTC (rev 3699) @@ -4,8 +4,8 @@ <para>WinMerge is an <ulink url="http://www.opensource.org/">Open Source</ulink> visual text file differencing and merging tool for Win32 - platforms. WinMerge can compare directories and files and present - differences in easy to understand and handle format.</para> + platforms. WinMerge can compare folders and files and present differences in + easy to understand and handle format.</para> <para>WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be @@ -23,10 +23,8 @@ <para>Goal of WinMerge development is to make comparing and synch/merge of directories and files easy and fast. While maintaining maximum reliability. - Easiness reduces user errors. Latest 2.4 version was already good and - popular version. In-development version 2.5 still improves in many areas. - Note that 2.5 releases (beta or experimental) are not yet considered - production-level releases.</para> + Easy of use reduces errors. Latest 2.6 version is considered a stable and + reliable program to use.</para> <para>Please note that WinMerge is not a freeware, but it is <ulink url="http://www.gnu.org/copyleft/gpl.html">GPL</ulink> licenced. We have @@ -114,8 +112,8 @@ 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.</para> + 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> <important> <para>Branch always means a separate development. There is no any @@ -134,10 +132,9 @@ <para>What this branching also means is that stable versions don't get many new features after a branch is created. Stable versions 2.4.0 and - 2.4.6 are pretty much similar feature-wise. Next time the new features - appear in stable release is in version 2.6.0 for which we create a new - stable branch. Downside here is that it may be over an year between the - stable branches.</para> + 2.4.6 are pretty much similar feature-wise. After 2.4 stable branch we + have already a created new stable branch 2.6. It has many imrovements + and fixes done after 2.4 branch was created.</para> <para>Many software vendors always increase their version numbers and say version with biggest version number is what people should use. If @@ -205,7 +202,7 @@ <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 CVS + 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 @@ -231,14 +228,16 @@ <para><ulink url="http://winmerge.sourceforge.net/developer/index.php">Developer - pages</ulink> are good start if you want to help with - development.</para> + pages</ulink> are good start if you want to help with development. We + have also created a <link linkend="???"><ulink + url="http://wiki.winmerge.org/">Developers-Wiki</ulink></link> for + developer documentation.</para> - <para><ulink - url="http://sourceforge.net/forum/forum.php?forum_id=41639">Developers-forum</ulink> - is best place to discuss about development. If you are interested in - helping with WinMerge development, let us know. If you want to fix one - of our <ulink + <para><ulink url="???">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&atid=113216" userlevel="">bugs</ulink> or implement a <ulink url="http://sourceforge.net/tracker/?group_id=13216&atid=363216">new This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-10 15:42:03
|
Revision: 3701 http://svn.sourceforge.net/winmerge/?rev=3701&view=rev Author: kimmov Date: 2006-10-10 08:41:54 -0700 (Tue, 10 Oct 2006) Log Message: ----------- PATCH: [ 1573938 ] Manual: Update whatsnew for 2.6 release Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Whatsnew.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 15:39:18 UTC (rev 3700) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 15:41:54 UTC (rev 3701) @@ -1,6 +1,8 @@ 2006-10-10 Kimmo PATCH: [ 1573933 ] Manual: Update introduction chapter Manual: Introduction.xml + PATCH: [ 1573938 ] Manual: Update whatsnew for 2.6 release + Manual: Whatsnew.xml 2006-10-07 Tim BUG: [ 1572388 ] Wrong link to regex.pdf Modified: branches/R2_6/Docs/Users/Manual/Whatsnew.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Whatsnew.xml 2006-10-10 15:39:18 UTC (rev 3700) +++ branches/R2_6/Docs/Users/Manual/Whatsnew.xml 2006-10-10 15:41:54 UTC (rev 3701) @@ -3,11 +3,10 @@ <title>What's new in release</title> <sect2> - <title>What's new in 2.5</title> + <title>What's new in 2.6</title> - <para>WinMerge 2.5 is our development version. It contains lots of fixes - and improvements done after 2.4 releases. This list contains few most - important ones:</para> + <para>WinMerge 2.6 release has some long-waited new features plus + important usability and stability fixes.</para> <itemizedlist> <listitem> @@ -119,8 +118,8 @@ </listitem> <listitem> - <simpara>Path to archive file and path inside archive is shown instead - of path to temporary folder</simpara> + <simpara>Path to archive file and path inside archive is shown + instead of path to temporary folder</simpara> </listitem> </itemizedlist> </sect3> @@ -142,8 +141,8 @@ </listitem> <listitem> - <simpara>Compare statepane shows progressbar and compared/total amount - of items</simpara> + <simpara>Compare statepane shows progressbar and compared/total + amount of items</simpara> </listitem> <listitem> @@ -183,12 +182,13 @@ </listitem> <listitem> - <simpara>Opening files to external editor from file compare</simpara> + <simpara>Opening files to external editor from file + compare</simpara> </listitem> <listitem> - <simpara>Punctuation characters can break diffs in line differences (so - numbers separated by commas get properly highlighted as + <simpara>Punctuation characters can break diffs in line differences + (so numbers separated by commas get properly highlighted as diffs)</simpara> </listitem> </itemizedlist> @@ -281,8 +281,9 @@ <itemizedlist> <listitem> - <simpara>More columns have been added (e.g. file sizes and attributes), - and columns may be reordered, hidden, and displayed.</simpara> + <simpara>More columns have been added (e.g. file sizes and + attributes), and columns may be reordered, hidden, and + displayed.</simpara> </listitem> <listitem> @@ -292,9 +293,9 @@ </listitem> <listitem> - <simpara>There is a new floating statusbar during the compare process, - and comparison may be aborted, and the the files/dirs compared so - far are shown.</simpara> + <simpara>There is a new floating statusbar during the compare + process, and comparison may be aborted, and the the files/dirs + compared so far are shown.</simpara> </listitem> <listitem> @@ -308,7 +309,8 @@ </listitem> <listitem> - <simpara>The number of selected items is shown in the statusbar.</simpara> + <simpara>The number of selected items is shown in the + statusbar.</simpara> </listitem> </itemizedlist> </sect3> @@ -329,8 +331,8 @@ </listitem> <listitem> - <simpara>Enhanced EOL handling (files can contain different EOL styles - in one file).</simpara> + <simpara>Enhanced EOL handling (files can contain different EOL + styles in one file).</simpara> </listitem> <listitem> @@ -339,8 +341,8 @@ </listitem> <listitem> - <simpara>One ot both files can be set read-only to prevent accidental - edits.</simpara> + <simpara>One ot both files can be set read-only to prevent + accidental edits.</simpara> </listitem> <listitem> @@ -368,18 +370,18 @@ </listitem> <listitem> - <simpara>Location pane showing overall picture from files and allowing - moving to location by double-clicking.</simpara> + <simpara>Location pane showing overall picture from files and + allowing moving to location by double-clicking.</simpara> </listitem> <listitem> - <simpara>Moved lines detection. Moved lines can be shown with different - color in file area and location pane.</simpara> + <simpara>Moved lines detection. Moved lines can be shown with + different color in file area and location pane.</simpara> </listitem> <listitem> - <simpara>More color options. Text color, missing line colors and moved - line colors can be configured.</simpara> + <simpara>More color options. Text color, missing line colors and + moved line colors can be configured.</simpara> </listitem> </itemizedlist> </sect3> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-10 16:25:33
|
Revision: 3703 http://svn.sourceforge.net/winmerge/?rev=3703&view=rev Author: kimmov Date: 2006-10-10 09:25:25 -0700 (Tue, 10 Oct 2006) Log Message: ----------- Fix invalid links in Introduction, added in patch #1573933 Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Introduction.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 16:23:54 UTC (rev 3702) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 16:25:25 UTC (rev 3703) @@ -3,6 +3,8 @@ Manual: Introduction.xml PATCH: [ 1573938 ] Manual: Update whatsnew for 2.6 release Manual: Whatsnew.xml + Fix invalid links in Introduction, added in patch #1573933 + Manual: Introduction.xml 2006-10-07 Tim BUG: [ 1572388 ] Wrong link to regex.pdf Modified: branches/R2_6/Docs/Users/Manual/Introduction.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Introduction.xml 2006-10-10 16:23:54 UTC (rev 3702) +++ branches/R2_6/Docs/Users/Manual/Introduction.xml 2006-10-10 16:25:25 UTC (rev 3703) @@ -229,12 +229,13 @@ <para><ulink url="http://winmerge.sourceforge.net/developer/index.php">Developer pages</ulink> are good start if you want to help with development. We - have also created a <link linkend="???"><ulink - url="http://wiki.winmerge.org/">Developers-Wiki</ulink></link> for - developer documentation.</para> + have also created a <ulink + url="http://wiki.winmerge.org/">Developers-Wiki</ulink> for developer + documentation.</para> - <para><ulink url="???">Development-mailing</ulink> list is the preferred - place for development discussions. Another place is in <ulink + <para><ulink url="https://sourceforge.net/mail/?group_id=13216"> + 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-11 21:21:41
|
Revision: 3709 http://svn.sourceforge.net/winmerge/?rev=3709&view=rev Author: kimmov Date: 2006-10-11 14:21:33 -0700 (Wed, 11 Oct 2006) Log Message: ----------- PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Filters.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-11 21:18:37 UTC (rev 3708) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-11 21:21:33 UTC (rev 3709) @@ -1,3 +1,7 @@ +2006-10-11 Kimmo + PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc + Manual: Filters.xml + 2006-10-10 Kimmo PATCH: [ 1573933 ] Manual: Update introduction chapter Manual: Introduction.xml Modified: branches/R2_6/Docs/Users/Manual/Filters.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Filters.xml 2006-10-11 21:18:37 UTC (rev 3708) +++ branches/R2_6/Docs/Users/Manual/Filters.xml 2006-10-11 21:21:33 UTC (rev 3709) @@ -110,7 +110,7 @@ <para>User-defined folder. Selected in Options (<menuchoice> <guimenu>Edit</guimenu> - <guimenuitem>Options </guimenuitem> + <guimenuitem>Options</guimenuitem> </menuchoice><guilabel>> System > </guilabel><guilabel>Filter Folder)</guilabel>. By default it is <filename class="directory">My Documents</filename> -folder.</para> @@ -292,9 +292,10 @@ <example> <title>Line filter rule matching CVS "Id:" -lines:</title> - <para>Id-lines are like this:</para> + <para>Id-lines are like this (dollar-char not written so that version + control does not mess up that line):</para> - <screen>// $Id$</screen> + <screen>// [dollar-char]Id: Filters.xml,v 1.14.2.2 2005/10/29 17:21:16 kimmov Exp [dollar-char]</screen> <para>And they can be filtered with rule:</para> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-12 15:36:38
|
Revision: 3710 http://svn.sourceforge.net/winmerge/?rev=3710&view=rev Author: kimmov Date: 2006-10-12 08:36:26 -0700 (Thu, 12 Oct 2006) Log Message: ----------- Set version- and revision numbers for 2.6.0 release. Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/WinMerge_help.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-11 21:21:33 UTC (rev 3709) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-12 15:36:26 UTC (rev 3710) @@ -1,3 +1,7 @@ +2006-10-12 Kimmo + Set version- and revision numbers for 2.6.0 release. + Manual: WinMerge_help.xml + 2006-10-11 Kimmo PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc Manual: Filters.xml Modified: branches/R2_6/Docs/Users/Manual/WinMerge_help.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2006-10-11 21:21:33 UTC (rev 3709) +++ branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2006-10-12 15:36:26 UTC (rev 3710) @@ -22,11 +22,11 @@ ]> <article id="index"> <articleinfo> - <title>WinMerge 2.5 Manual</title> + <title>WinMerge 2.6 Manual</title> <productname>WinMerge</productname> - <releaseinfo><emphasis>Revision 1.2.7</emphasis></releaseinfo> + <releaseinfo><emphasis>Revision 1.2.8</emphasis></releaseinfo> <copyright> <year>2004-2006</year> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-19 19:03:24
|
Revision: 3721 http://svn.sourceforge.net/winmerge/?rev=3721&view=rev Author: kimmov Date: 2006-10-19 12:03:18 -0700 (Thu, 19 Oct 2006) Log Message: ----------- PATCH: [ 1578456 ] Manual: Small tweaks for installing doc Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Install.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-19 18:59:57 UTC (rev 3720) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-19 19:03:18 UTC (rev 3721) @@ -1,3 +1,7 @@ +2006-10-19 Kimmo + PATCH: [ 1578456 ] Manual: Small tweaks for installing doc + Manual: Install.xml + 2006-10-12 Kimmo Set version- and revision numbers for 2.6.0 release. Manual: WinMerge_help.xml Modified: branches/R2_6/Docs/Users/Manual/Install.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Install.xml 2006-10-19 18:59:57 UTC (rev 3720) +++ branches/R2_6/Docs/Users/Manual/Install.xml 2006-10-19 19:03:18 UTC (rev 3721) @@ -5,11 +5,13 @@ <para>WinMerge can be installed using installer or by unzipping files from archive. Using the installer is the recommended method.</para> - <para>Currently WinMerge installer works for natively for 32-bit Windows. - There is no separate version for 64-bit Windows (WinXP/2003/Vista) but those - can run installer and WinMerge as 32-bit application. However there is - 64-bit version of Shell Integration included in 32-bit installer. So Shell - Integration works in 64-bit Windows.</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 64-bit + version of included in the installer.</para> + </note> <sect2> <title>Getting Files</title> @@ -31,8 +33,7 @@ <para>Installer requires Admin-user priviledges in Windows NT4/2000/XP. If you don't have Admin-user priviledges you can install WinMerge by unzipping from an archive file (see <link - linkend="InstallFromArchive">Installing from an - Archive</link>).</para> + linkend="InstallFromArchive">Installing from an Archive</link>).</para> </note> <para>This is recommended for most users. Installer asks location where @@ -169,14 +170,20 @@ <filename>WinMerge[U].exe</filename> is needed to run WinMerge. Mentioned DLL files are available also as Runtimes-package to download.</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> + </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 folder - structure!).</para> + folder can be renamed or files copied to other 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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-10-30 20:57:28
|
Revision: 3742 http://svn.sourceforge.net/winmerge/?rev=3742&view=rev Author: gerundt Date: 2006-10-30 12:57:10 -0800 (Mon, 30 Oct 2006) Log Message: ----------- PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Intro_diffs.xml Added Paths: ----------- branches/R2_6/Docs/Users/Manual/screenshots/missing_lines.png Removed Paths: ------------- branches/R2_6/Docs/Users/Manual/screenshots/example1.gif Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-30 20:53:59 UTC (rev 3741) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-30 20:57:10 UTC (rev 3742) @@ -1,3 +1,8 @@ +2006-10-30 Tim + PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version + Manual/screenshots new file: missing_lines.png + Manual/screenshots deleted file: example1.gif + 2006-10-19 Kimmo PATCH: [ 1578456 ] Manual: Small tweaks for installing doc Manual: Install.xml Modified: branches/R2_6/Docs/Users/Manual/Intro_diffs.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Intro_diffs.xml 2006-10-30 20:53:59 UTC (rev 3741) +++ branches/R2_6/Docs/Users/Manual/Intro_diffs.xml 2006-10-30 20:57:10 UTC (rev 3742) @@ -26,7 +26,7 @@ <para>In example 1 there are 3 different lines in file1 and 1 different line in file2. In WinMerge differences must always have same amount of lines in both files. So WinMerge must add 2 empty lines to file2 so that both files have 3 different lines. We call these added empty lines as "missing lines" since they really don't exist in file2. Screenshot shows it:</para> <para><inlinemediaobject> <imageobject> - <imagedata fileref="screenshots/example1.gif" format="GIF"/> + <imagedata fileref="screenshots/missing_lines.png" format="PNG"/> </imageobject> </inlinemediaobject></para> <para>If text is typed or copy-pasted to missing lines they become real lines.</para> Deleted: branches/R2_6/Docs/Users/Manual/screenshots/example1.gif =================================================================== (Binary files differ) Added: branches/R2_6/Docs/Users/Manual/screenshots/missing_lines.png =================================================================== (Binary files differ) Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/missing_lines.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. |
From: <ge...@us...> - 2006-10-30 21:02:45
|
Revision: 3744 http://svn.sourceforge.net/winmerge/?rev=3744&view=rev Author: gerundt Date: 2006-10-30 13:02:36 -0800 (Mon, 30 Oct 2006) Log Message: ----------- Remove unnecessary image "unknown.gif". Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt Removed Paths: ------------- branches/R2_6/Docs/Users/Manual/screenshots/unknown.gif Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-30 21:01:32 UTC (rev 3743) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-30 21:02:36 UTC (rev 3744) @@ -2,6 +2,8 @@ PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version Manual/screenshots new file: missing_lines.png Manual/screenshots deleted file: example1.gif + Remove unnecessary image "unknown.gif". + Manual/screenshots deleted file: unknown.gif 2006-10-19 Kimmo PATCH: [ 1578456 ] Manual: Small tweaks for installing doc Deleted: branches/R2_6/Docs/Users/Manual/screenshots/unknown.gif =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-11-06 20:12:07
|
Revision: 3778 http://svn.sourceforge.net/winmerge/?rev=3778&view=rev Author: gerundt Date: 2006-11-06 12:11:43 -0800 (Mon, 06 Nov 2006) Log Message: ----------- PATCH: [ 1586878 ] Manual: Replace "aborted.png" with transpatent GIF version Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Compare_dirs.xml branches/R2_6/Docs/Users/Manual/screenshots/binary.gif branches/R2_6/Docs/Users/Manual/screenshots/folderup.gif branches/R2_6/Docs/Users/Manual/screenshots/folderup_disable.gif Added Paths: ----------- branches/R2_6/Docs/Users/Manual/screenshots/aborted.gif Removed Paths: ------------- branches/R2_6/Docs/Users/Manual/screenshots/aborted.png Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-06 20:07:52 UTC (rev 3777) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-06 20:11:43 UTC (rev 3778) @@ -1,3 +1,10 @@ +2006-11-06 Tim + PATCH: [ 1586878 ] Manual: Replace "aborted.png" with transpatent GIF version + Manual: Compare_dirs.xml + Manual/screenshots: binary.gif folderup.gif folderup_disable.gif + Manual/screenshots new file: aborted.gif + Manual/screenshots deleted file: aborted.png + 2006-11-06 Takashi PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico) Manual/screenshots: equal.gif fileskip.gif foldercomp1.png Modified: branches/R2_6/Docs/Users/Manual/Compare_dirs.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Compare_dirs.xml 2006-11-06 20:07:52 UTC (rev 3777) +++ branches/R2_6/Docs/Users/Manual/Compare_dirs.xml 2006-11-06 20:11:43 UTC (rev 3778) @@ -134,7 +134,7 @@ <member><inlinemediaobject> <imageobject> - <imagedata fileref="screenshots/aborted.png" /> + <imagedata fileref="screenshots/aborted.gif" format="GIF" /> </imageobject> </inlinemediaobject> Aborted item. WinMerge did not finish comparing this item when compare was stopped. Result is unknown.</member> Added: branches/R2_6/Docs/Users/Manual/screenshots/aborted.gif =================================================================== (Binary files differ) Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/aborted.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/R2_6/Docs/Users/Manual/screenshots/aborted.png =================================================================== (Binary files differ) Modified: branches/R2_6/Docs/Users/Manual/screenshots/binary.gif =================================================================== (Binary files differ) Modified: branches/R2_6/Docs/Users/Manual/screenshots/folderup.gif =================================================================== (Binary files differ) Modified: branches/R2_6/Docs/Users/Manual/screenshots/folderup_disable.gif =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-11-07 22:28:04
|
Revision: 3787 http://svn.sourceforge.net/winmerge/?rev=3787&view=rev Author: gerundt Date: 2006-11-07 14:27:33 -0800 (Tue, 07 Nov 2006) Log Message: ----------- PATCH: [ 1592234 ] Manual: Nicer Shortcut keys tables Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Shortcut_keys.xml branches/R2_6/Docs/Users/Manual/css/all.css branches/R2_6/Docs/Users/Manual/css/help.css branches/R2_6/Docs/Users/Manual/css/print.css Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-07 22:25:09 UTC (rev 3786) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-07 22:27:33 UTC (rev 3787) @@ -1,3 +1,8 @@ +2006-11-07 Tim + PATCH: [ 1592234 ] Manual: Nicer Shortcut keys tables + Manual: Shortcut_keys.xml + Manual/css: all.css help.css print.css + 2006-11-06 Tim PATCH: [ 1586878 ] Manual: Replace "aborted.png" with transpatent GIF version Manual: Compare_dirs.xml Modified: branches/R2_6/Docs/Users/Manual/Shortcut_keys.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Shortcut_keys.xml 2006-11-07 22:25:09 UTC (rev 3786) +++ branches/R2_6/Docs/Users/Manual/Shortcut_keys.xml 2006-11-07 22:27:33 UTC (rev 3787) @@ -627,6 +627,14 @@ <title>Find and Replace</title> <tgroup cols="2"> + <thead> + <row> + <entry>Key</entry> + + <entry>Function</entry> + </row> + </thead> + <tbody> <row> <entry><keycombo> Modified: branches/R2_6/Docs/Users/Manual/css/all.css =================================================================== --- branches/R2_6/Docs/Users/Manual/css/all.css 2006-11-07 22:25:09 UTC (rev 3786) +++ branches/R2_6/Docs/Users/Manual/css/all.css 2006-11-07 22:27:33 UTC (rev 3787) @@ -41,4 +41,23 @@ .warning { background-color: #FFDDDD; border: 1px solid red; +} + +/* tables */ +.table table { + border-collapse: collapse; + border: 1px solid black; +} + +.table th { + padding: 2px; + text-align: left; + color: white; + background: black; + border: 1px solid black; +} + +.table td { + padding: 2px; + border: 1px solid black; } \ No newline at end of file Modified: branches/R2_6/Docs/Users/Manual/css/help.css =================================================================== --- branches/R2_6/Docs/Users/Manual/css/help.css 2006-11-07 22:25:09 UTC (rev 3786) +++ branches/R2_6/Docs/Users/Manual/css/help.css 2006-11-07 22:27:33 UTC (rev 3787) @@ -37,4 +37,23 @@ .warning { background-color: #FFDDDD; border: 1px solid red; +} + +/* tables */ +.table table { + border-collapse: collapse; + border: 1px solid black; +} + +.table th { + padding: 2px; + text-align: left; + color: white; + background: black; + border: 1px solid black; +} + +.table td { + padding: 2px; + border: 1px solid black; } \ No newline at end of file Modified: branches/R2_6/Docs/Users/Manual/css/print.css =================================================================== --- branches/R2_6/Docs/Users/Manual/css/print.css 2006-11-07 22:25:09 UTC (rev 3786) +++ branches/R2_6/Docs/Users/Manual/css/print.css 2006-11-07 22:27:33 UTC (rev 3787) @@ -48,4 +48,24 @@ .warning { background-color: white; border: 1px solid black; +} + +/* tables */ +.table table { + border-collapse: collapse; + border: 1px solid black; +} + +.table th { + padding: 2px; + text-align: left; + color: black; + background: white; + border: 1px solid black; + border-bottom: 2px solid black; +} + +.table td { + padding: 2px; + border: 1px solid black; } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-11-20 19:15:58
|
Revision: 3819 http://svn.sourceforge.net/winmerge/?rev=3819&view=rev Author: gerundt Date: 2006-11-20 11:15:50 -0800 (Mon, 20 Nov 2006) Log Message: ----------- PATCH: [ 1599401 ] Manual: Use bold text for questions (FAQ) Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/css/all.css branches/R2_6/Docs/Users/Manual/css/help.css branches/R2_6/Docs/Users/Manual/css/print.css Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-20 19:11:55 UTC (rev 3818) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-20 19:15:50 UTC (rev 3819) @@ -1,3 +1,7 @@ +2006-11-20 Tim + PATCH: [ 1599401 ] Manual: Use bold text for questions (FAQ) + Manual/css: all.css help.css print.css + 2006-11-07 Tim PATCH: [ 1592234 ] Manual: Nicer Shortcut keys tables Manual: Shortcut_keys.xml Modified: branches/R2_6/Docs/Users/Manual/css/all.css =================================================================== --- branches/R2_6/Docs/Users/Manual/css/all.css 2006-11-20 19:11:55 UTC (rev 3818) +++ branches/R2_6/Docs/Users/Manual/css/all.css 2006-11-20 19:15:50 UTC (rev 3819) @@ -43,6 +43,11 @@ border: 1px solid red; } +/* FAQ */ +.question { + font-weight: bold; +} + /* tables */ .table table { border-collapse: collapse; Modified: branches/R2_6/Docs/Users/Manual/css/help.css =================================================================== --- branches/R2_6/Docs/Users/Manual/css/help.css 2006-11-20 19:11:55 UTC (rev 3818) +++ branches/R2_6/Docs/Users/Manual/css/help.css 2006-11-20 19:15:50 UTC (rev 3819) @@ -39,6 +39,11 @@ border: 1px solid red; } +/* FAQ */ +.question { + font-weight: bold; +} + /* tables */ .table table { border-collapse: collapse; Modified: branches/R2_6/Docs/Users/Manual/css/print.css =================================================================== --- branches/R2_6/Docs/Users/Manual/css/print.css 2006-11-20 19:11:55 UTC (rev 3818) +++ branches/R2_6/Docs/Users/Manual/css/print.css 2006-11-20 19:15:50 UTC (rev 3819) @@ -50,6 +50,11 @@ border: 1px solid black; } +/* FAQ */ +.question { + font-weight: bold; +} + /* tables */ .table table { border-collapse: collapse; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-11-21 21:43:29
|
Revision: 3827 http://svn.sourceforge.net/winmerge/?rev=3827&view=rev Author: gerundt Date: 2006-11-21 13:43:28 -0800 (Tue, 21 Nov 2006) Log Message: ----------- PATCH: [ 1398013 ] Add availability of binary viewing/merging to FAQ Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Faq.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-21 21:42:15 UTC (rev 3826) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-21 21:43:28 UTC (rev 3827) @@ -1,3 +1,7 @@ +2006-11-21 Tim + PATCH: [ 1398013 ] Add availability of binary viewing/merging to FAQ + Manual: Faq.xml + 2006-11-20 Tim PATCH: [ 1599401 ] Manual: Use bold text for questions (FAQ) Manual/css: all.css help.css print.css Modified: branches/R2_6/Docs/Users/Manual/Faq.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Faq.xml 2006-11-21 21:42:15 UTC (rev 3826) +++ branches/R2_6/Docs/Users/Manual/Faq.xml 2006-11-21 21:43:28 UTC (rev 3827) @@ -196,7 +196,8 @@ <answer> <para>Windows registry files (<filename><replaceable>*</replaceable>.reg</filename>) are Unicode - files (UTF-16 or UCS-2) -- see previous answer.</para> + files (UTF-16 or UCS-2) -- see the question "<link linkend="qmergebinaryfiles">I + cannot merge binary files?</link>" for a workaround.</para> </answer> </qandaentry> @@ -212,23 +213,23 @@ files. You can try to remove those zero-bytes from files. Alternatively, you may open the files with the DisplayBinaryFiles plugin. This plugin allows viewing binary files, but not editing - them. If you have a very recent version of WinMerge (2.5.0.4+), you - may use the new EditBinaryFiles plugin, which does allow editing + them. If you have a very recent version of WinMerge (2.6.0 and newer), + you may use the new EditBinaryFiles plugin, which does allow editing binary files (using an escape scheme for representing non-printable characters).</para> </answer> </qandaentry> <qandaentry> - <question> + <question id="qmergebinaryfiles"> <para>I cannot merge binary files?</para> </question> <answer> - <para>A plugin to merge binary files has only recently been added to - WinMerge, and is not in any release before 2.5.0.4. Therefore, - WinMerge can only show if binary files are identical or - different.</para> + <para>WinMerge 2.4.0 (and newer) includes a binary file + viewer (plugin <filename>DisplayBinaryFiles.dll</filename>). + WinMerge 2.6.0 (and newer) includes a binary file + editor (plugin <filename>EditBinaryFiles.dll</filename>).</para> </answer> </qandaentry> </qandaset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-11-21 21:53:51
|
Revision: 3829 http://svn.sourceforge.net/winmerge/?rev=3829&view=rev Author: gerundt Date: 2006-11-21 13:53:48 -0800 (Tue, 21 Nov 2006) Log Message: ----------- Move "filecomp1.png" screenshot after the first paragraph. This looks better and more consistent. Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Compare_files.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-21 21:53:15 UTC (rev 3828) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-21 21:53:48 UTC (rev 3829) @@ -1,6 +1,8 @@ 2006-11-21 Tim PATCH: [ 1398013 ] Add availability of binary viewing/merging to FAQ Manual: Faq.xml + Move "filecomp1.png" screenshot after the first paragraph. This looks better and more consistent. + Manual: Compare_files.xml 2006-11-20 Tim PATCH: [ 1599401 ] Manual: Use bold text for questions (FAQ) Modified: branches/R2_6/Docs/Users/Manual/Compare_files.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-11-21 21:53:15 UTC (rev 3828) +++ branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-11-21 21:53:48 UTC (rev 3829) @@ -7,6 +7,12 @@ WinMerge without needing to open files to external editor program or devepment environment.</para> + <mediaobject> + <imageobject> + <imagedata fileref="screenshots/filecomp1.png" format="PNG" /> + </imageobject> + </mediaobject> + <para>WinMerge editor is not comparable to specialized editor programs, but it has basic features like <guilabel>Undo</guilabel>/<guilabel>Redo</guilabel>, @@ -21,12 +27,6 @@ refresh is recommended after editing.</para> </tip> - <mediaobject> - <imageobject> - <imagedata fileref="screenshots/filecomp1.png" format="PNG" /> - </imageobject> - </mediaobject> - <sect2> <title>Showing the Differences</title> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-11-22 15:17:38
|
Revision: 3833 http://svn.sourceforge.net/winmerge/?rev=3833&view=rev Author: kimmov Date: 2006-11-22 07:17:36 -0800 (Wed, 22 Nov 2006) Log Message: ----------- PATCH: [ 1600651 ] Manual: clarify folder filter rules about starting mark Modified Paths: -------------- branches/R2_6/Docs/Users/Manual/Changes.txt branches/R2_6/Docs/Users/Manual/Filters.xml Modified: branches/R2_6/Docs/Users/Manual/Changes.txt =================================================================== --- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-22 15:12:36 UTC (rev 3832) +++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-22 15:17:36 UTC (rev 3833) @@ -1,3 +1,7 @@ +2006-11-22 Kimmo + PATCH: [ 1600651 ] Manual: clarify folder filter rules about starting mark + Manual: Filters.xml + 2006-11-21 Tim PATCH: [ 1398013 ] Add availability of binary viewing/merging to FAQ Manual: Faq.xml Modified: branches/R2_6/Docs/Users/Manual/Filters.xml =================================================================== --- branches/R2_6/Docs/Users/Manual/Filters.xml 2006-11-22 15:12:36 UTC (rev 3832) +++ branches/R2_6/Docs/Users/Manual/Filters.xml 2006-11-22 15:17:36 UTC (rev 3833) @@ -145,7 +145,7 @@ filter must contain rule to include all wanted subfolders. Usually its wise to use this rule to include all subfolders:</para> - <screen>d: \\*$ ## Subdirectories</screen> + <screen>d: \\*$ ## Subfolders</screen> <para>There can be one filter rule in one line. And rule cannot be split to several lines. Common format for one filter line is like this:</para> @@ -154,15 +154,16 @@ <para>or</para> - <screen>d: \\directory$ ## Match given directory name</screen> + <screen>d: \\folder$ ## Match given folder name</screen> <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 "directory".) 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. 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 + (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> <para><note> @@ -181,7 +182,8 @@ f: \.h$ ## Match *.h files f: ^My ## Match My*.* files f: Dlg\. ## Match *Dlg.* files -d: \\test$ ## Match 'test' directories</screen> +d: \\test$ ## Match 'test' folders +d: ^\\Build$ ## Match 'Build' 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. |