|
From: <ge...@us...> - 2007-01-04 21:24:15
|
Revision: 4009
http://svn.sourceforge.net/winmerge/?rev=4009&view=rev
Author: gerundt
Date: 2007-01-04 13:24:14 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
[ 1627363 ] Manual: Merge with Plugins.txt and list_of_sources.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 2007-01-04 21:23:36 UTC (rev 4008)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-04 21:24:14 UTC (rev 4009)
@@ -1,6 +1,8 @@
2007-01-04 Tim
PATCH: [ 1626464 ] Manual: Highlight examples with CSS
Manual/css: all.css help.css print.css
+ PATCH: [ 1627363 ] Manual: Merge with Plugins.txt and list_of_sources.txt
+ Manual: Plugins.xml
2007-01-02 Tim
PATCH: [ 1624905 ] Manual: Remove <productname>
Modified: branches/R2_6/Docs/Users/Manual/Plugins.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Plugins.xml 2007-01-04 21:23:36 UTC (rev 4008)
+++ branches/R2_6/Docs/Users/Manual/Plugins.xml 2007-01-04 21:24:14 UTC (rev 4009)
@@ -19,7 +19,7 @@
<sect3>
<title>Editor complement</title>
<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>
+ <para>Example plugin: <link linkend="EditorAddin"><filename>editor addin.sct</filename></link> (Turn the selection to UPPER CASE or lower case.)</para>
</sect3>
<sect3>
<title>Unpacker - Transform a file to a text format</title>
@@ -34,12 +34,12 @@
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>
+ <para>Example plugin: <link linkend="DisplayXMLFiles"><filename>DisplayXMLFiles.dll</filename></link> (Display XML files nicely, by consistently inserting tabs and linebreaks.)</para>
</sect3>
<sect3>
<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>
+ <para>Example plugin: <link linkend="IgnoreColumns"><filename>IgnoreColumns.dll</filename></link> (Ignore the differences inside given columns, while displaying the characters in these columns.)</para>
</sect3>
</sect2>
<sect2>
@@ -110,9 +110,365 @@
</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>
+ <title>Available plugins</title>
+ <sect3>
+ <title><filename>CompareMSExcelFiles.dll</filename></title>
+ <para>Displays the text content of a <trademark class="registered">Microsoft</trademark>
+ <application>Excel</application> file, stripping away all formatting and embedded objects.</para>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <segtitle>Packing</segtitle>
+ <segtitle>Requirement</segtitle>
+ <seglistitem>
+ <seg>Unpacker</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.xls</filename></member>
+ </simplelist>
+ </seg>
+ <seg>No</seg>
+ <seg><trademark class="registered">Microsoft</trademark> <application>Excel</application></seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title><filename>CompareMSWordFiles.dll</filename></title>
+ <para>Displays the text content of a <trademark class="registered">Microsoft</trademark>
+ <application>Word</application> file, stripping away all formatting and embedded objects.</para>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <segtitle>Packing</segtitle>
+ <segtitle>Requirement</segtitle>
+ <seglistitem>
+ <seg>Unpacker</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.doc</filename></member>
+ </simplelist>
+ </seg>
+ <seg>No</seg>
+ <seg><trademark class="registered">Microsoft</trademark> <application>Word</application></seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title><filename>DisplayBinaryFiles.dll</filename></title>
+ <para>Use this plugin to display the differences between two binary files.</para>
+ <para>This is not a hex editor, but simply a way to display files which have
+ reasonable lines (carriage returns), per WinMerge's textual display style.
+ This can help for detecting changed strings in binaries.</para>
+ <note>
+ <para>Replaces all 0 with <keycode>0x20</keycode> (spaces).</para>
+ <para>This is a lossy operation, which means that the files can only be
+ displayed; they cannot be saved, so there is no point in trying to merge.
+ If you really want to save the files, you should look at the plugin
+ <link linkend="EditBinaryFiles"><filename>EditBinaryFiles.dll</filename></link>.</para>
+ </note>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <segtitle>Packing</segtitle>
+ <seglistitem>
+ <seg>Unpacker</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.exe</filename></member>
+ <member><filename class="extension">*.dll</filename></member>
+ <member><filename class="extension">*.ocx</filename></member>
+ <member><filename class="extension">*.doc</filename></member>
+ <member><filename class="extension">*.xls</filename></member>
+ </simplelist>
+ </seg>
+ <seg>No</seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3 id="DisplayXMLFiles">
+ <title><filename>DisplayXMLFiles.dll</filename></title>
+ <para>This plugin display XML files nicely, by consistently inserting tabs
+ and linebreaks. This is to fix XML files which do not have line returns in
+ convenient locations.</para>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <segtitle>Packing</segtitle>
+ <seglistitem>
+ <seg>Unpacker</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.xml</filename></member>
+ </simplelist>
+ </seg>
+ <seg>No</seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3 id="EditBinaryFiles">
+ <title><filename>EditBinaryFiles.dll</filename></title>
+ <para>Allow editing of binary files (if line based), using escape scheme
+ for bytes under <keycode>0x20</keycode>.</para>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <segtitle>Packing</segtitle>
+ <seglistitem>
+ <seg>Unpacker</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.exe</filename></member>
+ <member><filename class="extension">*.dll</filename></member>
+ <member><filename class="extension">*.ocx</filename></member>
+ <member><filename class="extension">*.doc</filename></member>
+ <member><filename class="extension">*.xls</filename></member>
+ </simplelist>
+ </seg>
+ <seg>Yes</seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3 id="EditorAddin">
+ <title><filename>editor addin.sct</filename></title>
+ <para>Add two functions to the <menuchoice><guimenu>Edit</guimenu><guisubmenu>Scripts</guisubmenu></menuchoice> menu:</para>
+ <itemizedlist>
+ <listitem>
+ <simpara><guimenuitem>MakeUpper</guimenuitem> convert the selection to UPPER CASE.</simpara>
+ </listitem>
+ <listitem>
+ <simpara><guimenuitem>MakeLower</guimenuitem> convert the selection to lower case.</simpara>
+ </listitem>
+ </itemizedlist>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <seglistitem>
+ <seg>Editor complement</seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3 id="IgnoreColumns">
+ <title><filename>IgnoreColumns.dll</filename></title>
+ <para>The plugin ignore the characters at specified columns.
+ It does not support files with tabulations (no crash, but all tabs will be
+ treated as a normal character). The first column has number 1.</para>
+ <para>For the parameters, you just need to rename the dll with the following syntax:</para>
+ <itemizedlist>
+ <listitem>
+ <simpara>Delimiters between ranges: _ or ,</simpara>
+ </listitem>
+ <listitem>
+ <simpara>Delimiters between min and max: <emphasis>anything else</emphasis></simpara>
+ </listitem>
+ <listitem>
+ <simpara>Min and max are included.</simpara>
+ </listitem>
+ <listitem>
+ <simpara>When max = min, max may be omitted.</simpara>
+ </listitem>
+ </itemizedlist>
+ <example>
+ <title><filename>IgnoreColumns.dll</filename> syntax</title>
+ <variablelist>
+ <varlistentry>
+ <term><filename>IgnoreColumns _ 3 _ 10 - 20 _ 32 - 33.dll</filename></term>
+ <listitem>
+ <simpara>Ignore all characters at column 3, and in columns 10 to 20, and 32 to 33.</simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><filename>IgnoreColumns_1,30 to 40.dll</filename></term>
+ <listitem>
+ <simpara>Ignore all the characters in column 1, and in columns 30 to 40.</simpara>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </example>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <seglistitem>
+ <seg>Prediffer</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.txt</filename></member>
+ </simplelist>
+ </seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title><filename>IgnoreCommentsC.dll</filename></title>
+ <para>The plugin ignores comments (<constant>//</constant>... and <constant>/*</constant> ... <constant>*/</constant>) in C, C++, PHP and JavaScript files.</para>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <seglistitem>
+ <seg>Prediffer</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.cpp</filename></member>
+ <member><filename class="extension">*.cxx</filename></member>
+ <member><filename class="extension">*.h</filename></member>
+ <member><filename class="extension">*.hxx</filename></member>
+ <member><filename class="extension">*.c</filename></member>
+ <member><filename class="extension">*.php</filename></member>
+ <member><filename class="extension">*.js</filename></member>
+ </simplelist>
+ </seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title><filename>IgnoreFieldsComma.dll</filename></title>
+ <para>The plugin is for files with fields and <emphasis>comma</emphasis> as delimiters
+ (CSV files for example). It ignore the characters in the specified fields. First field has number 1.</para>
+ <para>Modify the filename to specify the fields. See <link linkend="IgnoreColumns">IgnoreColumns.dll</link>
+ for the syntax.</para>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <seglistitem>
+ <seg>Prediffer</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.csv</filename></member>
+ </simplelist>
+ </seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title><filename>IgnoreFieldsTab.dll</filename></title>
+ <para>The plugin is for files with fields and <emphasis>tabulations</emphasis> as delimiters
+ (<application>Excel</application> files saved in format <filename class="extension">*.txt</filename> for example).
+ It ignore the characters in the specified fields. First field has number 1.</para>
+ <para>Modify the filename to specify the fields. See <link linkend="IgnoreColumns">IgnoreColumns.dll</link>
+ for the syntax.</para>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <seglistitem>
+ <seg>Prediffer</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.txt</filename></member>
+ </simplelist>
+ </seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title><filename>insert datetime.sct</filename></title>
+ <para>Add two functions to the <menuchoice><guimenu>Edit</guimenu><guisubmenu>Scripts</guisubmenu></menuchoice> menu:</para>
+ <itemizedlist>
+ <listitem>
+ <simpara><guimenuitem>InsertDate</guimenuitem> insert date in the current locale format.</simpara>
+ </listitem>
+ <listitem>
+ <simpara><guimenuitem>InsertTime</guimenuitem> insert time in the current locale format.</simpara>
+ </listitem>
+ </itemizedlist>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <seglistitem>
+ <seg>Editor complement</seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title><filename>RCLocalizationHelper.dll</filename>, <filename>RCLocalizationHelperU.dll</filename></title>
+ <para>The plugin preprocesses RC files by stripping out localized strings,
+ to enable comparing differnt language versions of the same RC file
+ and ignoring the translations.</para>
+ <para><filename>RCLocalizationHelperU.dll</filename> is the Unicode version.</para>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <seglistitem>
+ <seg>Prediffer</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.rc</filename></member>
+ </simplelist>
+ </seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title><filename>UnpackDFM.dll</filename></title>
+ <para>This plugin allows WinMerge to compare and merge Delphi's binary DFM files.
+ It is written in and for <trademark class="registered">Borland</trademark> <application>Delphi 4</application>.</para>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <segtitle>Packing</segtitle>
+ <segtitle>Requirement</segtitle>
+ <seglistitem>
+ <seg>Unpacker</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.dfm</filename></member>
+ </simplelist>
+ </seg>
+ <seg>Yes</seg>
+ <seg>Runtime library <filename>vcl40.bpl</filename>, which is part of the <application>Delphi 4</application> setup.</seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
+ <sect3>
+ <title><filename>WatchBeginningOfLog.dll</filename>, <filename>WatchEndOfLog.dll</filename></title>
+ <para>For long LOG files, the user is often interested only in the first lines or in the last lines.</para>
+ <itemizedlist>
+ <listitem>
+ <simpara><filename>WatchBeginningOfLog.dll</filename> truncates the files to the first 1/10th.</simpara>
+ </listitem>
+ <listitem>
+ <simpara><filename>WatchEndOfLog.dll</filename> truncates the files to the first 1/10th.</simpara>
+ </listitem>
+ </itemizedlist>
+ <para>
+ <segmentedlist>
+ <segtitle>Categorie</segtitle>
+ <segtitle>File filter</segtitle>
+ <segtitle>Packing</segtitle>
+ <seglistitem>
+ <seg>Unpacker</seg>
+ <seg>
+ <simplelist type="inline">
+ <member><filename class="extension">*.log</filename></member>
+ </simplelist>
+ </seg>
+ <seg>No</seg>
+ </seglistitem>
+ </segmentedlist>
+ </para>
+ </sect3>
<para>Developers may find information and code of examples in the source package, under the folder "<filename class="directory">Plugins</filename>".</para>
</sect2>
<sect2>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-14 21:08:59
|
Revision: 4048
http://svn.sourceforge.net/winmerge/?rev=4048&view=rev
Author: kimmov
Date: 2007-01-14 13:08:53 -0800 (Sun, 14 Jan 2007)
Log Message:
-----------
PATCH: [ 1633560 ] Manual: WinMerge minimizes time needed for ignored files
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 2007-01-14 21:06:39 UTC (rev 4047)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-14 21:08:53 UTC (rev 4048)
@@ -1,3 +1,7 @@
+2007-01-14 Kimmo
+ PATCH: [ 1633560 ] Manual: WinMerge minimizes time needed for ignored files
+ Manual: Filters.xml
+
2007-01-14 Tim
PATCH: [ 1633632 ] Plugin to ignore leading line numbers in text files
Manual: Plugins.xml
Modified: branches/R2_6/Docs/Users/Manual/Filters.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Filters.xml 2007-01-14 21:06:39 UTC (rev 4047)
+++ branches/R2_6/Docs/Users/Manual/Filters.xml 2007-01-14 21:08:53 UTC (rev 4048)
@@ -86,6 +86,13 @@
</menuchoice>. Also empty filter can be selected when no folders or
files are ignored.</para>
+ <para>Filtered out files get only minimal needed attention by the folder
+ compare. This means that WinMerge misses a lot of information it gets for
+ non-ignored files. For example there is no way to know if filtered file is
+ a text file or a binary file. The reason is simple: as user tolds WinMerge
+ one does not care about the file, WinMerge tries to minimize the effort
+ and time for the file.</para>
+
<sect3>
<title>Filter files</title>
@@ -111,10 +118,15 @@
<listitem>
<para>User-defined folder. Selected in Options (<menuchoice>
- <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>
+ <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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-15 20:18:21
|
Revision: 4051
http://svn.sourceforge.net/winmerge/?rev=4051&view=rev
Author: kimmov
Date: 2007-01-15 12:18:16 -0800 (Mon, 15 Jan 2007)
Log Message:
-----------
Bump revision to 1.2.10 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 2007-01-15 15:26:53 UTC (rev 4050)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-15 20:18:16 UTC (rev 4051)
@@ -1,3 +1,7 @@
+2007-01-15 Kimmo
+ Bump revision to 1.2.10 for new release
+ Manual: WinMerge_help.xml
+
2007-01-14 Kimmo
PATCH: [ 1633560 ] Manual: WinMerge minimizes time needed for ignored files
Manual: Filters.xml
Modified: branches/R2_6/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2007-01-15 15:26:53 UTC (rev 4050)
+++ branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2007-01-15 20:18:16 UTC (rev 4051)
@@ -26,7 +26,7 @@
<productname>WinMerge</productname>
- <releaseinfo><emphasis>Revision 1.2.9</emphasis></releaseinfo>
+ <releaseinfo><emphasis>Revision 1.2.10</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: <ge...@us...> - 2007-01-16 19:43:24
|
Revision: 4060
http://svn.sourceforge.net/winmerge/?rev=4060&view=rev
Author: gerundt
Date: 2007-01-16 11:43:14 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
PATCH: [ 1636315 ] Manual: Nicer navigation layout for HTML version
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/build/build_html.xsl
branches/R2_6/Docs/Users/Manual/css/all.css
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-16 19:42:12 UTC (rev 4059)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-16 19:43:14 UTC (rev 4060)
@@ -1,3 +1,8 @@
+2007-01-16 Tim
+ PATCH: [ 1636315 ] Manual: Nicer navigation layout for HTML version
+ Manual/build: build_html.xsl
+ Manual/css: all.css
+
2007-01-15 Kimmo
Bump revision to 1.2.10 for new release
Manual: WinMerge_help.xml
Modified: branches/R2_6/Docs/Users/Manual/build/build_html.xsl
===================================================================
--- branches/R2_6/Docs/Users/Manual/build/build_html.xsl 2007-01-16 19:42:12 UTC (rev 4059)
+++ branches/R2_6/Docs/Users/Manual/build/build_html.xsl 2007-01-16 19:43:14 UTC (rev 4060)
@@ -2,6 +2,8 @@
version="1.0">
<xsl:import href="file:/C:/docbook/xsl/html/chunk.xsl"/>
<xsl:param name="suppress.navigation" select="0"/>
+ <xsl:param name="header.rule" select="0"/>
+ <xsl:param name="footer.rule" select="0"/>
<xsl:param name="use.extensions" select="0"/>
<xsl:param name="tablecolumns.extensions" select="0"/>
<xsl:param name="admon.graphics" select="1"/>
Modified: branches/R2_6/Docs/Users/Manual/css/all.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/all.css 2007-01-16 19:42:12 UTC (rev 4059)
+++ branches/R2_6/Docs/Users/Manual/css/all.css 2007-01-16 19:43:14 UTC (rev 4060)
@@ -1,3 +1,8 @@
+body {
+ margin: 0;
+ padding: 0;
+}
+
body,th,td {
font-family: Verdana,Helvetica,Arial,sans-serif;
font-size: 80%;
@@ -8,7 +13,22 @@
font-size: 100%;
}
+div.navheader,
+div.navfooter {
+ background: #FFCC00;
+ border-top: 1px solid black;
+ border-bottom: 1px solid black;
+}
+
+div.article,
+div.sect1,
+div.appendix,
+div.index {
+ padding: 5px;
+}
+
#ads {
+ padding-top: 10px;
text-align: center;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-16 20:28:18
|
Revision: 4064
http://svn.sourceforge.net/winmerge/?rev=4064&view=rev
Author: gerundt
Date: 2007-01-16 12:28:13 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
PATCH: [ 1637088 ] Manual: Add VB requirements to available 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 2007-01-16 20:27:46 UTC (rev 4063)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-16 20:28:13 UTC (rev 4064)
@@ -2,6 +2,8 @@
PATCH: [ 1636315 ] Manual: Nicer navigation layout for HTML version
Manual/build: build_html.xsl
Manual/css: all.css
+ PATCH: [ 1637088 ] Manual: Add VB requirements to available plugins
+ Manual: Plugins.xml
2007-01-15 Kimmo
Bump revision to 1.2.10 for new release
Modified: branches/R2_6/Docs/Users/Manual/Plugins.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Plugins.xml 2007-01-16 20:27:46 UTC (rev 4063)
+++ branches/R2_6/Docs/Users/Manual/Plugins.xml 2007-01-16 20:28:13 UTC (rev 4064)
@@ -129,7 +129,12 @@
</simplelist>
</seg>
<seg>No</seg>
- <seg><trademark class="registered">Microsoft</trademark> <application>Excel</application></seg>
+ <seg>
+ <simplelist type="inline">
+ <member><trademark class="registered">Microsoft</trademark> <application>Excel</application></member>
+ <member><link linkend="MSVBVM60"><application>Visual Basic</application> runtime library</link></member>
+ </simplelist>
+ </seg>
</seglistitem>
</segmentedlist>
</para>
@@ -152,7 +157,12 @@
</simplelist>
</seg>
<seg>No</seg>
- <seg><trademark class="registered">Microsoft</trademark> <application>Word</application></seg>
+ <seg>
+ <simplelist type="inline">
+ <member><trademark class="registered">Microsoft</trademark> <application>Word</application></member>
+ <member><link linkend="MSVBVM60"><application>Visual Basic</application> runtime library</link></member>
+ </simplelist>
+ </seg>
</seglistitem>
</segmentedlist>
</para>
@@ -384,6 +394,7 @@
<segmentedlist>
<segtitle>Categorie</segtitle>
<segtitle>File filter</segtitle>
+ <segtitle>Requirement</segtitle>
<seglistitem>
<seg>Prediffer</seg>
<seg>
@@ -391,6 +402,7 @@
<member><filename class="extension">*.nc</filename></member>
</simplelist>
</seg>
+ <seg><link linkend="MSVBVM60"><application>Visual Basic</application> runtime library</link></seg>
</seglistitem>
</segmentedlist>
</para>
@@ -498,9 +510,9 @@
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>
+ <sect3 id="MSVBVM60">
+ <title><application>Visual Basic</application> runtime library</title>
+ <para>Some plugins require <application>Visual Basic</application> 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 <trademark class="registered">Microsoft</trademark>. If you don't need the plugin, you can safely remove it.</para>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-16 22:37:33
|
Revision: 4066
http://svn.sourceforge.net/winmerge/?rev=4066&view=rev
Author: gerundt
Date: 2007-01-16 14:37:30 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
With a "min-width" scales the HTML version much better on modern browser with large font sizes.
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/css/all.css
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-16 22:37:11 UTC (rev 4065)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-16 22:37:30 UTC (rev 4066)
@@ -4,6 +4,8 @@
Manual/css: all.css
PATCH: [ 1637088 ] Manual: Add VB requirements to available plugins
Manual: Plugins.xml
+ With a "min-width" scales the HTML version much better on modern browser with large font sizes.
+ Manual/css: all.css
2007-01-15 Kimmo
Bump revision to 1.2.10 for new release
Modified: branches/R2_6/Docs/Users/Manual/css/all.css
===================================================================
--- branches/R2_6/Docs/Users/Manual/css/all.css 2007-01-16 22:37:11 UTC (rev 4065)
+++ branches/R2_6/Docs/Users/Manual/css/all.css 2007-01-16 22:37:30 UTC (rev 4066)
@@ -1,6 +1,7 @@
body {
margin: 0;
padding: 0;
+ min-width: 40em;
}
body,th,td {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-10-10 22:23:24
|
Revision: 4602
http://winmerge.svn.sourceforge.net/winmerge/?rev=4602&view=rev
Author: gerundt
Date: 2007-10-10 15:23:22 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
BUG: [ 1807542 ] Manual: few typos
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Faq.xml
branches/R2_6/Docs/Users/Manual/Whatsnew.xml
Modified: branches/R2_6/Docs/Users/Manual/Faq.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Faq.xml 2007-10-10 22:22:27 UTC (rev 4601)
+++ branches/R2_6/Docs/Users/Manual/Faq.xml 2007-10-10 22:23:22 UTC (rev 4602)
@@ -29,7 +29,7 @@
"?").</para>
<para><filename>WinMerge.exe</filename> also can not open files
- with names outside the current ANSI codepag (e.g., WinMerge.exe
+ with names outside the current ANSI codepage (e.g., WinMerge.exe
can not open a file with a Hebrew name, if run on an English
system. WinMergeU.exe can open such files.</para>
</listitem>
Modified: branches/R2_6/Docs/Users/Manual/Whatsnew.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Whatsnew.xml 2007-10-10 22:22:27 UTC (rev 4601)
+++ branches/R2_6/Docs/Users/Manual/Whatsnew.xml 2007-10-10 22:23:22 UTC (rev 4602)
@@ -136,7 +136,7 @@
</listitem>
<listitem>
- <simpara>Available memory does not anymore restrict maximun
+ <simpara>Available memory does not anymore restrict maximum
filesize</simpara>
</listitem>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-11 10:56:07
|
Revision: 4604
http://winmerge.svn.sourceforge.net/winmerge/?rev=4604&view=rev
Author: kimmov
Date: 2007-10-11 03:56:06 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Bump manual version to 1.2.11 and update copyright year
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 2007-10-11 10:53:09 UTC (rev 4603)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-10-11 10:56:06 UTC (rev 4604)
@@ -1,3 +1,7 @@
+2007-10-11 Kimmo
+ Bump manual version to 1.2.11 and update copyright year
+ Manual: WinMerge_help.xml
+
2007-10-11 Tim
BUG: [ 1807542 ] Manual: few typos
Manual: Faq.xml Whatsnew.xml
Modified: branches/R2_6/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2007-10-11 10:53:09 UTC (rev 4603)
+++ branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2007-10-11 10:56:06 UTC (rev 4604)
@@ -26,10 +26,10 @@
<productname>WinMerge</productname>
- <releaseinfo><emphasis>Revision 1.2.10</emphasis></releaseinfo>
+ <releaseinfo><emphasis>Revision 1.2.11</emphasis></releaseinfo>
<copyright>
- <year>2004-2006</year>
+ <year>2004-2007</year>
<holder>Thingamahoochie Software.</holder>
</copyright>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-12-08 13:43:42
|
Revision: 4818
http://winmerge.svn.sourceforge.net/winmerge/?rev=4818&view=rev
Author: kimmov
Date: 2007-12-08 05:43:37 -0800 (Sat, 08 Dec 2007)
Log Message:
-----------
BUG: [ 1846375 ] Error in Manual
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 2007-12-08 13:39:54 UTC (rev 4817)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-12-08 13:43:37 UTC (rev 4818)
@@ -1,3 +1,7 @@
+2007-12-08 Kimmo
+ BUG: [ 1846375 ] Error in Manual
+ Manual: Configuration.xml
+
2007-11-21 Tim
BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3
Manual: Introduction.xml
Modified: branches/R2_6/Docs/Users/Manual/Configuration.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Configuration.xml 2007-12-08 13:39:54 UTC (rev 4817)
+++ branches/R2_6/Docs/Users/Manual/Configuration.xml 2007-12-08 13:43:37 UTC (rev 4818)
@@ -2,7 +2,7 @@
<sect1 id="Configuration">
<title>Options & configuration</title>
- <para>Options dialog can be opened from <guimenu>View</guimenu>-menu or from
+ <para>Options dialog can be opened from <guimenu>Edit</guimenu>-menu or from
toolbar button. Changes made are saved when dialog is closed using
<guibutton>OK</guibutton>-button (or pressing
<keycap>Enter</keycap>-key).</para>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-10 17:42:16
|
Revision: 4893
http://winmerge.svn.sourceforge.net/winmerge/?rev=4893&view=rev
Author: kimmov
Date: 2008-01-10 09:42:10 -0800 (Thu, 10 Jan 2008)
Log Message:
-----------
PATCH: [ 1867212 ] Manual: clarify file filter's folder name matching
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 2008-01-10 14:57:36 UTC (rev 4892)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2008-01-10 17:42:10 UTC (rev 4893)
@@ -1,3 +1,7 @@
+2008-01-10 Kimmo
+ PATCH: [ 1867212 ] Manual: clarify file filter's folder name matching
+ Manual: Filters.xml
+
2007-12-08 Kimmo
BUG: [ 1846375 ] Error in Manual
Manual: Configuration.xml
Modified: branches/R2_6/Docs/Users/Manual/Filters.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Filters.xml 2008-01-10 14:57:36 UTC (rev 4892)
+++ branches/R2_6/Docs/Users/Manual/Filters.xml 2008-01-10 17:42:10 UTC (rev 4893)
@@ -100,7 +100,7 @@
class="extension">.flt</filename>. Files have defined format which is
explained later in this chapter. Filters-dialog allows creating new
filter files based on template file. Filter files can be created from
- the scrach but using template file is the recommended way to create a
+ the scratch but using template file is the recommended way to create a
new filter. The template file is named
<filename>FileFilter.tmpl</filename> and can be modified if needed. The
template file is located in <filename
@@ -133,7 +133,7 @@
<important>
<para>With WinMerge 2.6.0 and later filter files are not anymore
loaded from profile folder like with earlier versions. Using
- user-defined folder for filter files provices more flexibility and
+ user-defined folder for filter files provides more flexibility and
easier access to filter files.</para>
</important>
@@ -171,12 +171,11 @@
<para>Rule begins with "<constant>f:</constant>" if it matches for
filenames and "<constant>d:</constant>" if it matches for folder names.
(d comes from "folder".) Filenames are given to filter as is, there are
- no special characters added. But for folder names there must be
- "<constant>\\</constant>" in begin of folder name. The resulting "\"
- char is a part of the folder name. This is done clearly to separate
- folder names and filenames. "<constant>##</constant>" is a comment
- separator, all characters in line after that are ignored by
- WinMerge.</para>
+ no special characters added. Folder names have preceding backslash
+ before them (e.g. "\Folder name"). So if folder names are matched by the
+ beginning of the name, the filter must start with "\\" to match the
+ first backslash. "<constant>##</constant>" is a comment separator, all
+ characters in line after that are ignored by WinMerge.</para>
<para><note>
<para>File filter rules are case-insensitive. Rule
@@ -195,7 +194,9 @@
f: ^My ## Match My*.* files
f: Dlg\. ## Match *Dlg.* files
d: \\test$ ## Match 'test' folders
-d: ^\\Build$ ## Match 'Build' folders</screen>
+d: ^\\Build$ ## Match 'Build' folders
+d: Temp$ ## Match *Temp folders (e.g. FirstTemp)
+d: Src ## Match *Src* folders</screen>
</example>
<para>Line begin or -end marker (<constant>"^"</constant> or
@@ -327,4 +328,4 @@
<screen>^#</screen>
</example>
</sect2>
-</sect1>
\ No newline at end of file
+</sect1>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-10 17:45:18
|
Revision: 4894
http://winmerge.svn.sourceforge.net/winmerge/?rev=4894&view=rev
Author: kimmov
Date: 2008-01-10 09:45:17 -0800 (Thu, 10 Jan 2008)
Log Message:
-----------
Manual: Update copyright year
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 2008-01-10 17:42:10 UTC (rev 4893)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2008-01-10 17:45:17 UTC (rev 4894)
@@ -1,6 +1,8 @@
2008-01-10 Kimmo
PATCH: [ 1867212 ] Manual: clarify file filter's folder name matching
Manual: Filters.xml
+ Manual: Update copyright year
+ Manual: WinMerge_help.xml
2007-12-08 Kimmo
BUG: [ 1846375 ] Error in Manual
Modified: branches/R2_6/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2008-01-10 17:42:10 UTC (rev 4893)
+++ branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2008-01-10 17:45:17 UTC (rev 4894)
@@ -29,7 +29,7 @@
<releaseinfo><emphasis>Revision 1.2.11</emphasis></releaseinfo>
<copyright>
- <year>2004-2007</year>
+ <year>2004-2008</year>
<holder>Thingamahoochie Software.</holder>
</copyright>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
