[Winmerge-svn] SF.net SVN: winmerge: [5578] trunk/Docs/Users
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
[Winmerge-svn] SF.net SVN: winmerge: [5578] trunk/Docs/Users
|
From: <ki...@us...> - 2008-07-09 08:05:02
|
Revision: 5578
http://winmerge.svn.sourceforge.net/winmerge/?rev=5578&view=rev
Author: kimmov
Date: 2008-07-09 01:05:00 -0700 (Wed, 09 Jul 2008)
Log Message:
-----------
PATCH: [ 2011924 ] Reorganize help components
Submitted by Denis Bradford
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Manual/About_Doc.xml
trunk/Docs/Users/Manual/Command_line.xml
trunk/Docs/Users/Manual/Compare_dirs.xml
trunk/Docs/Users/Manual/Compare_files.xml
trunk/Docs/Users/Manual/Configuration.xml
trunk/Docs/Users/Manual/Faq.xml
trunk/Docs/Users/Manual/Filters.xml
trunk/Docs/Users/Manual/Install.xml
trunk/Docs/Users/Manual/Intro_diffs.xml
trunk/Docs/Users/Manual/Locales.xml
trunk/Docs/Users/Manual/Open_paths.xml
trunk/Docs/Users/Manual/Plugins.xml
trunk/Docs/Users/Manual/Quick_start.xml
trunk/Docs/Users/Manual/Text_encoding.xml
trunk/Docs/Users/Manual/Version_control.xml
trunk/Docs/Users/Manual/WinMerge_help.xml
trunk/Docs/Users/Manual/build/build_html.xsl
trunk/Docs/Users/Manual/build/build_htmlhelp.xsl
trunk/Docs/Users/Manual/css/all.css
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/ChangeLog.txt 2008-07-09 08:05:00 UTC (rev 5578)
@@ -5,6 +5,7 @@
WinMerge 2.11.1.1
Manual: Introduction update (#2011365)
+ Manual: Reorganize structure (#2011924)
Add ShellExtension menu for drive letters (root folders) (#2011602)
BugFix: Use system codepage for paths (#1979429, #2008581)
Modified: trunk/Docs/Users/Manual/About_Doc.xml
===================================================================
--- trunk/Docs/Users/Manual/About_Doc.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/About_Doc.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="AboutDoc">
+<article id="AboutDoc">
<title>About this document</title>
<para>This document is the user manual for WinMerge 2.8. It explains the capabilities and limitations of WinMerge. This manual is recommended reading for both new and experienced users.</para>
@@ -85,4 +85,4 @@
</listitem>
</varlistentry>
</variablelist>
-</sect1>
+</article>
Modified: trunk/Docs/Users/Manual/Command_line.xml
===================================================================
--- trunk/Docs/Users/Manual/Command_line.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Command_line.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="CommandLine">
+<article id="CommandLine">
<title><indexterm>
<primary>Command line</primary>
</indexterm>Command Line</title>
@@ -199,7 +199,7 @@
<emphasis>resolved</emphasis>" about these three files. And those paths
should be given in that order for WinMerge.</para>
- <sect2>
+ <section>
<title>Conflict File</title>
<para>Conflict file can be given to command line as one path to the
@@ -207,5 +207,5 @@
After WinMerge opens the given conflict file, it can be resolved like
described in <link linkend="ResolveConflictFiles">Resolving Conflict
Files</link>.</para>
- </sect2>
-</sect1>
\ No newline at end of file
+ </section>
+</article>
Modified: trunk/Docs/Users/Manual/Compare_dirs.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_dirs.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Compare_dirs.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="CompareDirs">
+<article id="CompareDirs">
<title>Comparing Folders</title>
<para>The Folder compare window displays all of the files and subfolders
@@ -56,7 +56,7 @@
big text files) it can be changed via registry value: <screen>HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimit</screen>.
As usual be careful when changing values directly to registry!</para>
- <sect2>
+ <section>
<title><indexterm>
<primary>Folder Compare Result</primary>
</indexterm>Compare Results</title>
@@ -137,9 +137,9 @@
</inlinemediaobject> Aborted item. WinMerge did not finish comparing
this item when compare was stopped. Result is unknown.</member>
</simplelist></para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Folder Compare Status</title>
<para>During the folder comparison WinMerge shows status panel:</para>
@@ -187,9 +187,9 @@
<guimenuitem>Compare Statistics</guimenuitem>
</menuchoice>.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Selecting Items to Show</title>
<para>In "<guimenu>View</guimenu>" menu there are several choices for
@@ -226,9 +226,9 @@
hides files and directories filtered out by file filters</simpara>
</listitem>
</itemizedlist>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title><indexterm>
<primary>Folder Compare Columns</primary>
</indexterm>Columns in Folder Compare</title>
@@ -334,9 +334,9 @@
style (linefeed style) of files.</simpara>
</listitem>
</itemizedlist>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Browsing Folders</title>
<para>Browsing folders is only possible when subfolders are not included
@@ -375,7 +375,7 @@
folder. This can be used in situation explained in previous paragraph when
there is same folder compared as both sides.</para>
- <sect3>
+ <section>
<title><indexterm>
<primary>Open Unique Folders</primary>
</indexterm>Unique Folders</title>
@@ -400,10 +400,10 @@
menu. WinMerge shows a message asking if the missing folder should be
created. Answer <guilabel>Yes</guilabel> to create the folder, or
<guilabel>No</guilabel> to cancel the action.</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Navigation in Folder Compare</title>
<para>In addition moving selection using mouse or keyboard, also
@@ -417,12 +417,12 @@
<para>Multiple files/folders can be selected. However not all operations
are possible with multi-selection.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>File Operations in Folder Compare</title>
- <sect3>
+ <section>
<title>Copying, moving and deleting</title>
<para>Folder compare allows user to copy and delete files and folders.
@@ -462,9 +462,9 @@
<para>File/folder deletion cannot be undone if <guilabel>Recycle
Bin</guilabel> is not used!</para>
</warning>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Renaming</title>
<para>Renaming files and folders is available through context menu item
@@ -473,9 +473,9 @@
cancelled by pressing <keycap>Esc</keycap> -key. Note that items in both
sides are renamed. Renaming just other side is not currently
possible.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Opening files</title>
<para>There are three items in <guimenu>Open</guimenu>-menus:</para>
@@ -505,9 +505,9 @@
folder is selected usually opens that folder into new Explorer
window.</para>
</tip>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Archiving</title>
<para><guimenu>Zip</guimenu>-menu in directory compare context menu
@@ -566,10 +566,10 @@
file. But WinMerge does not update archive contents for files
added/deleted/copied. User can create a new archive file using above
menuitems instead.</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Copying Path- or Filenames</title>
<para>In context menu there are items for copying selected items' paths or
@@ -588,9 +588,9 @@
filenames without paths.</simpara>
</listitem>
</itemizedlist>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Customising Folder Compare</title>
<para>There are many ways to customize folder compare:<itemizedlist>
@@ -614,9 +614,9 @@
dropping column names with mouse.</simpara>
</listitem>
</itemizedlist></para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Protecting Folders / Read-only Folders</title>
<para>If user wants to protect one or both sides from changes, user can
@@ -634,9 +634,9 @@
<para>Protection status is shown in statusbar, there are own panes for
left and right side.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title><indexterm>
<primary>Hiding Files and Folders</primary>
</indexterm>Hiding Items</title>
@@ -654,9 +654,9 @@
So when you have merged files, use context menu item to hide them. It is a
lot easier to see what items are left to merge. Get used to it! It saves
your time!</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Refreshing Only Selected Items</title>
<para>Full refresh of large folders can take a long time. In 2.2 and
@@ -668,5 +668,5 @@
<guimenuitem>Refresh Selected</guimenuitem>
</menuchoice> from the main menu.</para>
- </sect2>
-</sect1>
\ No newline at end of file
+ </section>
+</article>
Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_files.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Compare_files.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="CompareFiles">
+<article id="CompareFiles">
<title>Comparing Files</title>
<para>File compare window is basically two files opened to editor into two
@@ -29,7 +29,7 @@
refresh is recommended after editing.</para>
</tip>
- <sect2>
+ <section>
<title>Showing the Differences</title>
<para>WinMerge uses different (user configurable) colors to highlight and
@@ -37,9 +37,9 @@
background and missing lines with gray background. If user selects the
difference, it is shown with red background and missing lines with milder
red.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Tabs</title>
<para>WinMerge can show open windows in tab bar below toolbar. Tab bar can
@@ -50,9 +50,9 @@
</menuchoice>. When the tab bar is shown it has one tab for every open
window. The tab contains last part of the folder names or file
names.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>File Headerbar</title>
<para>The file headerbar has several functionalities. See screenshot
@@ -82,9 +82,9 @@
<para>Headerbar has a context menu with items to copy full path or
filename to clipboard.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Statusbar</title>
<para><inlinemediaobject>
@@ -173,9 +173,9 @@
difference (<guilabel>X</guilabel>)</simpara>
</listitem>
</itemizedlist></para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Editor Margin</title>
<para>The editor panes (file panes) have optional gray margin area for
@@ -230,9 +230,9 @@
that with linenumbers the margin width is set so that the longest line
number fits into it. So with large files with lots of lines it needs space
for several numbers.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title><indexterm>
<primary>Difference Navigation</primary>
@@ -248,7 +248,7 @@
</imageobject>
</inlinemediaobject></para>
- <sect3>
+ <section>
<title>Selecting a difference</title>
<para>Before difference can be merged, it must be selected. Selecting
@@ -265,9 +265,9 @@
<guimenuitem>Current Difference</guimenuitem>.</simpara>
</listitem>
</itemizedlist>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Navigating differences</title>
<para><guimenu>Merge</guimenu>-menu has items for navigating to
@@ -280,9 +280,9 @@
<para>When difference is selected with navigation commands cursor is
moved to begin of first line of difference. In both files.</para>
</note>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><guimenuitem>Current Difference</guimenuitem>-command</title>
<para>This command has two important functions:<itemizedlist>
@@ -299,9 +299,9 @@
contents and quickly return back to selected difference.</simpara>
</listitem>
</itemizedlist></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Go To line or difference</title>
<para>Using <guimenuitem>Go To</guimenuitem> from
@@ -315,10 +315,10 @@
using <guimenuitem>Find</guimenuitem> or difference navigation it is
faster to jump to first line of difference.</para>
</tip>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title><indexterm>
<primary>Merging Differences</primary>
</indexterm>Merging Differences</title>
@@ -377,9 +377,9 @@
linkend="Configuration">Options & Configuration</link> -chapter for
more information.</para>
</tip>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title><indexterm>
<primary>Merge Mode</primary>
</indexterm>Merge Mode</title>
@@ -420,9 +420,9 @@
<para>When merge mode is enabled <guilabel>Merge</guilabel> text is shown
in statusbar.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Refreshing</title>
<para>Refreshing updates differences after changes are made to files. It
@@ -433,9 +433,9 @@
updated files etc, those changes are not seen. Refresh updates
differences according changes user has done.</para>
</note>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>View Whitespaces</title>
<para>When enabled from <guimenu>View</guimenu> menu <guimenuitem>View
@@ -444,9 +444,9 @@
spaces in other file and tabulators in other. Also, if <guilabel>Preserve
original EOL chars</guilabel> is enabled, WinMerge shows type of EOL
(<guilabel>Windows</guilabel>/<guilabel>Unix</guilabel>/<guilabel>Mac</guilabel>).</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Editing Files</title>
<para>Normal editing features work in WinMerge editor. User can type and
@@ -455,9 +455,9 @@
only in other side). Anyway these customisations are not usually visible
to users otherwise that lines can sometimes "jump" when WinMerge has to
relocate matching/non-matching files.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Line Difference Highlight</title>
<para>WinMerge can automatically highlight all differences it finds in
@@ -488,9 +488,9 @@
</menuchoice> and <guilabel>Editor</guilabel> page). See <link
linkend="Configuration">Options & Configuration</link> -chapter for
more information.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Line Difference Selection</title>
<para>Many times it is useful to see exact differences inside lines.
@@ -505,9 +505,9 @@
<imagedata fileref="screenshots/linediff.png" format="PNG" />
</imageobject>
</mediaobject>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Location Pane</title>
<para>Location pane is a handy side-pane showing a overall (difference)
@@ -546,9 +546,9 @@
background color) can be used like a scrollbar thumb - after pressing down
the left mouse button over it can be dragged upwards and downwards to
scroll the files.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Context Menu</title>
<para>File compare context menu contains items for frequently used
@@ -565,9 +565,9 @@
(system) registered application or with external editor. Also context menu
merge-commands are not relative to active file. They always merge the
selected difference.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Fonts</title>
<para>Font used by editor can be changed from <menuchoice>
@@ -603,9 +603,9 @@
fixed-width mode)</simpara>
</listitem>
</itemizedlist>
- </sect2>
+ </section>
- <sect2 id="ResolveConflictFiles">
+ <section id="ResolveConflictFiles">
<title><indexterm>
<primary>Conflict Files</primary>
</indexterm>Resolving Conflict Files</title>
@@ -617,7 +617,7 @@
compare. So conflicted file can be resolved using normal WinMerge file
compare functionality.</para>
- <sect3>
+ <section>
<title>Opening Conflict Files</title>
<para>Conflict files can be opened into WinMerge using <menuchoice>
@@ -633,9 +633,9 @@
wanted to save, it must be copied to another folder or another
filename before opening it into WinMerge.</para>
</warning>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Conflict Resolving</title>
<para>WinMerge opens conflict file into normal file compare (see above).
@@ -673,6 +673,6 @@
command line parameters. See more info from <link
linkend="CommandLine">Command Line</link> -chapter. Single path to the
conflict file is also accepted in command line.</para>
- </sect3>
- </sect2>
-</sect1>
\ No newline at end of file
+ </section>
+ </section>
+</article>
Modified: trunk/Docs/Users/Manual/Configuration.xml
===================================================================
--- trunk/Docs/Users/Manual/Configuration.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Configuration.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Configuration">
+<article id="Configuration">
<title>Options & configuration</title>
<para>Options dialog can be opened from <guimenu>Edit</guimenu>-menu or from
@@ -7,10 +7,10 @@
<guibutton>OK</guibutton>-button (or pressing
<keycap>Enter</keycap>-key).</para>
- <sect2>
+ <section>
<title>General options</title>
- <sect3>
+ <section>
<title>Automatically scroll to first difference</title>
<para>When this option is enabled:</para>
@@ -26,9 +26,9 @@
is scrolled visible and selected.</simpara>
</listitem>
</itemizedlist>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><indexterm>
<primary>Disabling splash screen</primary>
</indexterm>Disable splash screen</title>
@@ -36,9 +36,9 @@
<para>User can disable splash screen appearing when WinMerge is started.
It does not make WinMerge start faster (splash screen can be missed by
clicking it with mouse) but it saves one click.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><indexterm>
<primary>Esc key</primary>
@@ -54,9 +54,9 @@
<para>Note that -e command line parameter overrides this option. If -e
parameter is given in command line, WinMerge closes with one
<keycap>ESC</keycap> key press.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Automatically verify paths in Open-dialog</title>
<para>When enabled: Open-dialog checks both paths given for validity and
@@ -69,9 +69,9 @@
message is shown if path is not valid. This is faster to use, there is
no any delay in enabling <guibutton>OK</guibutton>. But user must look
at error-dialogs.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><indexterm>
<primary>Single-instance</primary>
</indexterm>Allow only one instance to run</title>
@@ -81,9 +81,9 @@
open with paths, new paths replace existing ones in previous instance.
Or, if multiple compare window support is enabled new compare windows
are opened for new paths. (See below.)</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Open-dialog Auto-Completion</title>
<para>This option allows user to enable auto-completion for Open-dialog
@@ -102,9 +102,9 @@
(usually in MRU lists) to compare.</para>
</listitem>
</itemizedlist>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Enable multiple compare windows for</title>
<para>Allows opening multiple folder or file compare windows into one
@@ -118,9 +118,9 @@
can open one file compare window for every folder compare
window.</para>
</note>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Reset messageboxes (Reset-button)</title>
<para>WinMerge allows user to hide (suppress) some common messageboxes.
@@ -139,10 +139,10 @@
installer is not used then it should be done using this
<guibutton>Reset</guibutton> button.</para>
</note>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Compare options</title>
<para>Several compare options allow to ignore some specific type of
@@ -162,7 +162,7 @@
merging files!</para>
</important>
- <sect3>
+ <section>
<title><indexterm>
<primary>Ignore whitespace characters</primary>
</indexterm>Whitespace</title>
@@ -200,33 +200,33 @@
<para>No spaces between words:<screen format="linespecific">TwoWords</screen></para>
</example></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Ignore blank lines</title>
<para>Ignores differences that have only blank (empty) lines. Blank
lines are shown in file view, but difference is shown with ignored
difference colors and it cannot be merged.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Ignore case</title>
<para>If this option is enabled WinMerge ignores differences between
lowercase and uppercase letters. For example "LowerCase" and "LOWERCASE"
and "lowercase" are same.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Ignore carriage return differences (Windows/Unix/Mac)</title>
<para>If this option is not set WinMerge does not detect EOL style
differences as differences. If two lines differ only by EOL characters
(e.g. Windows EOL and Unix EOL) WinMerge detects files as identical.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Enable moved block detection</title>
<para>When this option is enabled WinMerge tries to detect lines that
@@ -234,9 +234,9 @@
location pane can show moved lines with line between bars. This makes it
easier to visualise changes in files. However if there are a lot of
moved lines it may get messy looking.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Ignore time differences less than 3 seconds</title>
<para><emphasis>Only for "<guilabel>Modified Date</guilabel>" and
@@ -253,9 +253,9 @@
<para>This option should be enabled only when the time difference is
detected. Otherwise it can cause wrong compare results.</para>
</warning>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>File compare method</title>
<para>File compare method has five choices:</para>
@@ -302,9 +302,9 @@
not so accurate like the contents methods.</para>
</listitem>
</itemizedlist>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Stop after first difference</title>
<note>
@@ -320,13 +320,13 @@
enable this if you don't know which kind of files you are comparing. If
you know your files then this is a nice way to make compare even
faster.</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Editor options</title>
- <sect3>
+ <section>
<title>Syntax highlighting</title>
<para>From <guilabel>Editor</guilabel>-page user can enable/disable
@@ -334,9 +334,9 @@
language source codes, web formats etc. Syntax highlighting consumes
some processing power, so if WinMerge screen updating seems to be slow,
turning off this option might help.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><indexterm>
<primary>Automatic rescan</primary>
</indexterm>Automatic rescan</title>
@@ -358,9 +358,9 @@
<para>WinMerge 2.2 release delays more edit events than 2.0.x releases,
so selecting between automatic and manual rescan is mostly a matter of
taste.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Preserve original EOL chars</title>
<important>
@@ -405,9 +405,9 @@
fixing, file might be handled in systems with different EOL styles (e.g.
Windows and Unix). In that case, user can set this option and see
WinMerge showing EOL style for every line.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Tab options</title>
<para>From <guilabel>General</guilabel>-page user can set size tabulator
@@ -416,9 +416,9 @@
<para>Another selection is if user wants WinMerge to add tab characters
or spaces (amount specified by tab size -option) when
<keycap>Tab</keycap>-key is pressed.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><indexterm>
<primary>Highlighting line differences</primary>
</indexterm>Line Difference Coloring</title>
@@ -472,30 +472,30 @@
<para>WinMerge would highlight whole lines when using <guilabel>Break at
whitespace</guilabel> but only numbers 20/25 and 40/25 when using
<guilabel>Break at whitespace or punctuation</guilabel>.</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>System options</title>
- <sect3>
+ <section>
<title>Send deleted files to Recycle Bin</title>
<para>When this options is enabled files and folders deleted in
directory compare are moved to Recycle Bin. Note that use of Recycle Bin
may have disabled from system.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Add to explorer context menu</title>
<para>This option enables/disables shell integration. When enabled, new
menuitem <guimenuitem>WinMerge</guimenuitem> is added to explorer's
context menu. User can select one or two files/folders and then select
that menuitem to open files/folders to WinMerge.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Enable advanced menu</title>
<para>If this option is enabled there are two items shown in explorer's
@@ -507,9 +507,9 @@
<para>Second item (<guimenuitem>Compare...</guimenuitem>) in menu always
opens WinMerge with selected path(s).</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Include subfolders by default</title>
<para>Shell Integration by default does not include subfolders into
@@ -518,9 +518,9 @@
<keycap>Control</keycap> key while selecting the
<guimenuitem>Compare...</guimenuitem> item from the Explorer context
menu.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><indexterm>
<primary>Configuring external editor</primary>
</indexterm>External editor</title>
@@ -540,9 +540,9 @@
<option>-option1</option> <option>-option2</option>
<option><replaceable>...</replaceable></option></para>
</tip>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Filter Folder</title>
<indexterm>
@@ -553,10 +553,10 @@
filters. By default this folder is user's My Documents folder. When new
private file filter is created, it is automatically added to this
folder.</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title><indexterm>
<primary>Backup files</primary>
</indexterm>Backup Files</title>
@@ -564,16 +564,16 @@
<para>This page allows user to select several backup-files related
options.</para>
- <sect3>
+ <section>
<title>Create backup files in</title>
<para>Selects if backup files are created for folder- and file-compares.
In file compare backup files are created whenever files are saved. In
folder compare backup files are created whenever files are written over
(copied).</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Create backup files into</title>
<para>Selects where backup files are created. The default is to create
@@ -585,9 +585,9 @@
backup files are created. This allows easy cleanup of backup files. But
if there are many files with same filename in different folders, then
those files use the same backup file.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Backup filename</title>
<para>The default is to append a <filename>.bak</filename> extension to
@@ -600,16 +600,16 @@
basically this allows tracking the work with the file as every time the
file is saved, new backup copy is created. Beware that this can cause a
lot of files to be created.</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Archive Support</title>
<para>This page contains download link to 7-zip plugin and contains option
related to archive support.</para>
- <sect3>
+ <section>
<title>Enable archive file support</title>
<para>Enables or disables archive file support (based on 7-Zip
@@ -618,9 +618,9 @@
<para>Like described in Installation section of this manual, there are
two different methods how 7-zip can be integrated. Integration method
can be changed using this option dialog after install.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Detect archive type from file signature</title>
<para>Enabling this option allows WinMerge to recognize archive files
@@ -632,17 +632,17 @@
<para>Enabling this option allows WinMerge to recognize and for
example Open Office files.</para>
</tip>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Codepage options</title>
<para>These options allow selecting codepage WinMerge uses for ANSI files
and if codepage should be read from file contents for specific file
formats.</para>
- <sect3>
+ <section>
<title>Default codepage for ANSI files</title>
<para>These three radiobuttons can be used to select default codepage
@@ -658,9 +658,9 @@
changes to files when saving them. <emphasis>Select codepage before
loading the files</emphasis>.</para>
</important>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Detect codepage info for these files: .html .rc .xml</title>
<important>
@@ -696,10 +696,10 @@
copying to WinMerge, Internet Explorer offers codepage
selection).</para>
</caution>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Import and Export of options</title>
<para>Options can be exported to and imported from file. Currently
@@ -707,5 +707,5 @@
by selecting the <guibutton>Export...</guibutton> button. WinMerge asks
for location and filename and then saves the file. Importing is done by
selecting the <guibutton>Import...</guibutton> -button.</para>
- </sect2>
-</sect1>
\ No newline at end of file
+ </section>
+</article>
Modified: trunk/Docs/Users/Manual/Faq.xml
===================================================================
--- trunk/Docs/Users/Manual/Faq.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Faq.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Faq">
+<article id="Faq">
<title>Frequently asked questions</title>
- <sect2>
+ <section>
<title>General questions</title>
<qandaset>
@@ -204,9 +204,9 @@
</answer>
</qandaentry>
</qandaset>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Installing</title>
<qandaset>
@@ -223,9 +223,9 @@
</answer>
</qandaentry>
</qandaset>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>File Comparing</title>
<qandaset>
@@ -247,9 +247,9 @@
</answer>
</qandaentry>
</qandaset>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Questions about editor</title>
<qandaset>
@@ -341,9 +341,9 @@
</answer>
</qandaentry>
</qandaset>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>WinMerge as external compare or diff-tool</title>
<qandaset>
@@ -407,9 +407,9 @@
</answer>
</qandaentry>
</qandaset>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Archive support</title>
<qandaset>
@@ -474,9 +474,9 @@
</answer>
</qandaentry>
</qandaset>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Text encoding (codepages)</title>
<qandaset>
@@ -579,9 +579,9 @@
</answer>
</qandaentry>
</qandaset>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Patch files</title>
<qandaset>
@@ -615,5 +615,5 @@
</qandaset>
<para></para>
- </sect2>
-</sect1>
\ No newline at end of file
+ </section>
+</article>
Modified: trunk/Docs/Users/Manual/Filters.xml
===================================================================
--- trunk/Docs/Users/Manual/Filters.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Filters.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Filters">
+<article id="Filters">
<title>Filters</title>
<para>There are two kinds of filters in WinMerge: file filters for filtering
files and folders in folder compare and line filters for ignoring lines from
files before comparing.</para>
- <sect2>
+ <section>
<title>Regular expressions</title>
<para>Filters are based on regular expressions (regexps). Each line filter
@@ -21,7 +21,7 @@
regular expression engine. There are lots of resources for help with Perl
regular expression.</para>
- <sect3>
+ <section>
<title>Help with regexps</title>
<para>There are many guides and help sites in Web, for example:</para>
@@ -63,10 +63,10 @@
</listitem>
</varlistentry>
</variablelist>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>File filters</title>
<para>A file filter is a set of rules saved to one file. Every file and
@@ -97,7 +97,7 @@
one does not care about the file, WinMerge tries to minimize the effort
and time for the file.</para>
- <sect3>
+ <section>
<title>Filter files</title>
<para>Filter files are normal text files, with an extension of <filename
@@ -237,10 +237,10 @@
character (space or tabulator) and comment-marker
(<constant>##</constant>). <constant>##</constant> can be used as part
of rule if there is no whitespace character before it.</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Line filters</title>
<para>Line filters can be used to ignore single lines from compared files.
@@ -327,5 +327,5 @@
<screen>^#</screen>
</example>
- </sect2>
-</sect1>
+ </section>
+</article>
Modified: trunk/Docs/Users/Manual/Install.xml
===================================================================
--- trunk/Docs/Users/Manual/Install.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Install.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Installing">
+<article id="Installing">
<title>Getting and installing WinMerge</title>
<para>WinMerge can be installed using the installer or by unzipping files from an archive. Using the installer is the recommended method.</para>
@@ -8,13 +8,13 @@
<para>Currently the WinMerge installer works natively only for 32-bit Windows. There is no separate version of WinMerge for 64-bit Windows (WinXP/2003/Vista). 64-bit Windows versions can run the installer and WinMerge as 32-bit applications. For the shell Integration, the installer includes the 64-bit version of the extension.</para>
</note>
- <sect2>
+ <section>
<title>Getting files</title>
<para>The latest release can be always downloaded from the WinMerge home page: <ulink url="http://winmerge.org/">WinMerge.org</ulink>. Note that delays can occur in updating home pages for the latest releases, but the project status page at <ulink url="https://sourceforge.net/projects/winmerge/">SourceForge.net</ulink> shows the latest files. There is also a mailing list for release announcements. Stable releases are also available in several file download sites.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Using the installer (recommended)</title>
<note>
@@ -164,9 +164,9 @@
<simpara>After the installer has copied files, the final screen appears. Using the two check boxes, confirm whether the created WinMerge Start menu folder should be opened, and whether the WinMerge application should be started.</simpara>
</listitem>
</orderedlist>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title id="InstallFromArchive">Installing from an archive</title>
<para>WinMerge is pretty much independent of other system components. It is not tightly integrated with Windows, and does not use many DLLs.</para>
@@ -180,9 +180,9 @@
<para>Archive files have the correct folder structure. WinMerge should be unzipped preserving this folder structure in the destination folder. For example, the root folder created under <filename class="directory">C:\Program Files\</filename> has the name, <filename class="directory">WinMerge-<replaceable>version</replaceable></filename> (for example, <filename class="directory">WinMerge-2.6.0</filename>). You can rename this folder or copy its files to another folder (preserving the folder structure!).</para>
<para>After the files are unzipped, WinMerge is ready to run! Shell integration and archive integration may need additional steps, as described in the next section.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Shell integration</title>
<para>The installer enables shell integration when you choose the <guilabel>Enable Explorer context menu integration</guilabel> option in the Select Additional Tasks page. If you do not use the install program: you must register the shell integration DLL (<filename>ShellExtension*.dll</filename>) separately.</para>
@@ -195,16 +195,16 @@
<para>To register the shell integration DLL (<filename>ShellExtension*.dll</filename>), run <filename>register.bat</filename> from the WinMerge directory. We recommend that you restart the computer after installing shell integration, so that Windows updates all its references.</para>
- <sect3>
+ <section>
<title>64-bit shell integration</title>
<para>Starting with Version 2.6, WinMerge supports 64-bit Windows versions by including 64-bit shell integration. The WinMerge installer recognizes 64-bit versions of Windows and can install the correct shell integration version.</para>
<para>When you install shell integration manually from an archive file, the shell integration DLL is named <filename>ShellExtensionX64.dll</filename>. You can register and unregister this file by using <filename>register.bat</filename> and <filename>unregister.bat</filename>, as with 32-bit versions.</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title><indexterm>
<primary>installing archive support</primary>
</indexterm>7-Zip and archive support</title>
@@ -227,7 +227,7 @@
<guimenuitem>Archive Support Disabled</guimenuitem>
</menuchoice>.</para>
- <sect3 id="Install_merge7zinstaller">
+ <section id="Install_merge7zinstaller">
<title>Merge7zInstaller</title>
<para><filename>Merge7zInstaller</filename> is a stand-alone installer for 7-Zip integration.</para>
@@ -289,6 +289,6 @@
</variablelist>
</listitem>
</orderedlist></para>
- </sect3>
- </sect2>
-</sect1>
+ </section>
+ </section>
+</article>
Modified: trunk/Docs/Users/Manual/Intro_diffs.xml
===================================================================
--- trunk/Docs/Users/Manual/Intro_diffs.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Intro_diffs.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="IntroDiff">
+<article id="IntroDiff">
<title>Overview of file comparing and merging</title>
<para>This topic describes how WinMerge detects and displays differences within files, and demonstrates simple file comparing and merging operations.</para>
- <sect2>
+ <section>
<title>Comparing files</title>
<para>If you compare two files, you can easily identify several types of differences: different characters and words, different lines, even entire blocks of text that are different. But trying understanding all the differences between two files by scanning them in your favorite editor can be tedious and error-prone. Specialized difference/merging tools like WinMerge can make this work much easier and more efficient.</para>
@@ -15,7 +15,7 @@
<para>It's easy to identify individual lines that are different. But sometimes it is useful to treat an entire block of lines that are different as a single difference, instead of comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too.</para>
- <sect3>
+ <section>
<title>Simple compare operation</title>
<para>This section offers a simple example that demonstrates how to compare line difference between two files in WinMerge:</para>
@@ -164,10 +164,10 @@
<para>You have reached the end of the file and had a chance to examine every difference. This was a trivial example — there were only two differences, and there are other ways to compare differences in WinMerge — but it demonstrates the efficiency of using the WinMerge navigation controls.</para>
</listitem>
</orderedlist>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Merging files</title>
<para>The purpose of merging is to combine changes from two files into one file. Merging concepts and functions build on the comparing operation: please read the preceding section before beginning this section. In addition to detecting differences between two file versions, we resolve the differences and save the result in a single <glossterm>target</glossterm> version.</para>
@@ -180,7 +180,7 @@
<para>Just as with comparing, you use WinMerge's toolbar controls (or keyboard shortcuts) to systematically step through each difference. Resolve each difference by copying either its left or right <glossterm>candidate</glossterm> to the other side. When you have resolved all the differences, WinMerge lets you know that all differences are resolved (the versions are identical), and you are done merging.</para>
- <sect3>
+ <section>
<title>Simple merge operation</title>
<para>This short exercise demonstrates how use the controls in the File Compare window to merge the simple files shown earlier, in only a few steps:</para>
@@ -262,9 +262,9 @@
</keycombo> to save your changes.</para>
</listitem>
</orderedlist>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Choosing a merge result file</title>
<para>You control where your merge result is preserved. The WinMerge Compare window does not have a separate result pane, unlike some merge tools. So the simplest strategy is to save your changes in one or both source files. Press <keycombo>
@@ -288,6 +288,6 @@
</menuchoice>. For example, your target file might be the difference or conflict file generated by a version control system.</para>
<para>Similarly, in the WinMerge command line, you can leave both source versions unchanged by using the optional <option>outputfile</option> argument, as described in <link linkend="CommandLine">Command Line</link>.</para>
- </sect3>
- </sect2>
-</sect1>
+ </section>
+ </section>
+</article>
Modified: trunk/Docs/Users/Manual/Locales.xml
===================================================================
--- trunk/Docs/Users/Manual/Locales.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Locales.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Locales">
+<article id="Locales">
<title>Locale support</title>
<para>WinMerge allows translating the user interface to other languages than
@@ -118,7 +118,7 @@
Panel.)</para>
</note>
- <sect2>
+ <section>
<title>Selecting language</title>
<para>In order to change the current user interface language, do the
@@ -142,9 +142,9 @@
<para>Note that the WinMerge user interface instantly updates to the
selected language.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Installing translation</title>
<para>The easiest way to install translations is to select them in the
@@ -193,18 +193,18 @@
<guibutton>OK</guibutton></simpara>
</listitem>
</orderedlist></para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Reporting error in translation</title>
<para>Please submit errors you find in translations as bugs to our <ulink
url="http://sourceforge.net/tracker/?group_id=13216&atid=113216">bug-list</ulink>.
It would be great if you can provide a corrected version of the translated
text also.</para>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title>Submitting a new translation</title>
<para>If you would like to add your language to the list, look at the
@@ -216,5 +216,5 @@
from above link. And if you have problems ask help from us in one of
<ulink url="http://sourceforge.net/forum/?group_id=13216">WinMerge
forums</ulink>.</para>
- </sect2>
-</sect1>
+ </section>
+</article>
Modified: trunk/Docs/Users/Manual/Open_paths.xml
===================================================================
--- trunk/Docs/Users/Manual/Open_paths.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Open_paths.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="OpenPaths">
+<article id="OpenPaths">
<title>Opening Files and Folders</title>
<para>WinMerge allows selecting/opening paths in several ways. Using
Open-dialog is just one of them.</para>
- <sect2>
+ <section>
<title>Open-Dialog</title>
<para>Basic use of Open-dialog is described in <link
linkend="QuickStart">Quick start</link>. Here is some more detailed
information and tips about how to use Open-dialog more efficiently.</para>
- <sect3>
+ <section>
<title>Environment variables</title>
<para>Environment variables can be used as (part of) paths. An
@@ -27,9 +27,9 @@
<envar>%WORKDIR%\project1</envar> is expanded to path <filename
class="directory">c:\workfiles\project1</filename> .</para>
</example>
- </sect3>
+ </section>
- <sect3 id="OpeningArchives">
+ <section id="OpeningArchives">
<title>Opening archive files</title>
<para>Archive file support requires 7-Zip plugin to be installed. See
@@ -55,9 +55,9 @@
automatically copy the same filename to both sides and open the
archive file.</para>
</tip>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Filter selection</title>
<para>Third edit field in <guilabel>Open</guilabel> dialog is for
@@ -93,10 +93,10 @@
WinMerge selects all files (i.e. uses <filename>*.*</filename> as
extension list).</para>
</note>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title><indexterm>
<primary>Shell Integration</primary>
</indexterm>Shell Integration</title>
@@ -124,7 +124,7 @@
<caption><para>Simple WinMerge context menu</para></caption>
</mediaobject></para>
- <sect3>
+ <section>
<title>Advanced Shell Integration</title>
<para>Selecting "<guilabel>Enable advanced menu</guilabel>" for Shell
@@ -182,9 +182,9 @@
when you need to compare one file/folder against several
files/folders.</para>
</tip>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Including Subfolders</title>
<para>Shell Integration by default does not include subfolders into
@@ -193,10 +193,10 @@
behavior can be also changed by holding down <keycap>Control</keycap>
-key while selecting <guimenuitem>Compare</guimenuitem>-item from the
Explorer context menu.</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title><indexterm>
<primary>Drag and Drop</primary>
</indexterm>Drag and Drop</title>
@@ -231,9 +231,9 @@
empty</simpara>
</listitem>
</itemizedlist>
- </sect2>
+ </section>
- <sect2>
+ <section>
<title><indexterm>
<primary>Project Files</primary>
</indexterm>Project Files</title>
@@ -242,7 +242,7 @@
(and filter). The user can easily save currently open paths as project
file for later use.</para>
- <sect3>
+ <section>
<title>Opening Project File</title>
<para>Project file can be given to command line like normal file or
@@ -280,9 +280,9 @@
are compared.</simpara>
</listitem>
</itemizedlist>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Editing and Saving Project File</title>
<para>Project files can be edited and saved using <guilabel>Project
@@ -302,9 +302,9 @@
<caption><para>Project File -dialog</para></caption>
</mediaobject>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Format</title>
<para>Project files are simple XML files with <filename
@@ -361,6 +361,6 @@
<para>None of the fields are required and they can be empty
(<literal><left></left></literal>).</para>
- </sect3>
- </sect2>
-</sect1>
\ No newline at end of file
+ </section>
+ </section>
+</article>
Modified: trunk/Docs/Users/Manual/Plugins.xml
===================================================================
--- trunk/Docs/Users/Manual/Plugins.xml 2008-07-08 23:10:58 UTC (rev 5577)
+++ trunk/Docs/Users/Manual/Plugins.xml 2008-07-09 08:05:00 UTC (rev 5578)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Plugins">
+<article id="Plugins">
<title>Plugins</title>
<para>Plugins are extra-features for WinMerge. They are not included in the
@@ -26,14 +26,14 @@
</listitem>
</itemizedlist>
- <sect2>
+ <section>
<title>Three categories of plugins</title>
<para>"<guilabel>Plugins</guilabel>" is a generic name for extra-feature
dll or scriptlets. Plugins features are spread over three
categories:</para>
- <sect3>
+ <section>
<title>Editor complement</title>
<para>Operate custom operations on the currently selected text from the
@@ -42,9 +42,9 @@
<para>Example plugin: <link linkend="EditorAddin"><filename>editor
addin.sct</filename></link> (Turn the selection to UPPER CASE or lower
case.)</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Unpacker - Transform a file to a text format</title>
<para>The plugin transform a file in a viewable format (for example,
@@ -71,9 +71,9 @@
linkend="DisplayXMLFiles"><filename>DisplayXMLFiles.dll</filename></link>
(Display XML files nicely, by consistently inserting tabs and
linebreaks.)</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Prediffer - Preprocess files to hide some differences</title>
<para>The plugin is not apply to the files displayed in the editor. It
@@ -84,13 +84,13 @@
linkend="IgnoreColumns"><filename>IgnoreColumns.dll</filename></link>
(Ignore the differences inside given columns, while displaying the
characters in these columns.)</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Select and apply a plugin</title>
- <sect3>
+ <section>
<title>"<guilabel>Suggested plugin</guilabel>" and "<guilabel>Automatic
mode</guilabel>"</title>
@@ -109,15 +109,15 @@
"<guimenuitem>Auto prediffer</guimenuitem>" are two separate options.
There is no option for editor complements.</para>
</note>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Editor complement in folder view</title>
<para><emphasis>Not available</emphasis></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Editor complement in editor view</title>
<para>Access list from <menuchoice>
@@ -127,9 +127,9 @@
<guimenuitem>...</guimenuitem>
</menuchoice> in the main menu.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Unpacker in folder view</title>
<para>Check <menuchoice>
@@ -139,9 +139,9 @@
</menuchoice> in the main menu. You need to update the results
(<keycap>F5</keycap>). Each file is loaded again with its suggested
unpacker and compared.</para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Unpacker in editor view</title>
<orderedlist>
@@ -177,9 +177,9 @@
view.</para>
</listitem>
</orderedlist>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Prediffer in folder view</title>
<para>When the files are selected, right-click to open the context menu.
@@ -199,9 +199,9 @@
non-recursive compare, the mode is always reset to "<guimenuitem>No
prediffer</guimenuitem>".</para>
</note>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title>Prediffer in editor view</title>
<orderedlist>
@@ -225,13 +225,13 @@
compared again after the selection, you don't need to rescan.</para>
</listitem>
</orderedlist>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Available plugins</title>
- <sect3>
+ <section>
<title><filename>CompareMSExcelFiles.dll</filename></title>
<para>Displays the text content of a <trademark
@@ -261,9 +261,9 @@
library</link></seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><filename>CompareMSWordFiles.dll</filename></title>
<para>Displays the text content of a <trademark
@@ -293,9 +293,9 @@
runtime library</link></seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3 id="DisplayXMLFiles">
+ <section id="DisplayXMLFiles">
<title><filename>DisplayXMLFiles.dll</filename></title>
<para>This plugin display XML files nicely, by consistently inserting
@@ -317,9 +317,9 @@
<seg>No</seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3 id="EditorAddin">
+ <section id="EditorAddin">
<title><filename>editor addin.sct</filename></title>
<para>Add two functions to the <menuchoice>
@@ -347,9 +347,9 @@
<seg>Editor complement</seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3 id="IgnoreColumns">
+ <section id="IgnoreColumns">
<title><filename>IgnoreColumns.dll</filename></title>
<para>The plugin ignore the characters at specified columns. It does not
@@ -414,9 +414,9 @@
<seg><filename class="extension">*.txt</filename></seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><filename>IgnoreCommentsC.dll</filename></title>
<para>The plugin ignores comments (<constant>//</constant>... and
@@ -440,9 +440,9 @@
class="extension">*.js</filename>,</seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><filename>IgnoreFieldsComma.dll</filename></title>
<para>The plugin is for files with fields and <emphasis>comma</emphasis>
@@ -463,9 +463,9 @@
<seg><filename class="extension">*.csv</filename></seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><filename>IgnoreFieldsTab.dll</filename></title>
<para>The plugin is for files with fields and
@@ -488,9 +488,9 @@
<seg><filename class="extension">*.txt</filename></seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><filename>IgnoreLeadingLineNumbers.dll</filename></title>
<para>This plugin ignores the leading line numbers in text files (for
@@ -512,9 +512,9 @@
Basic</application> runtime library</link></seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><filename>insert datetime.sct</filename></title>
<para>Add two functions to the <menuchoice>
@@ -542,9 +542,9 @@
<seg>Editor complement</seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><filename>RCLocalizationHelper.dll</filename>,
<filename>RCLocalizationHelperU.dll</filename></title>
@@ -566,9 +566,9 @@
<seg><filename class="extension">*.rc</filename></seg>
</seglistitem>
</segmentedlist></para>
- </sect3>
+ </section>
- <sect3>
+ <section>
<title><filename>WatchBeginningOfLog.dll</filename>,
<filename>WatchEndOfLog.dll</filename></title>
@@ -606,13 +606,13 @@
<para>Developers may find information and code of examples in the source
package, under the folder "<filename
class="directory">Plugins</filename>".</para>
- </sect3>
- </sect2>
+ </section>
+ </section>
- <sect2>
+ <section>
<title>Requirements</title>
- <sect3>
+ <section>
<title>Windows Script Host</title>
<para>Some editor complements need this optional component from
@@ -625,9 +625,9 @@
<ulink
url="http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp">MSDN
Library</ulink>.</para>
- </sect3>
+ </section>
- <sect3 id="MSVBVM60">
+ <section id="MSVBVM60">
<title><application>Visual Basic</application> runtime library</title>
<para>S...
[truncated message content] |