Commit 0ef5fffc authored by Joachim Eibl's avatar Joachim Eibl

Improvements by Burkhard Lück

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@159 c8aa9fed-2811-0410-8543-893ada326672
parent 66202e30
......@@ -872,6 +872,7 @@ For more information also see <link linkend="mergeoptions">Merge Settings</link>
</para>
<variablelist>
<!-- commented in code
<varlistentry><term><emphasis>Preserve Carriage Return:</emphasis></term><listitem><para> Some editors (on some systems) save
carriage return '\r' and linefeed '\n'-characters at the end of line, while
others will only save the linefeed '\n'. Usually &kdiff3; ignores the carriage
......@@ -879,6 +880,7 @@ For more information also see <link linkend="mergeoptions">Merge Settings</link>
side comparison. When this option is on, then the carriage return characters
are made visible but are treated as white space. This option must be off
during a merge. Default is off.</para></listitem></varlistentry>
-->
<varlistentry><term><emphasis>Ignore numbers:</emphasis></term><listitem><para> Default is off. Number characters ('0'-'9', '.', '-')
will be ignored in the first part of the analysis in which the line matching is
done. In the result the differences will be shown nevertheless, but they are treated
......@@ -1607,7 +1609,7 @@ So this is what this program can do for you: &kdiff3; ...
<listitem><para>"Recursive Directories": If this is off, then items in subdirectories
will not be found.</para></listitem>
<listitem><para>"Pattern"/"Anti-Pattern": Include/exclude items that match</para></listitem>
<listitem><para>"Exclude Hidden Files"</para></listitem>
<listitem><para>"Find hidden files and directories"</para></listitem>
<listitem><para><link linkend="selectingvisiblefiles">"Show"-options</link> (Show Identical/Different Files, Files only in A/B/C)</para></listitem>
</itemizedlist>
<para>
......@@ -1881,6 +1883,7 @@ Other things that are possible, but probably less useful are:
<para>
&kdiff3; is a KPart. Currently it implements the KParts::ReadOnlyPart-interface.
</para><para>
<!-- Is this still valid? -->
It's main use is as difference-viewer in KDevelop. KDevelop always starts the
internal difference viewer first. To invoke &kdiff3; press the right mouse button
on the difference viewer window and select "Show in KDiff3Part" from the contextmenu.
......@@ -2085,7 +2088,7 @@ You can download the latest version of &kdiff3; from its homepage <ulink url="ht
<title>Requirements</title>
<para>
In order to successfully use all features of &kdiff3;, you need &kde; >3.1.
In order to successfully use all features of &kdiff3;, you need &kde; >4.4.
</para><para>
For information about how to run &kdiff3; on other platforms without KDE please see the
<ulink url="http://kdiff3.sourceforge.net">homepage</ulink>.
......@@ -2099,21 +2102,9 @@ or in the "ChangeLog"-file of the source package.
<sect1 id="compilation">
<title>Compilation and Installation</title>
<para>In order to compile and install &kdiff3; on a system with KDE, type the
following in the base directory of the &kdiff3; distribution:</para>
&install.compile.documentation;
<screen><prompt>%</prompt> <userinput><command>./configure --prefix=<replaceable>kde-dir</replaceable></command></userinput>
<prompt>%</prompt> <userinput><command>make</command></userinput>
<prompt>%</prompt> <userinput><command>make</command> install</userinput>
</screen>
<para>
<replaceable>kde-dir</replaceable> specifies the directory
containing KDE on your system. If you are not sure, read the README-file for details.
</para>
<para>If you don't use KDE don't use <command>configure</command> but follow the instructions for Qt-only systems in the README file.</para>
<para>Since &kdiff3; uses <command>autoconf</command> and
<command>automake</command> you should have no trouble compiling it. Should you
run into problems please report them to the &kde; mailing lists.</para>
<para>If you don't use KDE, follow the instructions for Qt-only systems in the README file.</para>
</sect1>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment