|
From: <ki...@us...> - 2006-11-22 15:24:23
|
Revision: 3835
http://svn.sourceforge.net/winmerge/?rev=3835&view=rev
Author: kimmov
Date: 2006-11-22 07:24:22 -0800 (Wed, 22 Nov 2006)
Log Message:
-----------
PATCH: [ 1600658 ] Manual: Add minimize commandline parameter
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Command_line.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-22 15:20:21 UTC (rev 3834)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-22 15:24:22 UTC (rev 3835)
@@ -1,6 +1,8 @@
2006-11-22 Kimmo
PATCH: [ 1600651 ] Manual: clarify folder filter rules about starting mark
Manual: Filters.xml
+ PATCH: [ 1600658 ] Manual: Add minimize commandline parameter
+ Manual: Command_line.xml
2006-11-21 Tim
PATCH: [ 1398013 ] Add availability of binary viewing/merging to FAQ
Modified: branches/R2_6/Docs/Users/Manual/Command_line.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Command_line.xml 2006-11-22 15:20:21 UTC (rev 3834)
+++ branches/R2_6/Docs/Users/Manual/Command_line.xml 2006-11-22 15:24:22 UTC (rev 3835)
@@ -31,6 +31,8 @@
<arg choice="opt" rep="norepeat"><option>/wr</option></arg>
+ <arg><option>/minimize</option></arg>
+
<arg choice="opt" rep="norepeat"><option>/dl</option> <replaceable>leftdesc</replaceable></arg>
<arg choice="opt" rep="norepeat"><option>/dr</option> <replaceable>rightdesc</replaceable></arg>
@@ -103,6 +105,11 @@
</listitem>
<listitem>
+ <simpara><option>/minimize</option> or <option>-minimize</option> starts
+ WinMerge as minimized</simpara>
+ </listitem>
+
+ <listitem>
<simpara><option>/dl</option> or <option>-dl</option> adds a description
for left side shown instead of directory/filename</simpara>
</listitem>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-23 16:13:15
|
Revision: 3839
http://svn.sourceforge.net/winmerge/?rev=3839&view=rev
Author: kimmov
Date: 2006-11-23 08:13:11 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
PATCH: [ 1601440 ] Manual: improve command line options chapter
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Command_line.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-23 16:09:57 UTC (rev 3838)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-23 16:13:11 UTC (rev 3839)
@@ -1,3 +1,7 @@
+2006-11-23 Kimmo
+ PATCH: [ 1601440 ] Manual: improve command line options chapter
+ Manual: Command_line.xml
+
2006-11-22 Kimmo
PATCH: [ 1600651 ] Manual: clarify folder filter rules about starting mark
Manual: Filters.xml
Modified: branches/R2_6/Docs/Users/Manual/Command_line.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Command_line.xml 2006-11-23 16:09:57 UTC (rev 3838)
+++ branches/R2_6/Docs/Users/Manual/Command_line.xml 2006-11-23 16:13:11 UTC (rev 3839)
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<sect1 id="CommandLine">
- <title>Commandline</title>
+ <title><indexterm>
+ <primary>Command line</primary>
+ </indexterm>Command Line</title>
- <para>WinMerge can be also used from commandline. There are several
- commandline switches to ease using WinMerge as external merge/diff
- application.</para>
+ <para>WinMerge accepts several parameters from command line, in addition to
+ paths to compare. Most of these parameters are are intended for using
+ WinMerge as an external compare application. Or for starting from batch
+ files.</para>
- <para>Syntax for commandline is:</para>
+ <para>Syntax for the command line is:</para>
<para><screen><cmdsynopsis sepchar=" ">
<command moreinfo="none">WinMerge</command>
@@ -44,104 +47,124 @@
<arg choice="opt" rep="norepeat"><replaceable>outputpath</replaceable></arg>
</cmdsynopsis></screen></para>
+ <para>All parameters start with "/" or with "-" prefix character. Pathnames
+ don't have any prefix character.</para>
+
<itemizedlist>
<listitem>
- <simpara><option>/?</option> or <option>-?</option> displays help
- message</simpara>
+ <simpara><option>/?</option> displays the most commonly used parameters
+ as help dialog.</simpara>
</listitem>
<listitem>
- <simpara><option>/r</option> or <option>-r</option> tells winmerge to
- compare directories recursively</simpara>
+ <simpara><option>/r</option> tells WinMerge to compare folders
+ recursively . Normally WinMerge does not compare subfolder contents but
+ does the "flat" compare showing the files in compared folders and
+ subfolders as separate items. Using /r tells WinMerge to compare all
+ files in all subfolders. When subfolders are included, only unique
+ subfolders are visible as separate items in compare results. Note that
+ including subfolders can increase compare time remarkably.</simpara>
</listitem>
<listitem>
- <simpara><option>/e</option> or <option>-e</option> allows WinMerge to
- be closed with a single esc keypress</simpara>
+ <simpara><option>/e</option> allows WinMerge to be closed with a single
+ <keycap>Esc</keycap> keypress. This is useful when using WinMerge as an
+ external compare application. WinMerge can act like an dialog which is
+ easy and fast to close.</simpara>
</listitem>
<listitem>
- <simpara><option>/f</option> or <option>-f</option> allows selecting
- filter used. Filter can be filemask like "<filename>*.h
- *.cpp</filename>" or name of filefilter like "<literal>XML/HTML
- Devel</literal>". Quotation marks must be used if filter mask or name
- contains spaces</simpara>
+ <simpara><option>/f</option> allows selecting filter used. Filter can be
+ filemask like "<filename>*.h *.cpp</filename>" or name of filefilter
+ like "<literal>XML/HTML Devel</literal>". Quotation marks must be used
+ if filter mask or name contains spaces.</simpara>
</listitem>
<listitem>
- <simpara><option>/x</option> or <option>-x</option> closes WinMerge
- after information dialog when files are identical</simpara>
+ <simpara><option>/x</option> closes WinMerge after information dialog
+ when files are identical. This parameter is useful when WinMerge is used
+ as an external compare application. It helps to faster process and/or
+ ignore files which don't have any differences.</simpara>
</listitem>
<listitem>
- <para><option>/s</option> or <option>-s</option> enables single-instance
- behavior. If there is already WinMerge running new compare is opened to
- that same instance.</para>
+ <simpara><option>/s</option> enables single-instance behavior. If there
+ is already WinMerge running new compare is opened to that same instance.
+ Depending on other settings (if multiple windows are allowed) new
+ compare is opened to existing or new window.</simpara>
</listitem>
<listitem>
- <simpara><option>/ul</option> or <option>-ul</option> tells winmerge to
- not add left path to MRU</simpara>
+ <simpara><option>/ul</option> tells WnMerge to not add left path to MRU.
+ External applications should not add paths to Open-dialog's MRU
+ lists.</simpara>
</listitem>
<listitem>
- <simpara><option>/ur</option> or <option>-ur</option> tells winmerge to
- not add right path to MRU</simpara>
+ <simpara><option>/ur</option> tells WinMerge to not add right path to
+ MRU. External applications should not add paths to Open-dialog's MRU
+ lists.</simpara>
</listitem>
<listitem>
- <simpara><option>/ub</option> or <option>-ub</option> tells winmerge to
- not add both paths to MRU</simpara>
+ <simpara><option>/ub</option> tells WinMerge to not add both paths to
+ MRU. External applications should not add paths to Open-dialog's MRU
+ lists.</simpara>
</listitem>
<listitem>
- <simpara><option>/wl</option> or <option>-wl</option> initially opens
- left side as read-only</simpara>
+ <simpara><option>/wl</option> initially opens left side as read-only.
+ Use this when you don't want to change left-side items in
+ compare.</simpara>
</listitem>
<listitem>
- <simpara><option>/wr</option> or <option>-wr</option> initially opens
- right side as read-only</simpara>
+ <simpara><option>/wr</option> initially opens right side as read-only.
+ Use this when you don't want to change right-side items in
+ compare.</simpara>
</listitem>
<listitem>
- <simpara><option>/minimize</option> or <option>-minimize</option> starts
- WinMerge as minimized</simpara>
+ <simpara><option>/minimize</option> starts WinMerge as minimized. This
+ option can be used to start WinMerge minimized for lenghty
+ compares.</simpara>
</listitem>
<listitem>
- <simpara><option>/dl</option> or <option>-dl</option> adds a description
- for left side shown instead of directory/filename</simpara>
+ <simpara><option>/dl</option> adds a description for left side shown
+ instead of folder / filename. This allows showing version number or
+ label for compared items. Like "Version 1.0" or "Work Copy".</simpara>
</listitem>
<listitem>
- <simpara><option>/dr</option> or <option>-dr</option> adds a description
- for right side shown instead of directory/filename</simpara>
+ <simpara><option>/dr</option> adds a description for right side shown
+ instead of folder / filename. This allows showing version number or
+ label for compared items. Like "Version 1.0" or "Work Copy".</simpara>
</listitem>
<listitem>
- <simpara><replaceable>leftpath</replaceable> is the directory or
- filename to open on the left side</simpara>
+ <simpara><replaceable>leftpath</replaceable> is the folder or filename
+ to open on the left side.</simpara>
</listitem>
<listitem>
- <simpara><replaceable>rightpath</replaceable> is the directory or
- filename to open on the right side</simpara>
+ <simpara><replaceable>rightpath</replaceable> is the folder or filename
+ to open on the right side.</simpara>
</listitem>
<listitem>
<simpara><replaceable>outputpath</replaceable> is an optional output
- directory where you want merged files to be saved</simpara>
+ folder where you want merged files to be saved.</simpara>
</listitem>
</itemizedlist>
<note>
<para><replaceable>leftpath</replaceable> and
<replaceable>rightpath</replaceable> have to both be files or both be
- directories</para>
+ folders.</para>
</note>
- <para>If both paths are not files or directories or one of paths is
- non-existent WinMerge shows Open-dialog for user to choose proper paths to
+ <para>If both paths are not files or folders or one of paths is non-existent
+ WinMerge shows the Open-dialog for user to choose proper paths to
open.</para>
</sect1>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-25 23:30:49
|
Revision: 3849
http://svn.sourceforge.net/winmerge/?rev=3849&view=rev
Author: gerundt
Date: 2006-11-25 15:30:46 -0800 (Sat, 25 Nov 2006)
Log Message:
-----------
PATCH: [ 1602517 ] Manual: Remove "10.3.2. Apply to unrecognized side"
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Configuration.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-25 23:28:52 UTC (rev 3848)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-25 23:30:46 UTC (rev 3849)
@@ -1,3 +1,7 @@
+2006-11-26 Tim
+ PATCH: [ 1602517 ] Manual: Remove "10.3.2. Apply to unrecognized side"
+ Manual: Configuration.xml
+
2006-11-23 Kimmo
PATCH: [ 1601440 ] Manual: improve command line options chapter
Manual: Command_line.xml
Modified: branches/R2_6/Docs/Users/Manual/Configuration.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Configuration.xml 2006-11-25 23:28:52 UTC (rev 3848)
+++ branches/R2_6/Docs/Users/Manual/Configuration.xml 2006-11-25 23:30:46 UTC (rev 3849)
@@ -320,17 +320,6 @@
</sect3>
<sect3>
- <title>Apply to unrecognized side</title>
-
- <para>When this options is enabled WinMerge applies known file format's
- syntax highlight to another file even if that file's extension is not
- known. For example, if you compare files, <filename>file.cpp</filename>
- and <filename>file.cpp.bak</filename>, WinMerge detects
- <filename>file.cpp</filename> needs C++ syntax highlight. And then uses
- same rules for <filename>file.cpp.bak</filename> too.</para>
- </sect3>
-
- <sect3>
<title>Automatic rescan</title>
<indexterm>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-26 20:35:22
|
Revision: 3853
http://svn.sourceforge.net/winmerge/?rev=3853&view=rev
Author: kimmov
Date: 2006-11-26 12:35:20 -0800 (Sun, 26 Nov 2006)
Log Message:
-----------
PATCH: [ 1602658 ] Manual: note about some 7-zip MSI installers missing file
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-11-26 20:32:58 UTC (rev 3852)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-26 20:35:20 UTC (rev 3853)
@@ -1,3 +1,7 @@
+2006-11-26 Kimmo
+ PATCH: [ 1602658 ] Manual: note about some 7-zip MSI installers missing file
+ Manual: Install.xml
+
2006-11-26 Tim
PATCH: [ 1602517 ] Manual: Remove "10.3.2. Apply to unrecognized side"
Manual: Configuration.xml
Modified: branches/R2_6/Docs/Users/Manual/Install.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Install.xml 2006-11-26 20:32:58 UTC (rev 3852)
+++ branches/R2_6/Docs/Users/Manual/Install.xml 2006-11-26 20:35:20 UTC (rev 3853)
@@ -9,8 +9,8 @@
<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>
+ WinMerge as 32-bit application. For the Shell Integration there is the
+ 64-bit version of extension included in the installer.</para>
</note>
<sect2>
@@ -231,7 +231,9 @@
</sect2>
<sect2>
- <title>7-Zip and Archive Support</title>
+ <title><indexterm>
+ <primary>Installing Archive Support</primary>
+ </indexterm>7-Zip and Archive Support</title>
<para>WinMerge uses <ulink url="http://www.7-zip.org/">7-Zip</ulink> for
archive support, but WinMerge installer does not install 7-Zip or archive
@@ -239,6 +241,13 @@
archive support. 7-Zip installer can be downloaded from <ulink
url="http://www.7-zip.org/">7-Zip.org</ulink>.</para>
+ <important>
+ <para>There are 7-Zip MSI installers that do not install all the
+ files WinMerge needs (namely <filename>7zip_pad.xml</filename> in 7-Zip
+ program folder). If there are problems with archive support enabling,
+ try running the EXE version of the 7-Zip installer.</para>
+ </important>
+
<para>To install archive support, download and install 7-Zip plugin
(Merge7zInstaller, see below) from <ulink
url="http://www.winmerge.org/">WinMerge.org</ulink>.</para>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-27 17:32:38
|
Revision: 3859
http://svn.sourceforge.net/winmerge/?rev=3859&view=rev
Author: kimmov
Date: 2006-11-27 09:32:29 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
PATCH: [ 1603359 ] Manual: FAQ updates
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-27 17:30:17 UTC (rev 3858)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-27 17:32:29 UTC (rev 3859)
@@ -1,3 +1,7 @@
+2006-11-27 Kimmo
+ PATCH: [ 1603359 ] Manual: FAQ updates
+ Manual: Faq.xml
+
2006-11-26 Kimmo
PATCH: [ 1602658 ] Manual: note about some 7-zip MSI installers missing file
Manual: Install.xml
Modified: branches/R2_6/Docs/Users/Manual/Faq.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Faq.xml 2006-11-27 17:30:17 UTC (rev 3858)
+++ branches/R2_6/Docs/Users/Manual/Faq.xml 2006-11-27 17:32:29 UTC (rev 3859)
@@ -63,15 +63,19 @@
<qandaentry>
<question>
- <para>When wanting to compare directories, I cannot select a
- directory in Browse?</para>
+ <para>When wanting to compare folders, I cannot select a folder in
+ Browse-dialog?</para>
</question>
<answer>
- <para>Are you trying to select a directory by clicking on it in the
- upper part of the Open File dialog ? The Open File dialog will then
- open it, and you have to push <guibutton>Ok</guibutton> again to get
- out.</para>
+ <para>Browse to the folder you want to compare (folder contents is
+ shown in the dialog). Do not select any of the files or subfolders,
+ just select the <guibutton>Open</guibutton>-button when
+ "<guilabel>Folder Selection</guilabel>" is shown in filename
+ editbox. If you already selected any of the files or subfolders,
+ just write some nonsense to the filename editbox and select the
+ Open-button. When the filename editbox doesn't contain any existing
+ filename then WinMerge opens the folder.</para>
</answer>
</qandaentry>
@@ -145,7 +149,7 @@
<qandaentry>
<question>
<para>Why do large files sometimes show as different in the
- directory view, but come up as identical in the merge editor?</para>
+ folder view, but come up as identical in the merge editor?</para>
</question>
<answer>
@@ -164,6 +168,38 @@
<screen>HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimit</screen>
</answer>
</qandaentry>
+
+ <qandaentry>
+ <question>
+ <para>WinMerge shows an error (or even crashes!) complaining it
+ cannot load CompareMSWordFiles.dll and/or
+ CompareMSExcelFiles.dll!</para>
+ </question>
+
+ <answer>
+ <para>Mentioned files are plugins written with Visual Basic (6.0).
+ WinMerge installer does not contain Visual Basic runtime files so
+ those plugins cannot be loaded. You can:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>Remove those files from <filename
+ class="directory">WinMerge/Plugins</filename> -folder or</para>
+ </listitem>
+
+ <listitem>
+ <para>Download the Visual Basic 6.0 runtime distribution from
+ Microsoft: <ulink
+ url="http://support.microsoft.com/kb/290887">http://support.microsoft.com/kb/290887</ulink>
+ and install it. Or download just the one needed file from:
+ <ulink
+ url="http://www.dll-files.com/dllindex/dll-files.shtml?msvbvm60">http://www.dll-files.com/dllindex/dll-files.shtml?msvbvm60</ulink>
+ and copy it to the <filename
+ class="directory">WinMerge</filename> folder.</para>
+ </listitem>
+ </orderedlist>
+ </answer>
+ </qandaentry>
</qandaset>
</sect2>
@@ -196,8 +232,9 @@
<answer>
<para>Windows registry files
(<filename><replaceable>*</replaceable>.reg</filename>) are Unicode
- files (UTF-16 or UCS-2) -- see the question "<link linkend="qmergebinaryfiles">I
- cannot merge binary files?</link>" for a workaround.</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>
@@ -213,10 +250,10 @@
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.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>
+ 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>
@@ -226,10 +263,10 @@
</question>
<answer>
- <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>
+ <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>
@@ -255,18 +292,6 @@
<qandaentry>
<question>
- <para>I would like to see the line numbers?</para>
- </question>
-
- <answer>
- <para>WinMerge shows current line in editor statusbar. WinMerge
- cannot show in-editor linenumbers. That is one feature we might
- consider for future releases.</para>
- </answer>
- </qandaentry>
-
- <qandaentry>
- <question>
<para>I see question marks instead of letters in files?</para>
</question>
@@ -317,8 +342,12 @@
</question>
<answer>
- <para>Unfortunately printing is not supported. This is one area
- where we would really appreciate help in implementation!</para>
+ <para>There is basic printing support in WinMerge 2.6.0 and later
+ versions. Select <menuchoice>
+ <guimenu>File</guimenu>
+
+ <guimenuitem>Print...</guimenuitem>
+ </menuchoice> from the menu.</para>
</answer>
</qandaentry>
@@ -348,12 +377,24 @@
</question>
<answer>
- <para>Use <option>-e</option> commandline switch.</para>
+ <para>Use <option>-e</option> command line switch.</para>
</answer>
</qandaentry>
<qandaentry>
<question>
+ <para>I don't want to see the "<guilabel>Files Are
+ Identical</guilabel>" -messagebox when I compare identical files, I
+ just want WinMerge to quit.</para>
+ </question>
+
+ <answer>
+ <para>Use <option>-x</option> command line switch.</para>
+ </answer>
+ </qandaentry>
+
+ <qandaentry>
+ <question>
<para>How can I avoid temporary paths filling Open-dialog history
lists?</para>
</question>
@@ -406,7 +447,7 @@
changed files in different directories. WinMerge has internal
support (surprise?) for handling these files. Just select zip file
in question to left side and right side and WinMerge opens zip files
- contents to directory compare comparing original and altered
+ contents to folder compare comparing original and altered
files.</para>
</answer>
</qandaentry>
@@ -577,4 +618,4 @@
<para></para>
</sect2>
-</sect1>
+</sect1>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-27 17:37:59
|
Revision: 3861
http://svn.sourceforge.net/winmerge/?rev=3861&view=rev
Author: kimmov
Date: 2006-11-27 09:37:55 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
PATCH: [ 1603385 ] Manual: fix filter file path, clarify template file usage
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-27 17:36:25 UTC (rev 3860)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-27 17:37:55 UTC (rev 3861)
@@ -1,6 +1,8 @@
2006-11-27 Kimmo
PATCH: [ 1603359 ] Manual: FAQ updates
Manual: Faq.xml
+ PATCH: [ 1603385 ] Manual: fix filter file path, clarify template file usage
+ Manual: Filters.xml
2006-11-26 Kimmo
PATCH: [ 1602658 ] Manual: note about some 7-zip MSI installers missing file
Modified: branches/R2_6/Docs/Users/Manual/Filters.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Filters.xml 2006-11-27 17:36:25 UTC (rev 3860)
+++ branches/R2_6/Docs/Users/Manual/Filters.xml 2006-11-27 17:37:55 UTC (rev 3861)
@@ -94,7 +94,10 @@
explained later in this chapter. Filters-dialog allows creating new
filter files based on template file. Filter files can be created from
the scrach but using template file is the recommended way to create a
- new filter.</para>
+ new filter. The template file is named
+ <filename>FileFilter.tmpl</filename> and can be modified if needed. The
+ template file is located in <filename
+ class="directory">WinMerge/Filters</filename> -folder.</para>
<para>Filter files have two possible locations:</para>
@@ -113,16 +116,16 @@
<guimenuitem>Options</guimenuitem>
</menuchoice><guilabel>> System >
</guilabel><guilabel>Filter Folder)</guilabel>. By default it is
- <filename class="directory">My Documents</filename> -folder.</para>
+ <filename class="directory">My Documents\WinMerge\Filters</filename>
+ -folder.</para>
</listitem>
</itemizedlist>
<important>
- <para>With WinMerge 2.5.4 and later filter files should not be anymore
- placed to profile folder like with earlier versions. Using
+ <para>With WinMerge 2.6.0 and later filter files are not anymore
+ loaded from profile folder like with earlier versions. Using
user-defined folder for filter files provices more flexibility and
- easier access to filter files. WinMerge still reads filters from
- profile folder for backwards compatibility.</para>
+ easier access to filter files.</para>
</important>
<para>First part of filter file defines name and basic functionality of
@@ -316,4 +319,4 @@
<screen>^#</screen>
</example>
</sect2>
-</sect1>
+</sect1>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-27 18:18:11
|
Revision: 3863
http://svn.sourceforge.net/winmerge/?rev=3863&view=rev
Author: kimmov
Date: 2006-11-27 10:05:59 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
PATCH: [ 1603393 ] Improve project file documentation
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Open_paths.xml
Added Paths:
-----------
branches/R2_6/Docs/Users/Manual/screenshots/projfile_save.png
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-27 18:03:24 UTC (rev 3862)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-27 18:05:59 UTC (rev 3863)
@@ -3,6 +3,9 @@
Manual: Faq.xml
PATCH: [ 1603385 ] Manual: fix filter file path, clarify template file usage
Manual: Filters.xml
+ PATCH: [ 1603393 ] Improve project file documentation
+ Manual: Open_paths.xml
+ Manual/screenshots new file: projfile_save.png
2006-11-26 Kimmo
PATCH: [ 1602658 ] Manual: note about some 7-zip MSI installers missing file
Modified: branches/R2_6/Docs/Users/Manual/Open_paths.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Open_paths.xml 2006-11-27 18:03:24 UTC (rev 3862)
+++ branches/R2_6/Docs/Users/Manual/Open_paths.xml 2006-11-27 18:05:59 UTC (rev 3863)
@@ -46,7 +46,7 @@
subfolders <filename class="directory">Original/</filename> and
<filename class="directory">Altered/</filename> it must be opened by
selecting same filename to both sides in
- <guilabel>Open</guilabel>-dialog or commandline. Then
+ <guilabel>Open</guilabel>-dialog or command line. Then
<productname>WinMerge</productname> can compare contents of those two
subfolders.</para>
@@ -86,7 +86,7 @@
<para>Field can also contain file filter name. Easiest way to select
file filter is using <guilabel>Filters</guilabel>-dialog which can be
- opended with "<guibutton>Select...</guibutton>" button next to field.
+ opened with "<guibutton>Select...</guibutton>" button next to field.
That dialog allows also creating, editing and deleting of filter
files.</para>
@@ -99,14 +99,12 @@
</sect2>
<sect2>
- <title>Shell Integration</title>
+ <title><indexterm>
+ <primary>Shell Integration</primary>
+ </indexterm>Shell Integration</title>
- <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
+ Windows Explorer. Installer enables Shell Integration if chosen 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
@@ -125,7 +123,7 @@
<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:
+ WinMerge adds two menu items to Explorer context menu:
"<guimenuitem>Compare To</guimenuitem>" and
"<guimenuitem>Compare...</guimenuitem>". <guimenuitem>Compare
To</guimenuitem> selects path as first ("<guilabel>Left</guilabel>")
@@ -149,8 +147,8 @@
<listitem>
<simpara>Browse to location of second item you want to compare and
- select it. Open context menu and move menuselection over first
- "<guimenuitem>Compare</guimenuitem>" item. Now Explorer's statusbar
+ select it. Open context menu and move menu selection over first
+ "<guimenuitem>Compare</guimenuitem>" item. Now Explorer's status bar
shows memorized path to which you are comparing newly selected
path.</simpara>
</listitem>
@@ -197,60 +195,80 @@
</sect2>
<sect2>
- <title>Project file</title>
+ <title><indexterm>
+ <primary>Project Files</primary>
+ </indexterm>Project Files</title>
- <para>Simple project files can be used to select commonly used paths with
- filter. Project file can be given to commandline like normal file or
- opened from <menuchoice>
- <guimenu>File</guimenu>
+ <para>Project files allow fast and easy opening of commonly used paths
+ (and filter). The user can easily save currently open paths as project
+ file for later use.</para>
- <guimenuitem>Open Project...</guimenuitem>
- </menuchoice> <productname>WinMerge</productname> reads paths project
- file contains and if two paths are given opens them. If only one path is
- given or one of paths is invalid <guilabel>Open</guilabel>-dialog is shown
- for user to select second path or valid paths.</para>
+ <sect3>
+ <title>Opening Project File</title>
- <para>Project files can be edited and saved using <guilabel>Project
- File</guilabel> -dialog that can be opened from <menuchoice>
- <guimenu>File</guimenu>
+ <para>Project file can be given to command line like normal file or
+ opened from <menuchoice>
+ <guimenu>File</guimenu>
- <guimenuitem>Save Project...</guimenuitem>
- </menuchoice> When opened, the dialog is initialized with values from
- current compare. Values can be edited and saved to project file with
- <guilabel>Save...</guilabel> button. One can also load existing project
- file with <guilabel>Open...</guilabel> button.</para>
+ <guimenuitem>Open Project...</guimenuitem>
+ </menuchoice> WinMerge reads paths from project file and if two paths
+ are given opens them. If only one path is given or one of paths is
+ invalid, the <guilabel>Open</guilabel>-dialog is shown for user to
+ select the second path or valid paths.</para>
- <para>Project file can be selected also in <guilabel>Open</guilabel>
- dialog. There are couple of things to remember:</para>
+ <para>Project file can be selected also in <guilabel>Open</guilabel>
+ dialog. There are couple of things to remember:</para>
- <itemizedlist>
- <listitem>
- <simpara>If two project files are selected, project files themselves
- are compared.</simpara>
- </listitem>
+ <itemizedlist>
+ <listitem>
+ <simpara>If two project files are selected, project files themselves
+ are compared.</simpara>
+ </listitem>
- <listitem>
- <simpara>If project file is selected as left-side file, and right-side
- file is empty, project file is opened like using <menuchoice>
- <guimenu>File</guimenu>
+ <listitem>
+ <simpara>If project file is selected as left-side file, and
+ right-side file is empty, project file is opened like using
+ <menuchoice>
+ <guimenu>File</guimenu>
- <guimenuitem>Open Project...</guimenuitem>
- </menuchoice> dialog.</simpara>
- </listitem>
+ <guimenuitem>Open Project...</guimenuitem>
+ </menuchoice> dialog.</simpara>
+ </listitem>
- <listitem>
- <simpara>If project file is selected as left-side file and any other
- file as right-side file, contents of project file and another file are
- compared.</simpara>
- </listitem>
- </itemizedlist>
+ <listitem>
+ <simpara>If project file is selected as left-side file and any other
+ file as right-side file, contents of project file and another file
+ are compared.</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
- <para>Project files are simple XML files with <filename
- class="extension">.WinMerge</filename> extension.</para>
+ <sect3>
+ <title>Editing and Saving Project File</title>
+ <para>Project files can be edited and saved using <guilabel>Project
+ File</guilabel> -dialog that can be opened from <menuchoice>
+ <guimenu>File</guimenu>
+
+ <guimenuitem>Save Project...</guimenuitem>
+ </menuchoice> When opened, the dialog is initialized with values from
+ the current compare. Values can be edited and saved to the project file
+ with <guilabel>Save...</guilabel> button. One can also load existing
+ project file with <guilabel>Open...</guilabel> button.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/projfile_save.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+ </sect3>
+
<sect3>
<title>Format</title>
+ <para>Project files are simple XML files with <filename
+ class="extension">.WinMerge</filename> extension.</para>
+
<screen><?xml version='1.0' encoding='UTF-8'?>
<project>
<paths>
@@ -263,7 +281,7 @@
</paths>
</project></screen>
- <para>The project file has four fields:</para>
+ <para>The project file has six fields:</para>
<itemizedlist>
<listitem>
@@ -300,8 +318,8 @@
</listitem>
</itemizedlist>
- <para>None of fields are required and they can be empty
+ <para>None of the fields are required and they can be empty
(<literal><left></left></literal>).</para>
</sect3>
</sect2>
-</sect1>
+</sect1>
\ No newline at end of file
Added: branches/R2_6/Docs/Users/Manual/screenshots/projfile_save.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/projfile_save.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-11-29 21:47:57
|
Revision: 3871
http://svn.sourceforge.net/winmerge/?rev=3871&view=rev
Author: gerundt
Date: 2006-11-29 13:47:55 -0800 (Wed, 29 Nov 2006)
Log Message:
-----------
PATCH: [ 1604059 ] Manual: Add missing options to Configuration.xml
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Configuration.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-29 21:46:54 UTC (rev 3870)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-29 21:47:55 UTC (rev 3871)
@@ -1,3 +1,7 @@
+2006-11-29 Tim
+ PATCH: [ 1604059 ] Manual: Add missing options to Configuration.xml
+ Manual: Configuration.xml
+
2006-11-27 Kimmo
PATCH: [ 1603359 ] Manual: FAQ updates
Manual: Faq.xml
Modified: branches/R2_6/Docs/Users/Manual/Configuration.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Configuration.xml 2006-11-29 21:46:54 UTC (rev 3870)
+++ branches/R2_6/Docs/Users/Manual/Configuration.xml 2006-11-29 21:47:55 UTC (rev 3871)
@@ -25,13 +25,19 @@
<sect3>
<title>Automatically scroll to first difference</title>
- <para>When this option is enabled:<simplelist>
- <member>after directory compare selection is moved to first
- different files or directories</member>
+ <para>When this option is enabled:</para>
- <member>after opening files for compare first difference in files is
- scrolled visible and selected</member>
- </simplelist></para>
+ <itemizedlist>
+ <listitem>
+ <simpara>After folder compare selection is moved to first
+ different files or folders.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>After opening files for compare first difference in files is
+ scrolled visible and selected.</simpara>
+ </listitem>
+ </itemizedlist>
</sect3>
<sect3>
@@ -97,13 +103,13 @@
<itemizedlist>
<listitem>
- <para>From file system - checks paths from filesystem. I.e. It
+ <para><guilabel>From file system</guilabel> - checks paths from filesystem. I.e. It
locates paths matching letters already typed and if matching path is
found, completes the path.</para>
</listitem>
<listitem>
- <para>From MRU list - checks paths only from MRU list. This is handy
+ <para><guilabel>From MRU list</guilabel> - checks paths only from MRU list. This is handy
when you have pretty limited set of paths (usually in MRU lists) to
compare.</para>
</listitem>
@@ -247,7 +253,7 @@
<sect3>
<title>File compare method</title>
- <para>File compare method has three choices:</para>
+ <para>File compare method has five choices:</para>
<itemizedlist>
<listitem>
@@ -284,6 +290,12 @@
<guilabel>Modified Date</guilabel> -comparison. But also checks file
sizes when dates are identical.</para>
</listitem>
+
+ <listitem>
+ <para><guilabel>Size</guilabel> - comparison of the sizes of the files.
+ This method only examines the file sizes, so it is fast, but
+ not so accurate like the contents methods.</para>
+ </listitem>
</itemizedlist>
</sect3>
@@ -474,6 +486,24 @@
</sect3>
<sect3>
+ <title>Ignore time differences less than 3 seconds</title>
+
+ <para><emphasis>Only for "<guilabel>Modified Date</guilabel>"
+ and "<guilabel>Modified Date and Size</guilabel>" compare
+ methods.</emphasis></para>
+
+ <para>It is possible that timestamps vary by one or two seconds in certain
+ situations. This usually happens with network shares. Normally WinMerge
+ determines such items as different. So this option allows WinMerge to
+ ignore time differences smaller than three seconds to help getting more
+ reliable results.</para>
+
+ <warning><para>This option should be enabled only when the
+ time difference is detected. Otherwise it can cause wrong compare
+ results.</para></warning>
+ </sect3>
+
+ <sect3>
<title>Add to explorer context menu</title>
<para>This option enables/disables shell integration. When enabled, new
@@ -497,6 +527,15 @@
</sect3>
<sect3>
+ <title>Include subfolders by default</title>
+
+ <para>Shell Integration by default does not include subfolders into comparison.
+ This behavior can be changed with this option. The default behavior can be also
+ changed by holding down the <keycap>Control</keycap> key while selecting the
+ <guimenuitem>Compare...</guimenuitem> item from the Explorer context menu.</para>
+ </sect3>
+
+ <sect3>
<title>External editor</title>
<indexterm>
@@ -613,7 +652,7 @@
<para>Actually, WinMerge detects the codepage for these extensions :
<filename class="extension">.html</filename>, <filename
class="extension">.rc</filename> (resource files for VC++) and
- .<filename>xml</filename>.</para>
+ <filename class="extension">.xml</filename>.</para>
<para>WinMerge also detects a codepage difference between the left/right
files. To avoid lossy conversions during merge/copy/paste, WinMerge
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-30 19:39:25
|
Revision: 3877
http://svn.sourceforge.net/winmerge/?rev=3877&view=rev
Author: gerundt
Date: 2006-11-30 11:39:23 -0800 (Thu, 30 Nov 2006)
Log Message:
-----------
PATCH: [ 1605673 ] Manual: Minimal changes in Filters.xml
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-30 19:38:06 UTC (rev 3876)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-30 19:39:23 UTC (rev 3877)
@@ -1,3 +1,7 @@
+2006-11-30 Tim
+ PATCH: [ 1605673 ] Manual: Minimal changes in Filters.xml
+ Manual: Filters.xml
+
2006-11-29 Tim
PATCH: [ 1604059 ] Manual: Add missing options to Configuration.xml
Manual: Configuration.xml
Modified: branches/R2_6/Docs/Users/Manual/Filters.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Filters.xml 2006-11-30 19:38:06 UTC (rev 3876)
+++ branches/R2_6/Docs/Users/Manual/Filters.xml 2006-11-30 19:39:23 UTC (rev 3877)
@@ -27,8 +27,8 @@
<term>Good site devoted for regexps:</term>
<listitem>
- <para><ulink
- url="http://www.regular-expressions.info/">http://www.regular-expressions.info/</ulink></para>
+ <simpara><ulink
+ url="http://www.regular-expressions.info/">http://www.regular-expressions.info/</ulink></simpara>
</listitem>
</varlistentry>
@@ -36,8 +36,8 @@
<term>Good HOWTO document for regexps:</term>
<listitem>
- <para><ulink
- url="http://www.amk.ca/python/howto/regex/">http://www.amk.ca/python/howto/regex/</ulink></para>
+ <simpara><ulink
+ url="http://www.amk.ca/python/howto/regex/">http://www.amk.ca/python/howto/regex/</ulink></simpara>
</listitem>
</varlistentry>
@@ -45,8 +45,8 @@
<term>Tutorial:</term>
<listitem>
- <para><ulink
- url="http://www.zvon.org/other/PerlTutorial/Output/index.html">http://www.zvon.org/other/PerlTutorial/Output/index.html</ulink></para>
+ <simpara><ulink
+ url="http://www.zvon.org/other/PerlTutorial/Output/index.html">http://www.zvon.org/other/PerlTutorial/Output/index.html</ulink></simpara>
</listitem>
</varlistentry>
@@ -54,8 +54,8 @@
<term>PDF quick reference:</term>
<listitem>
- <para><ulink
- url="http://www.night-ray.com/regex.pdf">http://www.night-ray.com/regex.pdf</ulink></para>
+ <simpara><ulink
+ url="http://www.night-ray.com/regex.pdf">http://www.night-ray.com/regex.pdf</ulink></simpara>
</listitem>
</varlistentry>
</variablelist>
@@ -111,13 +111,10 @@
<listitem>
<para>User-defined folder. Selected in Options (<menuchoice>
- <guimenu>Edit</guimenu>
-
- <guimenuitem>Options</guimenuitem>
- </menuchoice><guilabel>> System >
- </guilabel><guilabel>Filter Folder)</guilabel>. By default it is
- <filename class="directory">My Documents\WinMerge\Filters</filename>
- -folder.</para>
+ <guimenu>Edit</guimenu><guimenuitem>Options</guimenuitem>
+ <guimenuitem>System</guimenuitem><guilabel>Filter Folder</guilabel>
+ </menuchoice>). By default it is <filename class="directory">
+ My Documents\WinMerge\Filters</filename> folder.</para>
</listitem>
</itemizedlist>
@@ -297,10 +294,9 @@
<example>
<title>Line filter rule matching CVS "Id:" -lines:</title>
- <para>Id-lines are like this (dollar-char not written so that version
- control does not mess up that line):</para>
+ <para>Id-lines are like this:</para>
- <screen>// [dollar-char]Id: Filters.xml,v 1.14.2.2 2005/10/29 17:21:16 kimmov Exp [dollar-char]</screen>
+ <screen>// $Id: Filters.xml,v 1.14.2.2 2005/10/29 17:21:16 kimmov Exp $</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-12-01 16:14:04
|
Revision: 3881
http://svn.sourceforge.net/winmerge/?rev=3881&view=rev
Author: kimmov
Date: 2006-12-01 08:13:58 -0800 (Fri, 01 Dec 2006)
Log Message:
-----------
PATCH: [ 1605562 ] Manual: Add FAQ items about archive support installation
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-12-01 16:11:24 UTC (rev 3880)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-01 16:13:58 UTC (rev 3881)
@@ -1,3 +1,7 @@
+2006-12-01 Kimmo
+ PATCH: [ 1605562 ] Manual: Add FAQ items about archive support installation
+ Manual: Faq.xml
+
2006-11-30 Tim
PATCH: [ 1605673 ] Manual: Minimal changes in Filters.xml
Manual: Filters.xml
Modified: branches/R2_6/Docs/Users/Manual/Faq.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Faq.xml 2006-12-01 16:11:24 UTC (rev 3880)
+++ branches/R2_6/Docs/Users/Manual/Faq.xml 2006-12-01 16:13:58 UTC (rev 3881)
@@ -438,6 +438,27 @@
<qandaset>
<qandaentry>
<question>
+ <para>I installed 7-Zip but archive support does not work?</para>
+ </question>
+
+ <answer>
+ <para>Do you have plugin installed and or the plugin version matches
+ 7-Zip version? If not, see Installing chapter for instructions for
+ installing.</para>
+ </answer>
+
+ <answer>
+ <para>If the error is something like: "<emphasis>7-zip x.xx missing
+ / Plugin present</emphasis>", then you probably have installed 7-Zip
+ using MSI-installer. There are 7-Zip MSI installers that do not
+ install all the files WinMerge needs (namely
+ <filename>7zip_pad.xml</filename> in 7-Zip program folder). Download
+ and run the EXE version of the 7-Zip installer.</para>
+ </answer>
+ </qandaentry>
+
+ <qandaentry>
+ <question>
<para>How can I open "Perry-style" patch files WinMerge developers
use when submitting patches?</para>
</question>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-03 11:29:41
|
Revision: 3895
http://svn.sourceforge.net/winmerge/?rev=3895&view=rev
Author: kimmov
Date: 2006-12-03 03:29:38 -0800 (Sun, 03 Dec 2006)
Log Message:
-----------
PATCH: [ 1607084 ] Manual: Add new FAQ about missing runtime files
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-12-03 11:25:48 UTC (rev 3894)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-03 11:29:38 UTC (rev 3895)
@@ -1,3 +1,7 @@
+2006-12-03 Kimmo
+ PATCH: [ 1607084 ] Manual: Add new FAQ about missing runtime files
+ Manual: Faq.xml
+
2006-12-01 Kimmo
PATCH: [ 1605562 ] Manual: Add FAQ items about archive support installation
Manual: Faq.xml
Modified: branches/R2_6/Docs/Users/Manual/Faq.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Faq.xml 2006-12-03 11:25:48 UTC (rev 3894)
+++ branches/R2_6/Docs/Users/Manual/Faq.xml 2006-12-03 11:29:38 UTC (rev 3895)
@@ -204,6 +204,25 @@
</sect2>
<sect2>
+ <title>Installing</title>
+
+ <qandaset>
+ <qandaentry>
+ <question>
+ <para>WinMerge does not start and complains about missing DLL
+ files (mfc71.dll, mfc71u.dll, msvcr71.dll, msvcp71.dll)</para>
+ </question>
+
+ <answer>
+ <para>When installing from archive (zip, 7z) file you need also
+ Runtimes-package, which contains those files. See the <link
+ linkend="InstallFromArchive">Install instructions</link>.</para>
+ </answer>
+ </qandaentry>
+ </qandaset>
+ </sect2>
+
+ <sect2>
<title>Questions about binary files</title>
<qandaset>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-04 16:41:42
|
Revision: 3902
http://svn.sourceforge.net/winmerge/?rev=3902&view=rev
Author: kimmov
Date: 2006-12-04 08:41:37 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
PATCH: [ 1608003 ] Manual: Fix indexterm position in Quick Start
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-12-04 16:39:01 UTC (rev 3901)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-04 16:41:37 UTC (rev 3902)
@@ -1,3 +1,7 @@
+2006-12-04 Kimmo
+ PATCH: [ 1608003 ] Manual: Fix indexterm position in Quick Start
+ Manual: Introduction.xml
+
2006-12-03 Kimmo
PATCH: [ 1607084 ] Manual: Add new FAQ about missing runtime files
Manual: Faq.xml
Modified: branches/R2_6/Docs/Users/Manual/Introduction.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Introduction.xml 2006-12-04 16:39:01 UTC (rev 3901)
+++ branches/R2_6/Docs/Users/Manual/Introduction.xml 2006-12-04 16:41:37 UTC (rev 3902)
@@ -33,33 +33,29 @@
further. It is advantage for all WinMerge users.</para>
<sect2>
- <title>WinMerge versions</title>
+ <title>WinMerge Versions</title>
<para>There are three kind of versions available in <ulink
url="https://sourceforge.net/project/showfiles.php?group_id=13216">downloads</ulink>
page.</para>
<sect3>
- <title>Stable versions</title>
+ <title><indexterm>
+ <primary>Stable Versions</primary>
+ </indexterm>Stable Versions</title>
- <indexterm>
- <primary>Stable versions</primary>
- </indexterm>
-
<para><ulink
url="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248">Stable
versions</ulink> are recommended for most users. If you are unsure about
what version to use - use latest stable version. Stable versions have
- even second number, for example 2.2, 2.4</para>
+ even second number, for example 2.2, 2.4 and 2.6.</para>
</sect3>
<sect3>
- <title>Beta versions</title>
+ <title><indexterm>
+ <primary>Beta Versions</primary>
+ </indexterm>Beta Versions</title>
- <indexterm>
- <primary>Beta versions</primary>
- </indexterm>
-
<para><ulink
url="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158">Beta
versions</ulink> are for people who want to test latest features and
@@ -74,28 +70,26 @@
</sect3>
<sect3>
- <title>Experimental versions</title>
+ <title><indexterm>
+ <primary>Experimental Versions</primary>
+ </indexterm>Experimental Versions</title>
- <indexterm>
- <primary>Experimental versions</primary>
- </indexterm>
-
<para><ulink
url="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=92246">Experimental
- versions</ulink> are snapshot releases from version control (CVS). They
- have all the latest features and improvements. Some features may still
- be buggy and/or incomplete. These releases are made available to allow
- users to try out the current code without needing to compile, and
- participate in development discussions concerning new and changing
- features. We also appreciate any help testing the current code. Use with
- care and enable backups! And please <ulink
+ versions</ulink> are snapshot releases from version control
+ (Subversion). They have all the latest features and improvements. Some
+ features may still be buggy and/or incomplete. These releases are made
+ available to allow users to try out the current code without needing to
+ compile, and participate in development discussions concerning new and
+ changing features. We also appreciate any help testing the current code.
+ Use with care and enable backups! And please <ulink
url="http://sourceforge.net/tracker/?group_id=13216&atid=113216">report
bugs</ulink> you find using these builds, it really helps with WinMerge
development!</para>
</sect3>
<sect3>
- <title>Version tree</title>
+ <title>Version Tree</title>
<para>All this text about different versions may sound confusing if you
never have worked with this kind of model. Lets see this with picture
@@ -148,14 +142,12 @@
</sect2>
<sect2>
- <title>Getting support and reporting bugs</title>
+ <title><indexterm>
+ <primary>Support</primary>
- <indexterm>
- <primary>Support</primary>
+ <secondary>Reporting Bugs</secondary>
+ </indexterm>Getting Support and Reporting Bugs</title>
- <secondary>Reporting bugs</secondary>
- </indexterm>
-
<para><ulink
url="http://sourceforge.net/forum/forum.php?forum_id=41637">Open
discussion forum</ulink> is the fastest way to get help. Please be
@@ -193,12 +185,10 @@
</sect2>
<sect2>
- <title>WinMerge source codes and development</title>
+ <title><indexterm>
+ <primary>WinMerge Development</primary>
+ </indexterm>WinMerge Source Codes and Development</title>
- <indexterm>
- <primary>WinMerge development</primary>
- </indexterm>
-
<para>WinMerge source codes are available in <ulink
url="https://sourceforge.net/project/showfiles.php?group_id=13216">downloads</ulink>
page and from <ulink
@@ -220,7 +210,7 @@
be it testing, documenting, translating or coding.</para>
<sect3>
- <title>Participating to WinMerge development</title>
+ <title>Participating to WinMerge Development</title>
<para>As mentioned above, we look for help in many areas, not just
coding. Translations, documentation and testing are important
@@ -245,4 +235,4 @@
feature</ulink>, let us know.</para>
</sect3>
</sect2>
-</sect1>
+</sect1>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-04 16:44:57
|
Revision: 3904
http://svn.sourceforge.net/winmerge/?rev=3904&view=rev
Author: kimmov
Date: 2006-12-04 08:44:54 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
PATCH: [ 1608150 ] Manual: Fix indexterm position in Introduction
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Quick_start.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-04 16:43:25 UTC (rev 3903)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-04 16:44:54 UTC (rev 3904)
@@ -1,6 +1,8 @@
2006-12-04 Kimmo
PATCH: [ 1608003 ] Manual: Fix indexterm position in Quick Start
Manual: Introduction.xml
+ PATCH: [ 1608150 ] Manual: Fix indexterm position in Introduction
+ Manual: Quick_start.xml
2006-12-03 Kimmo
PATCH: [ 1607084 ] Manual: Add new FAQ about missing runtime files
Modified: branches/R2_6/Docs/Users/Manual/Quick_start.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Quick_start.xml 2006-12-04 16:43:25 UTC (rev 3903)
+++ branches/R2_6/Docs/Users/Manual/Quick_start.xml 2006-12-04 16:44:54 UTC (rev 3904)
@@ -3,12 +3,10 @@
<title>Quick Start</title>
<sect2>
- <title>Opening Files and Folders</title>
+ <title><indexterm>
+ <primary>Open Dialog</primary>
+ </indexterm>Opening Files and Folders</title>
- <indexterm>
- <primary>Open Dialog</primary>
- </indexterm>
-
<para>Start WinMerge and either select <guimenuitem>Open</guimenuitem>
from the <guimenu>File</guimenu>-menu, or click the yellow folder icon on
the toolbar, or press <keycombo>
@@ -224,4 +222,4 @@
<guimenu>Edit</guimenu>-menu, clicking toolbar button with two yellow
arrows or pressing <keycap>F5</keycap> key.</para>
</sect2>
-</sect1>
+</sect1>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-05 15:53:38
|
Revision: 3912
http://svn.sourceforge.net/winmerge/?rev=3912&view=rev
Author: kimmov
Date: 2006-12-05 07:53:32 -0800 (Tue, 05 Dec 2006)
Log Message:
-----------
PATCH: [ 1608705 ] Manual: Fix indexterms in Folder Compare
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Compare_dirs.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-05 15:51:53 UTC (rev 3911)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-05 15:53:32 UTC (rev 3912)
@@ -1,3 +1,7 @@
+2006-12-05 Kimmo
+ PATCH: [ 1608705 ] Manual: Fix indexterms in Folder Compare
+ Manual: Compare_dirs.xml
+
2006-12-04 Kimmo
PATCH: [ 1608003 ] Manual: Fix indexterm position in Quick Start
Manual: Introduction.xml
Modified: branches/R2_6/Docs/Users/Manual/Compare_dirs.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Compare_dirs.xml 2006-12-05 15:51:53 UTC (rev 3911)
+++ branches/R2_6/Docs/Users/Manual/Compare_dirs.xml 2006-12-05 15:53:32 UTC (rev 3912)
@@ -231,12 +231,10 @@
</sect2>
<sect2>
- <title>Columns in Folder Compare</title>
+ <title><indexterm>
+ <primary>Folder Compare Columns</primary>
+ </indexterm>Columns in Folder Compare</title>
- <indexterm>
- <primary>Folder compare columns</primary>
- </indexterm>
-
<para>By default these columns are visible:</para>
<itemizedlist>
@@ -588,12 +586,10 @@
</sect2>
<sect2>
- <title>Hiding Items</title>
+ <title><indexterm>
+ <primary>Hiding Files and Folders</primary>
+ </indexterm>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
@@ -614,7 +610,8 @@
<para>Full refresh of large folders can take a long time. In 2.2 and
earlier versions of WinMerge user always had to do full refresh after
- editing files outside WinMerge. WinMerge 2.4 can refresh just selected
- items. Select <guimenuitem>Refresh</guimenuitem> from context menu.</para>
+ editing files outside WinMerge. WinMerge 2.4 and later can refresh just
+ selected items. Select <guimenuitem>Refresh</guimenuitem> from the context
+ menu.</para>
</sect2>
-</sect1>
+</sect1>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-05 15:57:35
|
Revision: 3914
http://svn.sourceforge.net/winmerge/?rev=3914&view=rev
Author: kimmov
Date: 2006-12-05 07:57:27 -0800 (Tue, 05 Dec 2006)
Log Message:
-----------
PATCH: [ 1608708 ] Manual: Fix indexterms in File Compare
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-12-05 15:56:05 UTC (rev 3913)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-05 15:57:27 UTC (rev 3914)
@@ -1,6 +1,8 @@
2006-12-05 Kimmo
PATCH: [ 1608705 ] Manual: Fix indexterms in Folder Compare
Manual: Compare_dirs.xml
+ PATCH: [ 1608708 ] Manual: Fix indexterms in File Compare
+ Manual: Compare_files.xml
2006-12-04 Kimmo
PATCH: [ 1608003 ] Manual: Fix indexterm position in Quick Start
Modified: branches/R2_6/Docs/Users/Manual/Compare_files.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-12-05 15:56:05 UTC (rev 3913)
+++ branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-12-05 15:57:27 UTC (rev 3914)
@@ -145,11 +145,11 @@
</sect2>
<sect2>
- <title>Difference Navigation</title>
+ <title><indexterm>
+ <primary>Difference Navigation</primary>
- <indexterm>
- <primary>Difference navigation (File compare)</primary>
- </indexterm>
+ <secondary>File Compare</secondary>
+ </indexterm>Difference Navigation</title>
<para>Difference navigation commands are in <guimenu>Merge</guimenu>
menu:</para>
@@ -231,12 +231,10 @@
</sect2>
<sect2>
- <title>Merging Differences</title>
+ <title><indexterm>
+ <primary>Merging Differences</primary>
+ </indexterm>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
@@ -294,12 +292,10 @@
</sect2>
<sect2>
- <title>Merge Mode</title>
+ <title><indexterm>
+ <primary>Merge Mode</primary>
+ </indexterm>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>
@@ -520,4 +516,4 @@
</listitem>
</itemizedlist>
</sect2>
-</sect1>
+</sect1>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-08 15:21:37
|
Revision: 3930
http://svn.sourceforge.net/winmerge/?rev=3930&view=rev
Author: gerundt
Date: 2006-12-08 07:21:35 -0800 (Fri, 08 Dec 2006)
Log Message:
-----------
PATCH: [ 1610448 ] Manual: Requirements section and layout changes for Plugins
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Plugins.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-08 15:20:58 UTC (rev 3929)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-08 15:21:35 UTC (rev 3930)
@@ -1,3 +1,7 @@
+2006-12-08 Tim
+ PATCH: [ 1610448 ] Manual: Requirements section and layout changes for Plugins
+ Manual: Plugins.xml
+
2006-12-05 Kimmo
PATCH: [ 1608705 ] Manual: Fix indexterms in Folder Compare
Manual: Compare_dirs.xml
Modified: branches/R2_6/Docs/Users/Manual/Plugins.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Plugins.xml 2006-12-08 15:20:58 UTC (rev 3929)
+++ branches/R2_6/Docs/Users/Manual/Plugins.xml 2006-12-08 15:21:35 UTC (rev 3930)
@@ -1,29 +1,28 @@
<sect1 id="Plugins">
<title>Plugins</title>
- <para>Plugins are extra-features for WinMerge. They are not included in the basic version because they interest few users, or because they do not fit in WinMerge architecture. </para>
- <para>Each plugin :</para>
+ <para>Plugins are extra-features for WinMerge. They are not included in the basic version because they interest few users, or because they do not fit in WinMerge architecture.</para>
+ <para>Each plugin:</para>
<itemizedlist>
<listitem>
- <para>is a single file, either a dll or a scriptlet (extension <filename class="extension">.sct</filename>)</para>
+ <simpara>is a single file, either a dll or a scriptlet (extension <filename class="extension">.sct</filename>)</simpara>
</listitem>
<listitem>
- <para>is installed in the subdirectory "<filename class="directory">MergePlugins</filename>".</para>
+ <simpara>is installed in the subfolder <filename class="directory">MergePlugins</filename></simpara>
</listitem>
<listitem>
- <para>is easy to install : copy the plugin file in "<filename class="directory">MergePlugins</filename>", close WinMerge if it is running, and launch it again</para>
+ <simpara>is easy to install: copy the plugin file in <filename class="directory">MergePlugins</filename>, close WinMerge if it is running, and launch it again</simpara>
</listitem>
</itemizedlist>
- <para>"<guilabel>Plugins</guilabel>" is a generic name for extra-feature dll or scriptlets. Plugins features are spread over three categories : file editor complement, unpacker, prediffer.</para>
- <para></para>
<sect2>
<title>Three categories of plugins</title>
+ <para>"<guilabel>Plugins</guilabel>" is a generic name for extra-feature dll or scriptlets. Plugins features are spread over three categories:</para>
<sect3>
<title>Editor complement</title>
<para>Operate custom operations on the currently selected text from the active pane.</para>
<para>Example plugin : turn the selection to uppercase or lowercase.</para>
</sect3>
<sect3>
- <title>Unpack (transform) a file to a text format</title>
+ <title>Unpacker - Transform a file to a text format</title>
<para>The original file is not changed. A temporary transformed file is created and loaded in WinMerge. </para>
<para>Sometimes the transformed file can be packed back. Then you may merge and save the transformed file. Packing is done automatically in this case. See the plugin details to know if it supports packing back. </para>
<para>Example plugin : decompress Delphi4 binary files (extension .dfm).</para>
@@ -32,7 +31,7 @@
</note>
</sect3>
<sect3>
- <title>Prediff - Process files to hide some differences</title>
+ <title>Prediffer - Process files to hide some differences</title>
<para>The files are loaded normally. No change is applied to the displayed file. Copies are made and processed by the plugin, and the diffing algorithm operates on these copies.</para>
<para>Example plugin : ignore the differences inside given columns, while displaying the characters in these columns.</para>
</sect3>
@@ -86,10 +85,20 @@
<para>Developers may find information and code of examples in the source package, under the directory "<filename class="directory">Plugins</filename>".</para>
</sect2>
<sect2>
- <title>Windows Script Host</title>
- <para>Some editor complements need this optional component from Microsoft. </para>
- <para>If the list of editor complements does not present all editor plugins, this component is probably missing.</para>
- <para>You can check easily. WinMerge informs you with a comment at the bottom of the list.</para>
- <para>You may install WSH on any version of Windows (need IE 4.0). Download it from <ulink url="http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp">MSDN Library</ulink>.</para>
+ <title>Requirements</title>
+ <sect3>
+ <title>Windows Script Host</title>
+ <para>Some editor complements need this optional component from Microsoft.</para>
+ <para>If the list of editor complements does not present all editor plugins, this component is probably missing.
+ You can check easily. WinMerge informs you with a comment at the bottom of the list. You may install WSH on any
+ version of Windows (need IE 4.0). Download it from <ulink url="http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp">MSDN Library</ulink>.</para>
+ </sect3>
+ <sect3>
+ <title>Visual Basic runtime library</title>
+ <para>Some plugins require Visual Basic runtime library to work.</para>
+ <para>You can download the required file <filename><ulink url="http://www.dll-files.com/dllindex/dll-files.shtml?msvbvm60">msvbvm60.dll</ulink></filename>
+ or use the <ulink url="http://www.microsoft.com/downloads/details.aspx?familyid=7b9ba261-7a9c-43e7-9117-f673077ffb3c">Run-Time Redistribution Pack</ulink>
+ from Microsoft. If you don't need the plugin, you can safely remove it.</para>
+ </sect3>
</sect2>
</sect1>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-11 21:00:47
|
Revision: 3941
http://svn.sourceforge.net/winmerge/?rev=3941&view=rev
Author: gerundt
Date: 2006-12-11 13:00:45 -0800 (Mon, 11 Dec 2006)
Log Message:
-----------
PATCH: [ 1611595 ] Manual: Merge Plugins.xml with readme_users.txt
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Plugins.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-11 21:00:13 UTC (rev 3940)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-11 21:00:45 UTC (rev 3941)
@@ -1,3 +1,7 @@
+2006-12-11 Tim
+ PATCH: [ 1611595 ] Manual: Merge Plugins.xml with readme_users.txt
+ Manual: Plugins.xml
+
2006-12-08 Tim
PATCH: [ 1610448 ] Manual: Requirements section and layout changes for Plugins
Manual: Plugins.xml
Modified: branches/R2_6/Docs/Users/Manual/Plugins.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Plugins.xml 2006-12-11 21:00:13 UTC (rev 3940)
+++ branches/R2_6/Docs/Users/Manual/Plugins.xml 2006-12-11 21:00:45 UTC (rev 3941)
@@ -18,71 +18,102 @@
<para>"<guilabel>Plugins</guilabel>" is a generic name for extra-feature dll or scriptlets. Plugins features are spread over three categories:</para>
<sect3>
<title>Editor complement</title>
- <para>Operate custom operations on the currently selected text from the active pane.</para>
- <para>Example plugin : turn the selection to uppercase or lowercase.</para>
+ <para>Operate custom operations on the currently selected text from the active editor pane.</para>
+ <para>Example plugin: <filename>editor addin.sct</filename> (Turn the selection to UPPERCASE or lowercase.)</para>
</sect3>
<sect3>
<title>Unpacker - Transform a file to a text format</title>
- <para>The original file is not changed. A temporary transformed file is created and loaded in WinMerge. </para>
- <para>Sometimes the transformed file can be packed back. Then you may merge and save the transformed file. Packing is done automatically in this case. See the plugin details to know if it supports packing back. </para>
- <para>Example plugin : decompress Delphi4 binary files (extension .dfm).</para>
+ <para>The plugin transform a file in a viewable format (for example, decompress a file).
+ The original file is not changed. A temporary transformed file is created and loaded in WinMerge.</para>
+ <para>Sometimes the transformed file can be packed back. (See the plugin details to know if it supports packing back.)
+ Then you may merge and save the transformed file. The packing is done automatically in this case. To avoid problems,
+ you are proposed to change the filename when saving a changed file.</para>
<note>
- <para>When you compare directories, WinMerge doesn't need to display the files, but the diffing process can give a different result when you compare compressed and not compressed files (for example, uncompressed files may be identical, but the compressed files may differ if they include the date of creation). WinMerge applies the unpacker in all situations, and you are sure to have the same result when you compare directories, or when you merge two versions of a file.</para>
+ <para>When you compare folders, WinMerge doesn't need to display the files, but the diffing process can give a different result
+ when you compare compressed and not compressed files (for example, uncompressed files may be identical, but the compressed files
+ may differ if they include the date of creation). WinMerge applies the unpacker in all situations, and you are sure to have the
+ same result when you compare folder, or when you merge two versions of a file.</para>
</note>
+ <para>Example plugin: <filename>DisplayXMLFiles.dll</filename> (Display XML files nicely, by consistently inserting tabs and linebreaks.)</para>
</sect3>
<sect3>
- <title>Prediffer - Process files to hide some differences</title>
- <para>The files are loaded normally. No change is applied to the displayed file. Copies are made and processed by the plugin, and the diffing algorithm operates on these copies.</para>
- <para>Example plugin : ignore the differences inside given columns, while displaying the characters in these columns.</para>
+ <title>Prediffer - Preprocess files to hide some differences</title>
+ <para>The plugin is not apply to the files displayed in the editor. It is applied only to temporary copies of the files, and this copies are then scanned to create the difference list.</para>
+ <para>Example plugin: <filename>IgnoreColumns.dll</filename> (Ignore the differences inside given columns, while displaying the characters in these columns.)</para>
</sect3>
</sect2>
<sect2>
<title>Select and apply a plugin</title>
<sect3>
<title>"<guilabel>Suggested plugin</guilabel>" and "<guilabel>Automatic mode</guilabel>"</title>
- <para>Each plugin specifies a list of file extensions (see plugins details for more info). When the file extension, either from the left or from the right file, matches the plugin list, the plugin is called "<guilabel>a suggested plugin</guilabel>".</para>
- <para>When "<guilabel>Automatic mode</guilabel>" is on, WinMerge searches for a suggested plugin and applies it if it is avaialble. When two suggested plugins are available for a file, WinMerge applies the first one only (alphabetical order).</para>
+ <para>Each plugin specifies a list of file extensions (see plugins details for more info). When the file extension, either from
+ the left or from the right file, matches the plugin list, the plugin is called "<guilabel>a suggested plugin</guilabel>".</para>
+ <para>When "<guilabel>Automatic mode</guilabel>" is on, WinMerge searches for a suggested plugin and applies it if it is avaialble.
+ When two suggested plugins are available for a file, WinMerge applies the first one only (alphabetical order).</para>
<note>
<para>"<guimenuitem>Automatic Unpacking</guimenuitem>" and "<guimenuitem>Auto prediffer</guimenuitem>" are two separate options. There is no option for editor complements.</para>
</note>
</sect3>
<sect3>
- <title>Editor complement in directory view</title>
- <para>Not available </para>
+ <title>Editor complement in folder view</title>
+ <para><emphasis>Not available</emphasis></para>
</sect3>
<sect3>
<title>Editor complement in editor view</title>
- <para>Access list with main menu, <menuchoice><guimenu>Edit</guimenu><guisubmenu>Scripts</guisubmenu><guimenuitem>...</guimenuitem></menuchoice></para>
+ <para>Access list from <menuchoice><guimenu>Edit</guimenu><guisubmenu>Scripts</guisubmenu><guimenuitem>...</guimenuitem></menuchoice> in the main menu.</para>
</sect3>
<sect3>
- <title>Unpacker in directory view</title>
- <para>Check <menuchoice><guimenu>Plugins</guimenu><guimenuitem>Automatic Unpacking</guimenuitem></menuchoice> in the main menu. Update the results (<keycap>F5</keycap>). Each file is loaded again with its suggested unpacker and compared. </para>
+ <title>Unpacker in folder view</title>
+ <para>Check <menuchoice><guimenu>Plugins</guimenu><guimenuitem>Automatic Unpacking</guimenuitem></menuchoice> in the main menu.
+ You need to update the results (<keycap>F5</keycap>). Each file is loaded again with its suggested unpacker and compared.</para>
</sect3>
<sect3>
<title>Unpacker in editor view</title>
- <para>Three possibilities</para>
- <para>Open dialog : select the two files first. Then press the button "<guibutton>Select</guibutton>" right from the filed "<guilabel>Unpacker</guilabel>". WinMerge displays the standard dialog for unpacker selection. Use the top combobox to select the plugin. Two generic choices are available also : "<guilabel>None</guilabel>" and "<guilabel>Automatic</guilabel>".</para>
- <para>From the directory view when <menuchoice><guimenu>Plugins</guimenu><guimenuitem>Automatic Unpacking</guimenuitem></menuchoice> is checked : just double click to open the file. The suggested plugin used during the directory comparison is used to load the file in the editor. </para>
- <para>From the directory view, always : select one file, then main menu <menuchoice><guimenu>Plugins</guimenu><guimenuitem>Edit with Unpacker</guimenuitem></menuchoice>. WinMerge displays the dialog for unpacker selection. Select an unpacker and press "<guibutton>OK</guibutton>", WinMerge opens the editor view and applies this unpacker to load the file. This plugin is forgotten when you close the editor view.</para>
+ <orderedlist>
+ <listitem>
+ <para>Open dialog: Select the two files first and then press the <guibutton>Select</guibutton> button right from the field "<guilabel>Unpacker</guilabel>".
+ WinMerge displays the standard dialog for unpacker selection. Use the top combobox to select the plugin. Two generic choices "<guilabel>None</guilabel>"
+ and "<guilabel>Automatic</guilabel>" are also available.</para>
+ </listitem>
+ <listitem>
+ <para>From the folder view when <menuchoice><guimenu>Plugins</guimenu><guimenuitem>Automatic Unpacking</guimenuitem></menuchoice> is checked:
+ Just double click to open the file. The suggested plugin used during the folder comparison is used to load the file in the editor.</para>
+ </listitem>
+ <listitem>
+ <para>From the folder view, always: Select one file, then main menu <menuchoice><guimenu>Plugins</guimenu><guimenuitem>Edit with Unpacker</guimenuitem></menuchoice>.
+ WinMerge displays the dialog for unpacker selection. Select an unpacker and press <guibutton>OK</guibutton>, WinMerge opens the editor view and applies this unpacker
+ to load the file. This plugin is forgotten when you close the editor view.</para>
+ </listitem>
+ </orderedlist>
</sect3>
<sect3>
- <title>Prediffer in directory view</title>
- <para>When the files are selected, right-click to open the context menu. Follow <menuchoice><guimenuitem>Plugin Settings</guimenuitem><guisubmenu>Prediffer Settings</guisubmenu></menuchoice> and select "<guimenuitem>Auto prediffer</guimenuitem>" or "<guimenuitem>No prediffer</guimenuitem>". Refresh the view (<keycap>F5</keycap>) to update the results.</para>
+ <title>Prediffer in folder view</title>
+ <para>When the files are selected, right-click to open the context menu. Follow <menuchoice><guimenu>Plugin Settings</guimenu><guisubmenu>Prediffer Settings</guisubmenu></menuchoice>
+ and select "<guimenuitem>Auto prediffer</guimenuitem>" or "<guimenuitem>No prediffer</guimenuitem>". Refresh the view (<keycap>F5</keycap>) to update the results.</para>
<note>
- <para>"<guimenuitem>Auto prediffer</guimenuitem>" is a per-file option. Some files in the same directory can be in mode "<guimenuitem>No prediffer</guimenuitem>" and some in mode "<guimenuitem>Auto prediffer</guimenuitem>". When you change directory during a non-recursive compare, the mode is always reset to "<guimenuitem>No prediffer</guimenuitem>".</para>
+ <para>"<guimenuitem>Auto prediffer</guimenuitem>" is a per-file option. Some files in the same folder can be in mode "<guimenuitem>No prediffer</guimenuitem>" and
+ some in mode "<guimenuitem>Auto prediffer</guimenuitem>". When you change folder during a non-recursive compare, the mode is always reset to "<guimenuitem>No prediffer</guimenuitem>".</para>
</note>
</sect3>
<sect3>
<title>Prediffer in editor view</title>
- <para>Two possibilities</para>
- <para>From the directory view when "<guimenuitem>Auto prediffer</guimenuitem>" is checked for a file : just double click to open the file. The plugin used during the directory comparison is used in the editor before the diff algorithm.</para>
- <para>During an editor session, access prediffer lists with menu <menuchoice><guimenu>Plugins</guimenu><guisubmenu>Prediffer</guisubmenu><guimenuitem>...</guimenuitem></menuchoice> The active prediffer is checked. Suggested plugins are indicated first above the not-suggested ones. The files are compared again after the selection, you don't need to rescan.</para>
+ <orderedlist>
+ <listitem>
+ <para>From the folder view when "<guimenuitem>Auto prediffer</guimenuitem>" is checked for a file: Just double click to open the file.
+ The plugin used during the folder comparison is used in the editor before the diff algorithm.</para>
+ </listitem>
+ <listitem>
+ <para>During an editor session, access prediffer lists with menu <menuchoice><guimenu>Plugins</guimenu><guisubmenu>Prediffer</guisubmenu><guimenuitem>...</guimenuitem></menuchoice>:
+ The active prediffer is checked. Suggested plugins are indicated first above the not-suggested ones. The files are compared again after the selection, you don't need to rescan.</para>
+ </listitem>
+ </orderedlist>
</sect3>
</sect2>
<sect2>
<title>Plugin details</title>
- <para>A file <filename>Plugins.txt</filename> is created during the setup process. It documents each installed plugin with the name and a quick description. If you don't use installer <filename>Plugins.txt</filename> is found from <filename class="directory">MergePlugins</filename> subfolder.</para>
- <para>Developers may find information and code of examples in the source package, under the directory "<filename class="directory">Plugins</filename>".</para>
+ <para>A file <filename>Plugins.txt</filename> is created during the setup process. It documents each installed plugin with the name and a quick description.
+ If you don't use installer <filename>Plugins.txt</filename> is found from <filename class="directory">MergePlugins</filename> subfolder.</para>
+ <para>Developers may find information and code of examples in the source package, under the folder "<filename class="directory">Plugins</filename>".</para>
</sect2>
<sect2>
<title>Requirements</title>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-11 21:08:41
|
Revision: 3943
http://svn.sourceforge.net/winmerge/?rev=3943&view=rev
Author: gerundt
Date: 2006-12-11 13:08:40 -0800 (Mon, 11 Dec 2006)
Log Message:
-----------
PATCH: [ 1612824 ] Manual: Use italic text for GUI elements
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-12-11 21:08:03 UTC (rev 3942)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-11 21:08:40 UTC (rev 3943)
@@ -1,6 +1,8 @@
2006-12-11 Tim
PATCH: [ 1611595 ] Manual: Merge Plugins.xml with readme_users.txt
Manual: Plugins.xml
+ PATCH: [ 1612824 ] Manual: Use italic text for GUI elements
+ Manual/css: all.css help.css print.css
2006-12-08 Tim
PATCH: [ 1610448 ] Manual: Requirements section and layout changes for Plugins
Modified: branches/R2_6/Docs/Users/Manual/css/all.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/all.css 2006-12-11 21:08:03 UTC (rev 3942)
+++ branches/R2_6/Docs/Users/Manual/css/all.css 2006-12-11 21:08:40 UTC (rev 3943)
@@ -43,6 +43,11 @@
border: 1px solid red;
}
+/* GUI elements */
+.guimenu,.guisubmenu,.guimenuitem,.guilabel {
+ font-style: italic;
+}
+
/* FAQ */
.question {
font-weight: bold;
Modified: branches/R2_6/Docs/Users/Manual/css/help.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/help.css 2006-12-11 21:08:03 UTC (rev 3942)
+++ branches/R2_6/Docs/Users/Manual/css/help.css 2006-12-11 21:08:40 UTC (rev 3943)
@@ -39,6 +39,11 @@
border: 1px solid red;
}
+/* GUI elements */
+.guimenu,.guisubmenu,.guimenuitem,.guilabel {
+ font-style: italic;
+}
+
/* FAQ */
.question {
font-weight: bold;
Modified: branches/R2_6/Docs/Users/Manual/css/print.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/print.css 2006-12-11 21:08:03 UTC (rev 3942)
+++ branches/R2_6/Docs/Users/Manual/css/print.css 2006-12-11 21:08:40 UTC (rev 3943)
@@ -50,6 +50,11 @@
border: 1px solid black;
}
+/* GUI elements */
+.guimenu,.guisubmenu,.guimenuitem,.guilabel {
+ font-style: italic;
+}
+
/* FAQ */
.question {
font-weight: bold;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-12 15:33:26
|
Revision: 3953
http://svn.sourceforge.net/winmerge/?rev=3953&view=rev
Author: kimmov
Date: 2006-12-12 07:33:23 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
Update revision number to 1.2.9 for new 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-12-12 15:08:54 UTC (rev 3952)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-12 15:33:23 UTC (rev 3953)
@@ -1,3 +1,7 @@
+2006-12-12 Kimmo
+ Update revision number to 1.2.9 for new release
+ Manual: WinMerge_help.xml
+
2006-12-11 Tim
PATCH: [ 1611595 ] Manual: Merge Plugins.xml with readme_users.txt
Manual: Plugins.xml
Modified: branches/R2_6/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2006-12-12 15:08:54 UTC (rev 3952)
+++ branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2006-12-12 15:33:23 UTC (rev 3953)
@@ -26,7 +26,7 @@
<productname>WinMerge</productname>
- <releaseinfo><emphasis>Revision 1.2.8</emphasis></releaseinfo>
+ <releaseinfo><emphasis>Revision 1.2.9</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-12-20 14:32:55
|
Revision: 3983
http://svn.sourceforge.net/winmerge/?rev=3983&view=rev
Author: kimmov
Date: 2006-12-20 06:32:49 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
PATCH: [ 1618452 ] Manual: Add new FAQ item about all lines marked different
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-12-20 14:30:18 UTC (rev 3982)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-20 14:32:49 UTC (rev 3983)
@@ -1,3 +1,7 @@
+2006-12-20 Kimmo
+ PATCH: [ 1618452 ] Manual: Add new FAQ item about all lines marked different
+ Manual: Faq.xml
+
2006-12-12 Kimmo
Update revision number to 1.2.9 for new release
Manual: WinMerge_help.xml
Modified: branches/R2_6/Docs/Users/Manual/Faq.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Faq.xml 2006-12-20 14:30:18 UTC (rev 3982)
+++ branches/R2_6/Docs/Users/Manual/Faq.xml 2006-12-20 14:32:49 UTC (rev 3983)
@@ -223,6 +223,30 @@
</sect2>
<sect2>
+ <title>File Comparing</title>
+
+ <qandaset>
+ <qandaentry>
+ <question>
+ <para>Why my files have all lines marked different (colored) even if
+ I know all lines are not different?</para>
+ </question>
+
+ <answer>
+ <para>Maybe your files have different line-ending styles (e.g. DOS
+ and UNIX?). WinMerge by default compares also line-ending styles,
+ but you can disable it from <menuchoice>
+ <guimenu>Edit</guimenu>
+
+ <guimenuitem>Options</guimenuitem>
+ </menuchoice> / Compare / Ignore carriage return
+ differences.</para>
+ </answer>
+ </qandaentry>
+ </qandaset>
+ </sect2>
+
+ <sect2>
<title>Questions about binary files</title>
<qandaset>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-20 14:45:15
|
Revision: 3985
http://svn.sourceforge.net/winmerge/?rev=3985&view=rev
Author: kimmov
Date: 2006-12-20 06:45:12 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
PATCH: [ 1618935 ] Manual: Add screenshots and description for editor margin
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_margin1.png
branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin2.png
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-20 14:42:21 UTC (rev 3984)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-20 14:45:12 UTC (rev 3985)
@@ -1,6 +1,9 @@
2006-12-20 Kimmo
PATCH: [ 1618452 ] Manual: Add new FAQ item about all lines marked different
Manual: Faq.xml
+ PATCH: [ 1618935 ] Manual: Add screenshots and description for editor margin
+ Manual: Compare_files.xml
+ Manual/screenshots new files: filecomp_margin1.png filecomp_margin2.png
2006-12-12 Kimmo
Update revision number to 1.2.9 for new release
Modified: branches/R2_6/Docs/Users/Manual/Compare_files.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-12-20 14:42:21 UTC (rev 3984)
+++ branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-12-20 14:45:12 UTC (rev 3985)
@@ -145,6 +145,34 @@
</sect2>
<sect2>
+ <title>Editor Margin</title>
+
+ <para>The editor panes (file panes) have gray margin area reserved for
+ line numbers and some symbols. If line numbers are not shown then margin
+ is shown like screenshot below.</para>
+
+ <para><inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/filecomp_margin1.png" format="PNG" />
+ </imageobject>
+ </inlinemediaobject></para>
+
+ <para>Blue circle is a Bookmark. And arrow marks word-wrapped line. Next
+ screenshot shows same lines without word-wrap and with linenumbers.</para>
+
+ <para><inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/filecomp_margin2.png" format="PNG" />
+ </imageobject>
+ </inlinemediaobject></para>
+
+ <para>The editor margin cannot be hidden, it is always visible. If
+ linenubmers are not visible it takes pretty minimal width. Note that with
+ linenumbers the margin width is set so that the longest line number fits
+ into it. So with long files it needs space for several numbers.</para>
+ </sect2>
+
+ <sect2>
<title><indexterm>
<primary>Difference Navigation</primary>
Added: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin1.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin2.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_margin2.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-12-30 12:39:17
|
Revision: 3997
http://svn.sourceforge.net/winmerge/?rev=3997&view=rev
Author: gerundt
Date: 2006-12-30 04:39:15 -0800 (Sat, 30 Dec 2006)
Log Message:
-----------
PATCH: [ 1623604 ] Manual: Remove <screen> from Command_line.xml
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Command_line.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-12-30 12:38:41 UTC (rev 3996)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-12-30 12:39:15 UTC (rev 3997)
@@ -1,3 +1,8 @@
+2006-12-30 Tim
+ PATCH: [ 1623604 ] Manual: Remove <screen> from Command_line.xml
+ Manual: Command_line.xml
+ Manual/css: all.css help.css print.css
+
2006-12-20 Kimmo
PATCH: [ 1618452 ] Manual: Add new FAQ item about all lines marked different
Manual: Faq.xml
Modified: branches/R2_6/Docs/Users/Manual/Command_line.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Command_line.xml 2006-12-30 12:38:41 UTC (rev 3996)
+++ branches/R2_6/Docs/Users/Manual/Command_line.xml 2006-12-30 12:39:15 UTC (rev 3997)
@@ -11,7 +11,7 @@
<para>Syntax for the command line is:</para>
- <para><screen><cmdsynopsis sepchar=" ">
+ <para><cmdsynopsis sepchar=" ">
<command moreinfo="none">WinMerge</command>
<arg choice="opt" rep="norepeat"><option>/r</option></arg>
@@ -45,7 +45,7 @@
<arg choice="plain" rep="norepeat"><replaceable>rightpath</replaceable></arg>
<arg choice="opt" rep="norepeat"><replaceable>outputpath</replaceable></arg>
- </cmdsynopsis></screen></para>
+ </cmdsynopsis></para>
<para>All parameters start with "/" or with "-" prefix character. Pathnames
don't have any prefix character.</para>
Modified: branches/R2_6/Docs/Users/Manual/css/all.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/all.css 2006-12-30 12:38:41 UTC (rev 3996)
+++ branches/R2_6/Docs/Users/Manual/css/all.css 2006-12-30 12:39:15 UTC (rev 3997)
@@ -43,6 +43,18 @@
border: 1px solid red;
}
+/* Command synopsis */
+.cmdsynopsis p {
+ padding: 5px;
+ color: gray;
+ background-color: #EEEEEE;
+ border-left: 10px solid #CCCCCC;
+}
+
+.command,.option,.replaceable {
+ color: black;
+}
+
/* GUI elements */
.guimenu,.guisubmenu,.guimenuitem,.guilabel {
font-style: italic;
Modified: branches/R2_6/Docs/Users/Manual/css/help.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/help.css 2006-12-30 12:38:41 UTC (rev 3996)
+++ branches/R2_6/Docs/Users/Manual/css/help.css 2006-12-30 12:39:15 UTC (rev 3997)
@@ -39,6 +39,18 @@
border: 1px solid red;
}
+/* Command synopsis */
+.cmdsynopsis p {
+ padding: 5px;
+ color: gray;
+ background-color: #EEEEEE;
+ border-left: 10px solid #CCCCCC;
+}
+
+.command,.option,.replaceable {
+ color: black;
+}
+
/* GUI elements */
.guimenu,.guisubmenu,.guimenuitem,.guilabel {
font-style: italic;
Modified: branches/R2_6/Docs/Users/Manual/css/print.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/print.css 2006-12-30 12:38:41 UTC (rev 3996)
+++ branches/R2_6/Docs/Users/Manual/css/print.css 2006-12-30 12:39:15 UTC (rev 3997)
@@ -50,6 +50,18 @@
border: 1px solid black;
}
+/* Command synopsis */
+.cmdsynopsis p {
+ padding: 0;
+ color: black;
+ background-color: white;
+ border: 0;
+}
+
+.command,.option,.replaceable {
+ color: black;
+}
+
/* GUI elements */
.guimenu,.guisubmenu,.guimenuitem,.guilabel {
font-style: italic;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-02 11:13:37
|
Revision: 4001
http://svn.sourceforge.net/winmerge/?rev=4001&view=rev
Author: gerundt
Date: 2007-01-02 03:13:34 -0800 (Tue, 02 Jan 2007)
Log Message:
-----------
PATCH: [ 1624905 ] Manual: Remove <productname>
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Faq.xml
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 2007-01-02 11:12:25 UTC (rev 4000)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-02 11:13:34 UTC (rev 4001)
@@ -1,3 +1,7 @@
+2007-01-02 Tim
+ PATCH: [ 1624905 ] Manual: Remove <productname>
+ Manual: Faq.xml Open_paths.xml
+
2006-12-30 Tim
PATCH: [ 1623604 ] Manual: Remove <screen> from Command_line.xml
Manual: Command_line.xml
Modified: branches/R2_6/Docs/Users/Manual/Faq.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Faq.xml 2007-01-02 11:12:25 UTC (rev 4000)
+++ branches/R2_6/Docs/Users/Manual/Faq.xml 2007-01-02 11:13:34 UTC (rev 4001)
@@ -660,7 +660,7 @@
<answer>
<para>No. It may be added in later versions but until then Win32
port of diffutils can be used. The Win32 port of diffutils (and
- patch) can be downloaded from <productname>GnuWin32</productname>
+ patch) can be downloaded from <application>GnuWin32</application>
project from SourceForge: <ulink
url="http://sourceforge.net/projects/gnuwin32/">
http://sourceforge.net/projects/gnuwin32</ulink></para>
Modified: branches/R2_6/Docs/Users/Manual/Open_paths.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Open_paths.xml 2007-01-02 11:12:25 UTC (rev 4000)
+++ branches/R2_6/Docs/Users/Manual/Open_paths.xml 2007-01-02 11:13:34 UTC (rev 4001)
@@ -38,7 +38,7 @@
<para>Opening two archive files is similar to normal files: select two
archive files to Open-dialog's "<guilabel>Left</guilabel>" and
"<guilabel>Right</guilabel>" fields. If
- <productname>WinMerge</productname> recognizes the archive format, it
+ WinMerge recognizes the archive format, it
opens the contents of the archive files to folder compare.</para>
<para><link linkend="CompareDirs">Folder Compare</link> chapter
@@ -47,14 +47,14 @@
<filename class="directory">Altered/</filename> it must be opened by
selecting same filename to both sides in
<guilabel>Open</guilabel>-dialog or command line. Then
- <productname>WinMerge</productname> can compare contents of those two
+ WinMerge can compare contents of those two
subfolders.</para>
<tip>
<para>When dragging an archive file to
- <productname>WinMerge</productname> window, press
+ WinMerge window, press
<keycap>Shift</keycap> when dropping the file and
- <productname>WinMerge</productname> will automatically copy the same
+ WinMerge will automatically copy the same
filename to both sides and open the archive file.</para>
</tip>
</sect3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-02 11:18:32
|
Revision: 4003
http://svn.sourceforge.net/winmerge/?rev=4003&view=rev
Author: gerundt
Date: 2007-01-02 03:18:30 -0800 (Tue, 02 Jan 2007)
Log Message:
-----------
PATCH: [ 1624906 ] Manual: Add registered trademark for Microsoft
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Faq.xml
branches/R2_6/Docs/Users/Manual/Plugins.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-02 11:17:54 UTC (rev 4002)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-02 11:18:30 UTC (rev 4003)
@@ -1,6 +1,8 @@
2007-01-02 Tim
PATCH: [ 1624905 ] Manual: Remove <productname>
Manual: Faq.xml Open_paths.xml
+ PATCH: [ 1624906 ] Manual: Add registered trademark for Microsoft
+ Manual: Faq.xml Plugins.xml
2006-12-30 Tim
PATCH: [ 1623604 ] Manual: Remove <screen> from Command_line.xml
Modified: branches/R2_6/Docs/Users/Manual/Faq.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Faq.xml 2007-01-02 11:17:54 UTC (rev 4002)
+++ branches/R2_6/Docs/Users/Manual/Faq.xml 2007-01-02 11:18:30 UTC (rev 4003)
@@ -189,7 +189,7 @@
<listitem>
<para>Download the Visual Basic 6.0 runtime distribution from
- Microsoft: <ulink
+ <trademark class="registered">Microsoft</trademark>:<ulink
url="http://support.microsoft.com/kb/290887">http://support.microsoft.com/kb/290887</ulink>
and install it. Or download just the one needed file from:
<ulink
Modified: branches/R2_6/Docs/Users/Manual/Plugins.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Plugins.xml 2007-01-02 11:17:54 UTC (rev 4002)
+++ branches/R2_6/Docs/Users/Manual/Plugins.xml 2007-01-02 11:18:30 UTC (rev 4003)
@@ -119,7 +119,7 @@
<title>Requirements</title>
<sect3>
<title>Windows Script Host</title>
- <para>Some editor complements need this optional component from Microsoft.</para>
+ <para>Some editor complements need this optional component from <trademark class="registered">Microsoft</trademark>.</para>
<para>If the list of editor complements does not present all editor plugins, this component is probably missing.
You can check easily. WinMerge informs you with a comment at the bottom of the list. You may install WSH on any
version of Windows (need IE 4.0). Download it from <ulink url="http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp">MSDN Library</ulink>.</para>
@@ -129,7 +129,7 @@
<para>Some plugins require Visual Basic runtime library to work.</para>
<para>You can download the required file <filename><ulink url="http://www.dll-files.com/dllindex/dll-files.shtml?msvbvm60">msvbvm60.dll</ulink></filename>
or use the <ulink url="http://www.microsoft.com/downloads/details.aspx?familyid=7b9ba261-7a9c-43e7-9117-f673077ffb3c">Run-Time Redistribution Pack</ulink>
- from Microsoft. If you don't need the plugin, you can safely remove it.</para>
+ from <trademark class="registered">Microsoft</trademark>. If you don't need the plugin, you can safely remove it.</para>
</sect3>
</sect2>
</sect1>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-04 20:39:12
|
Revision: 4006
http://svn.sourceforge.net/winmerge/?rev=4006&view=rev
Author: gerundt
Date: 2007-01-04 12:39:08 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
PATCH: [ 1626464 ] Manual: Highlight examples with CSS
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 2007-01-04 20:38:29 UTC (rev 4005)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-04 20:39:08 UTC (rev 4006)
@@ -1,3 +1,7 @@
+2007-01-04 Tim
+ PATCH: [ 1626464 ] Manual: Highlight examples with CSS
+ Manual/css: all.css help.css print.css
+
2007-01-02 Tim
PATCH: [ 1624905 ] Manual: Remove <productname>
Manual: Faq.xml Open_paths.xml
Modified: branches/R2_6/Docs/Users/Manual/css/all.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/all.css 2007-01-04 20:38:29 UTC (rev 4005)
+++ branches/R2_6/Docs/Users/Manual/css/all.css 2007-01-04 20:39:08 UTC (rev 4006)
@@ -43,6 +43,12 @@
border: 1px solid red;
}
+/* Examples */
+.example,.informalexample {
+ padding-left: 7px;
+ border-left: 3px solid black;
+}
+
/* Command synopsis */
.cmdsynopsis p {
padding: 5px;
Modified: branches/R2_6/Docs/Users/Manual/css/help.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/help.css 2007-01-04 20:38:29 UTC (rev 4005)
+++ branches/R2_6/Docs/Users/Manual/css/help.css 2007-01-04 20:39:08 UTC (rev 4006)
@@ -39,6 +39,12 @@
border: 1px solid red;
}
+/* Examples */
+.example,.informalexample {
+ padding-left: 7px;
+ border-left: 3px solid black;
+}
+
/* Command synopsis */
.cmdsynopsis p {
padding: 5px;
Modified: branches/R2_6/Docs/Users/Manual/css/print.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/print.css 2007-01-04 20:38:29 UTC (rev 4005)
+++ branches/R2_6/Docs/Users/Manual/css/print.css 2007-01-04 20:39:08 UTC (rev 4006)
@@ -50,6 +50,12 @@
border: 1px solid black;
}
+/* Examples */
+.example,.informalexample {
+ padding-left: 7px;
+ border-left: 3px solid black;
+}
+
/* Command synopsis */
.cmdsynopsis p {
padding: 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
