diff options
Diffstat (limited to 'doc/en')
31 files changed, 45 insertions, 45 deletions
diff --git a/doc/en/compilation.html b/doc/en/compilation.html index 6296120..7a5e030 100644 --- a/doc/en/compilation.html +++ b/doc/en/compilation.html @@ -1,4 +1,4 @@ -<html><head><title>Compilation and Installation</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="prev" href="requirements.html" title="Requirements"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Compilation and Installation</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="requirements.html">Prev</a></div><div style="position: absolute; right: 20px;"></div><div class="navCenter">Installation</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="compilation"></a>Compilation and Installation</h2></div></div></div><p>In order to compile and install <span class="application">KDiff3</span> on a system with KDE, type the +<html><head><title>Compilation and Installation</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="prev" href="requirements.html" title="Requirements"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Compilation and Installation</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="requirements.html">Prev</a></div><div style="position: absolute; right: 20px;"></div><div class="navCenter">Installation</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="compilation"></a>Compilation and Installation</h2></div></div></div><p>In order to compile and install <span class="application">KDiff3</span> on a system with KDE, type the following in the base directory of the <span class="application">KDiff3</span> distribution:</p><pre class="screen"><code class="prompt">%</code> <strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">./configure --prefix=<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>kde-dir</code></em></span></strong></span></span></code></strong> <code class="prompt">%</code> <strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">make</strong></span></span></code></strong> <code class="prompt">%</code> <strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">make</strong></span></span> install</code></strong> diff --git a/doc/en/credits.html b/doc/en/credits.html index ed7c389..36f86e4 100644 --- a/doc/en/credits.html +++ b/doc/en/credits.html @@ -1,4 +1,4 @@ -<html><head><title>Chapter 6. Credits and License</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="faq.html" title="Chapter 5. Questions and Answers"><link rel="next" href="installation.html" title="Appendix A. Installation"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Credits and License</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="faq.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="installation.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="credits"></a>Chapter 6. Credits and License</h2></div></div></div><p> +<html><head><title>Chapter 6. Credits and License</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="faq.html" title="Chapter 5. Questions and Answers"><link rel="next" href="installation.html" title="Appendix A. Installation"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Credits and License</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="faq.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="installation.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="credits"></a>Chapter 6. Credits and License</h2></div></div></div><p> <span class="application">KDiff3</span> - File and Directory Comparison and Merge Tool </p><p> Program copyright 2002-2007 Joachim Eibl <code class="email">(joachim.eibl at gmx.de)</code> diff --git a/doc/en/dirmerge.html b/doc/en/dirmerge.html index e862018..995a580 100644 --- a/doc/en/dirmerge.html +++ b/doc/en/dirmerge.html @@ -1,4 +1,4 @@ -<html><head><title>Chapter 3. Directory Comparison and Merge with KDiff3</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="preprocessors.html" title="Preprocessor Commands"><link rel="next" href="startingdirmerge.html" title="Starting Directory Comparison Or Merge"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="preprocessors.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="startingdirmerge.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="dirmerge"></a>Chapter 3. Directory Comparison and Merge with <span class="application">KDiff3</span></h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergeintro"></a>Introduction into Directory Comparison and Merge</h2></div></div></div><p> +<html><head><title>Chapter 3. Directory Comparison and Merge with KDiff3</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="preprocessors.html" title="Preprocessor Commands"><link rel="next" href="startingdirmerge.html" title="Starting Directory Comparison Or Merge"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="preprocessors.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="startingdirmerge.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="dirmerge"></a>Chapter 3. Directory Comparison and Merge with <span class="application">KDiff3</span></h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergeintro"></a>Introduction into Directory Comparison and Merge</h2></div></div></div><p> Often programmers must modify many files in a directory to achieve their purpose. For this <span class="application">KDiff3</span> also lets you compare and merge complete directories recursively! diff --git a/doc/en/dirmergeoptions.html b/doc/en/dirmergeoptions.html index 5a4aa6c..2e40cd7 100644 --- a/doc/en/dirmergeoptions.html +++ b/doc/en/dirmergeoptions.html @@ -1,4 +1,4 @@ -<html><head><title>Options for Comparing and Merging Directories</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dothemerge.html" title="Doing A Directory Merge"><link rel="next" href="other.html" title="Other Functions in Directory Merge Window"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Options for Comparing and Merging Directories</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="dothemerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="other.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergeoptions"></a>Options for Comparing and Merging Directories</h2></div></div></div><p> +<html><head><title>Options for Comparing and Merging Directories</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dothemerge.html" title="Doing A Directory Merge"><link rel="next" href="other.html" title="Other Functions in Directory Merge Window"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Options for Comparing and Merging Directories</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="dothemerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="other.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergeoptions"></a>Options for Comparing and Merging Directories</h2></div></div></div><p> The <span class="application">KDiff3</span>-preferences (menu "Settings"->"Configure <span class="application">KDiff3</span>") has a section called "Directory Merge" with these options: </p><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Recursive Directories:</em></span></span></dt><dd><p> Select whether to search directories diff --git a/doc/en/dirmergevisible.html b/doc/en/dirmergevisible.html index 5e530b2..8a6687c 100644 --- a/doc/en/dirmergevisible.html +++ b/doc/en/dirmergevisible.html @@ -1,4 +1,4 @@ -<html><head><title>Directory Merge Visible Information</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="startingdirmerge.html" title="Starting Directory Comparison Or Merge"><link rel="next" href="dothemerge.html" title="Doing A Directory Merge"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Directory Merge Visible Information</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="startingdirmerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dothemerge.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergevisible"></a>Directory Merge Visible Information</h2></div></div></div><p> +<html><head><title>Directory Merge Visible Information</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="startingdirmerge.html" title="Starting Directory Comparison Or Merge"><link rel="next" href="dothemerge.html" title="Doing A Directory Merge"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Directory Merge Visible Information</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="startingdirmerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dothemerge.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergevisible"></a>Directory Merge Visible Information</h2></div></div></div><p> While reading the directories a message-box appears that informs you of the progress. If you abort the directory scan, then only files that have been compared until then will be listed. diff --git a/doc/en/documentation.html b/doc/en/documentation.html index 304bfe6..969cf42 100644 --- a/doc/en/documentation.html +++ b/doc/en/documentation.html @@ -1,4 +1,4 @@ -<html><head><title>Chapter 2. File Comparison And Merge</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="features.html" title="More Features"><link rel="next" href="opendialog.html" title="Open-Dialog"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">File Comparison And Merge</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="features.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="opendialog.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="documentation"></a>Chapter 2. File Comparison And Merge</h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="commandline"></a>Command-Line Options</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488302"></a>Comparing 2 files: </h3></div></div></div><pre class="screen"> +<html><head><title>Chapter 2. File Comparison And Merge</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="features.html" title="More Features"><link rel="next" href="opendialog.html" title="Open-Dialog"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">File Comparison And Merge</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="features.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="opendialog.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="documentation"></a>Chapter 2. File Comparison And Merge</h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="commandline"></a>Command-Line Options</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488302"></a>Comparing 2 files: </h3></div></div></div><pre class="screen"> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file1 file2</code></em></span> </pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488321"></a>Merging 2 files: </h3></div></div></div><pre class="screen"> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file1 file2</code></em></span> -m diff --git a/doc/en/dothemerge.html b/doc/en/dothemerge.html index 8951356..3d965d5 100644 --- a/doc/en/dothemerge.html +++ b/doc/en/dothemerge.html @@ -1,4 +1,4 @@ -<html><head><title>Doing A Directory Merge</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dirmergevisible.html" title="Directory Merge Visible Information"><link rel="next" href="dirmergeoptions.html" title="Options for Comparing and Merging Directories"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Doing A Directory Merge</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="dirmergevisible.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmergeoptions.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dothemerge"></a>Doing A Directory Merge</h2></div></div></div><p> +<html><head><title>Doing A Directory Merge</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dirmergevisible.html" title="Directory Merge Visible Information"><link rel="next" href="dirmergeoptions.html" title="Options for Comparing and Merging Directories"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Doing A Directory Merge</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="dirmergevisible.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmergeoptions.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dothemerge"></a>Doing A Directory Merge</h2></div></div></div><p> You can either merge the currently selected item (file or directory), or all items. When you have made all your operation choices (in all subdirectories too) then you can start the merge. diff --git a/doc/en/faq.html b/doc/en/faq.html index 78df594..5e170e9 100644 --- a/doc/en/faq.html +++ b/doc/en/faq.html @@ -1,4 +1,4 @@ -<html><head><title>Chapter 5. Questions and Answers</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="kpart.html" title="Using KDiff3 as a KPart"><link rel="next" href="credits.html" title="Chapter 6. Credits and License"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Questions and Answers</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="kpart.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="credits.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="faq"></a>Chapter 5. Questions and Answers</h2></div></div></div><p>This document may have been updated since your installation. +<html><head><title>Chapter 5. Questions and Answers</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="kpart.html" title="Using KDiff3 as a KPart"><link rel="next" href="credits.html" title="Chapter 6. Credits and License"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Questions and Answers</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="kpart.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="credits.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="faq"></a>Chapter 5. Questions and Answers</h2></div></div></div><p>This document may have been updated since your installation. You can find the latest version at <a href="http://docs.kde.org/development/en/extragear-utils/" target="_top">http://docs.kde.org/development/en/extragear-utils/</a>.</p><div class="qandaset"><dl><dt>5.1. <a href="faq.html#id2570336"> Why is it called "KDiff3"? </a></dt><dt>5.2. <a href="faq.html#id2569721"> diff --git a/doc/en/features.html b/doc/en/features.html index 6007450..598ac5f 100644 --- a/doc/en/features.html +++ b/doc/en/features.html @@ -1,4 +1,4 @@ -<html><head><title>More Features</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="introduction.html" title="Chapter 1. Introduction"><link rel="prev" href="screenshots.html" title="Screenshots and Features"><link rel="next" href="documentation.html" title="Chapter 2. File Comparison And Merge"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">More Features</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="screenshots.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="documentation.html">Next</a></div><div class="navCenter">Introduction</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features"></a>More Features</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2490911"></a> Line-By-Line And Char-By-Char Diff-Viewer</h3></div></div></div><p>By using the possiblities of a graphical color display <span class="application">KDiff3</span> shows +<html><head><title>More Features</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="introduction.html" title="Chapter 1. Introduction"><link rel="prev" href="screenshots.html" title="Screenshots and Features"><link rel="next" href="documentation.html" title="Chapter 2. File Comparison And Merge"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">More Features</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="screenshots.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="documentation.html">Next</a></div><div class="navCenter">Introduction</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features"></a>More Features</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2490911"></a> Line-By-Line And Char-By-Char Diff-Viewer</h3></div></div></div><p>By using the possiblities of a graphical color display <span class="application">KDiff3</span> shows exactly what the difference is. When you have to do many code-reviews, you will like this. </p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="letter_by_letter.png"><hr></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2490942"></a> See White-Space Differences At One Glance</h3></div></div></div><p>Spaces and tabs that differ appear visibly. When lines differ only in the amount of white space this can be seen at one look in the summary @@ -18,5 +18,5 @@ You can also select more than one source. Since this output window is an editor even conflicts which need further corrections can be solved here without requiring another tool. -</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2491031"></a>And ...</h3></div></div></div><div class="itemizedlist"><ul type="disc"><li><p>Fast navigation via buttons.</p></li><li><p>A mouse-click into a summary column sync's all windows to show the same position.</p></li><li><p>Select and copy from any window and paste into the merge result window.</p></li><li><p>Overview column that shows where the changes and conflicts are.</p></li><li><p>The colors are adjustable to your specific preferences.</p></li><li><p>Adjustable Tab size.</p></li><li><p>Option to insert spaces instead of tabs.</p></li><li><p>Open files comfortably via dialog or specify files on the command line.</p></li><li><p>Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)</p></li><li><p>Show the line numbers for each line. </p></li><li><p>Paste clipboard or drag text into a diff input window.</p></li><li><p>Networktransparency via KIO.</p></li><li><p>Can be used as diff-viewer in KDevelop 3.</p></li><li><p>Word-wrap for long lines.</p></li><li><p>Support for Unicode, UTF-8 and other codecs.</p></li><li><p>Support for right to left languages.</p></li><li><p>...</p></li></ul></div></div></div><div style="background-color: #white; color: black; margin-top: 20px; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="screenshots.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="documentation.html">Next</a></div><div align="center"><a accesskey="h" href="index.html">Home</a></div></div><div style="background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div class="navLeft">Screenshots and Features </div><div class="navRight"> File Comparison And Merge</div><div class="navCenter"><a accesskey="u" href="introduction.html">Up</a></div></div><br><br><div class="bannerBottom" style="background-image: url(help:/common/bottom-middle.png); background-repeat: x-repeat; width: 100%; height: 100px; bottom:0px;"><div class="BannerBottomRight"><img src="help:/common/bottom-right.png" style="margin: 0px" alt=""></div><div class="bannerBottomLeft"><img src="help:/common/bottom-left.png" style="margin: 0px;" alt=""></div><div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #cfe1f6"><p>Would you like to make a comment or contribute an update to this page?<br> +</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2491031"></a>And ...</h3></div></div></div><div class="itemizedlist"><ul type="disc"><li><p>Fast navigation via buttons.</p></li><li><p>A mouse-click into a summary column sync's all windows to show the same position.</p></li><li><p>Select and copy from any window and paste into the merge result window.</p></li><li><p>Overview column that shows where the changes and conflicts are.</p></li><li><p>The colors are adjustable to your specific preferences.</p></li><li><p>Adjustable Tab size.</p></li><li><p>Option to insert spaces instead of tabs.</p></li><li><p>Open files comfortably via dialog or specify files on the command line.</p></li><li><p>Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)</p></li><li><p>Show the line numbers for each line. </p></li><li><p>Paste clipboard or drag text into a diff input window.</p></li><li><p>Networktransparency via TDEIO.</p></li><li><p>Can be used as diff-viewer in KDevelop 3.</p></li><li><p>Word-wrap for long lines.</p></li><li><p>Support for Unicode, UTF-8 and other codecs.</p></li><li><p>Support for right to left languages.</p></li><li><p>...</p></li></ul></div></div></div><div style="background-color: #white; color: black; margin-top: 20px; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="screenshots.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="documentation.html">Next</a></div><div align="center"><a accesskey="h" href="index.html">Home</a></div></div><div style="background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div class="navLeft">Screenshots and Features </div><div class="navRight"> File Comparison And Merge</div><div class="navCenter"><a accesskey="u" href="introduction.html">Up</a></div></div><br><br><div class="bannerBottom" style="background-image: url(help:/common/bottom-middle.png); background-repeat: x-repeat; width: 100%; height: 100px; bottom:0px;"><div class="BannerBottomRight"><img src="help:/common/bottom-right.png" style="margin: 0px" alt=""></div><div class="bannerBottomLeft"><img src="help:/common/bottom-left.png" style="margin: 0px;" alt=""></div><div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #cfe1f6"><p>Would you like to make a comment or contribute an update to this page?<br> Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>
\ No newline at end of file diff --git a/doc/en/find.html b/doc/en/find.html index b38c6fe..330cfbe 100644 --- a/doc/en/find.html +++ b/doc/en/find.html @@ -1,4 +1,4 @@ -<html><head><title>Finding Strings</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="saving.html" title="Saving"><link rel="next" href="printing.html" title="Printing"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Finding Strings</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="saving.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="printing.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="find"></a>Finding Strings</h2></div></div></div><p> +<html><head><title>Finding Strings</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="saving.html" title="Saving"><link rel="next" href="printing.html" title="Printing"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Finding Strings</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="saving.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="printing.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="find"></a>Finding Strings</h2></div></div></div><p> You can search for a string in any text-window of <span class="application">KDiff3</span>. The "Find ..."-command (Ctrl-F) in the Edit-menu opens a dialog that lets you specify the string to search for. You can also select the windows which should be searched. diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 50425ed..a5dc316 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -56,7 +56,7 @@ Do NOT change these in the translation. --> <listitem><para>shows the differences line by line and character by character(!),</para></listitem> <listitem><para>provides an automatic merge-facility,</para></listitem> <listitem><para>has an editor for comfortable solving of merge-conflicts,</para></listitem> -<listitem><para>provides networktransparency via KIO,</para></listitem> +<listitem><para>provides networktransparency via TDEIO,</para></listitem> <listitem><para>has options to highlight or hide changes in white-space or comments,</para></listitem> <listitem><para>supports Unicode, UTF-8 and other file encodings,</para></listitem> <listitem><para>prints differences,</para></listitem> @@ -87,7 +87,7 @@ Please at least include KDE, the KDE package it is in, the name <keyword>in-line-differences</keyword> <keyword>synchronise</keyword> <keyword>kpart</keyword> -<keyword>kio</keyword> +<keyword>tdeio</keyword> <keyword>networktransparent</keyword> <keyword>editor</keyword> <keyword>white space</keyword> @@ -219,7 +219,7 @@ This screenshot shows &kdiff3; during a directory merge: <listitem><para>Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)</para></listitem> <listitem><para>Show the line numbers for each line. </para></listitem> <listitem><para>Paste clipboard or drag text into a diff input window.</para></listitem> - <listitem><para>Networktransparency via KIO.</para></listitem> + <listitem><para>Networktransparency via TDEIO.</para></listitem> <listitem><para>Can be used as diff-viewer in KDevelop 3.</para></listitem> <listitem><para>Word-wrap for long lines.</para></listitem> <listitem><para>Support for Unicode, UTF-8 and other codecs.</para></listitem> @@ -1795,10 +1795,10 @@ So this is what this program can do for you: &kdiff3; ... <chapter id="misc"> <title>Miscellaneous Topics</title> <sect1 id="networktransparency"> -<title>Networktransparency via KIO</title> -<sect2><title>KIO-Slaves</title> +<title>Networktransparency via TDEIO</title> +<sect2><title>TDEIO-Slaves</title> <para> -KDE supports networktransparency via KIO-slaves. &kdiff3; uses this +KDE supports networktransparency via TDEIO-slaves. &kdiff3; uses this for reading input files and for scanning directories. This means that you can specify files and directories on local and remote resources via URLs. @@ -1813,7 +1813,7 @@ Example: <para>The first line compares a local file with a file on an FTP-server. The second line compares a directory within an compressed archive with a local directory. </para><para> -Other KIO-slaves that are interesting are: +Other TDEIO-slaves that are interesting are: </para> <itemizedlist> <listitem><para>Files from the WWW (http:),</para></listitem> @@ -1850,7 +1850,7 @@ Other things that are possible, but probably less useful are: </sect2> -<sect2><title>Capabilities of KIO-Slaves</title> +<sect2><title>Capabilities of TDEIO-Slaves</title> <para> Networktransparency has one drawback: Not all ressources have the same cababilities. </para><para> diff --git a/doc/en/index.html b/doc/en/index.html index 404e0af..04a04f6 100644 --- a/doc/en/index.html +++ b/doc/en/index.html @@ -1,16 +1,16 @@ <html><head><title>The KDiff3 Handbook</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="description" content=" KDiff3 is a file and directory diff and merge tool which -compares and merges two or three text input files or directories,shows the differences line by line and character by character(!),provides an automatic merge-facility,has an editor for comfortable solving of merge-conflicts,provides networktransparency via KIO,has options to highlight or hide changes in white-space or comments,supports Unicode, UTF-8 and other file encodings,prints differences,supports version control keyword and history merging. +compares and merges two or three text input files or directories,shows the differences line by line and character by character(!),provides an automatic merge-facility,has an editor for comfortable solving of merge-conflicts,provides networktransparency via TDEIO,has options to highlight or hide changes in white-space or comments,supports Unicode, UTF-8 and other file encodings,prints differences,supports version control keyword and history merging. This document describes KDiff3-version 0.9.92. -"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="next" href="introduction.html" title="Chapter 1. Introduction"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">The <span class="application">KDiff3</span> Handbook</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="introduction.html">Next</a></div><div class="navCenter"> </div></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id2421696"></a>The <span class="application">KDiff3</span> Handbook</h1></div><div><div class="authorgroup"><p class="author"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="firstname">Joachim</span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="surname">Eibl</span> <code class="email"><joachim.eibl at gmx.de></code></p></div></div><div>Revision <span class="releaseinfo">0.9.92 (<span class="date">2007-31-03</span>)</span></div><div><p class="copyright">Copyright © 2002-2007 Joachim Eibl</p></div><div><div class="legalnotice"><a name="id2564266"></a><p>Permission is granted to copy, distribute and/or modify this +"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="next" href="introduction.html" title="Chapter 1. Introduction"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">The <span class="application">KDiff3</span> Handbook</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="introduction.html">Next</a></div><div class="navCenter"> </div></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id2421696"></a>The <span class="application">KDiff3</span> Handbook</h1></div><div><div class="authorgroup"><p class="author"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="firstname">Joachim</span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="surname">Eibl</span> <code class="email"><joachim.eibl at gmx.de></code></p></div></div><div>Revision <span class="releaseinfo">0.9.92 (<span class="date">2007-31-03</span>)</span></div><div><p class="copyright">Copyright © 2002-2007 Joachim Eibl</p></div><div><div class="legalnotice"><a name="id2564266"></a><p>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in <a href="credits.html#gnu-fdl">the section entitled "GNU Free Documentation License"</a>.</p></div></div><div><div><div class="abstract"><p> <span class="application">KDiff3</span> is a file and directory diff and merge tool which -<div class="itemizedlist"><ul type="disc"><li><p>compares and merges two or three text input files or directories,</p></li><li><p>shows the differences line by line and character by character(!),</p></li><li><p>provides an automatic merge-facility,</p></li><li><p>has an editor for comfortable solving of merge-conflicts,</p></li><li><p>provides networktransparency via KIO,</p></li><li><p>has options to highlight or hide changes in white-space or comments,</p></li><li><p>supports Unicode, UTF-8 and other file encodings,</p></li><li><p>prints differences,</p></li><li><p>supports version control keyword and history merging.</p></li></ul></div> +<div class="itemizedlist"><ul type="disc"><li><p>compares and merges two or three text input files or directories,</p></li><li><p>shows the differences line by line and character by character(!),</p></li><li><p>provides an automatic merge-facility,</p></li><li><p>has an editor for comfortable solving of merge-conflicts,</p></li><li><p>provides networktransparency via TDEIO,</p></li><li><p>has options to highlight or hide changes in white-space or comments,</p></li><li><p>supports Unicode, UTF-8 and other file encodings,</p></li><li><p>prints differences,</p></li><li><p>supports version control keyword and history merging.</p></li></ul></div> </p><p> This document describes <span class="application">KDiff3</span>-version 0.9.92. -</p></div></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="introduction.html">1. Introduction</a></span></dt><dd><dl><dt><span class="sect1"><a href="introduction.html#why">Yet Another Diff Frontend?</a></span></dt><dt><span class="sect1"><a href="screenshots.html">Screenshots and Features</a></span></dt><dt><span class="sect1"><a href="features.html">More Features</a></span></dt><dd><dl><dt><span class="sect2"><a href="features.html#id2490911"> Line-By-Line And Char-By-Char Diff-Viewer</a></span></dt><dt><span class="sect2"><a href="features.html#id2490942"> See White-Space Differences At One Glance</a></span></dt><dt><span class="sect2"><a href="features.html#id2490972"> Triple-Diff</a></span></dt><dt><span class="sect2"><a href="features.html#id2491007"> Comfortable Merge Of Two Or Three Input Files</a></span></dt><dt><span class="sect2"><a href="features.html#id2491031">And ...</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="documentation.html">2. File Comparison And Merge</a></span></dt><dd><dl><dt><span class="sect1"><a href="documentation.html#commandline">Command-Line Options</a></span></dt><dd><dl><dt><span class="sect2"><a href="documentation.html#id2488302">Comparing 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488321">Merging 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488352">Comparing 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488370">Merging 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488418">Special case: Files with the same name </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488444">Commandline for starting a directory comparison or merge: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488514">Other command line options</a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488593">Ignorable command line options</a></span></dt></dl></dd><dt><span class="sect1"><a href="opendialog.html">Open-Dialog</a></span></dt><dt><span class="sect1"><a href="pasteinput.html">Paste and Drop Input</a></span></dt><dt><span class="sect1"><a href="interpretinginformation.html">Comparing Files And Interpreting The Information In The Input Windows</a></span></dt><dd><dl><dt><span class="sect2"><a href="interpretinginformation.html#id2564410">Info Line</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564428">Coloring</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564454">Summary Column</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564475">Overview Column</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#manualdiffhelp">Manually Aligning Lines</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#joinsplitsections">Manually Joining and Splitting Diff Sections</a></span></dt></dl></dd><dt><span class="sect1"><a href="merging.html">Merging And The Merge Output Editor Window</a></span></dt><dd><dl><dt><span class="sect2"><a href="merging.html#id2564630">The Summary Column</a></span></dt><dt><span class="sect2"><a href="merging.html#synchronise_views">Setting The Current Group And Synchronising Merge And Diff View Position</a></span></dt><dt><span class="sect2"><a href="merging.html#id2564684">Choosing Inputs A, B or C For Current Conflict And Editing</a></span></dt><dt><span class="sect2"><a href="merging.html#id2564761">Choosing Input A, B, or C for All Conflicts</a></span></dt><dt><span class="sect2"><a href="merging.html#vcskeywordsmergesupport">Automatic Merge of Version Control Keywords and History (Log)</a></span></dt></dl></dd><dt><span class="sect1"><a href="navigation.html">Navigation And Editing</a></span></dt><dd><dl><dt><span class="sect2"><a href="navigation.html#autoadvance">Auto-Advance</a></span></dt></dl></dd><dt><span class="sect1"><a href="selections.html">Select, Copy And Paste</a></span></dt><dt><span class="sect1"><a href="saving.html">Saving</a></span></dt><dt><span class="sect1"><a href="find.html">Finding Strings</a></span></dt><dt><span class="sect1"><a href="printing.html">Printing</a></span></dt><dt><span class="sect1"><a href="options.html">Options</a></span></dt><dd><dl><dt><span class="sect2"><a href="options.html#id2566321">Font</a></span></dt><dt><span class="sect2"><a href="options.html#id2566353">Colors</a></span></dt><dt><span class="sect2"><a href="options.html#id2566534">Editor Settings</a></span></dt><dt><span class="sect2"><a href="options.html#diffoptions">Diff Settings</a></span></dt><dt><span class="sect2"><a href="options.html#mergeoptions">Merge Settings</a></span></dt><dt><span class="sect2"><a href="options.html#id2566994">Directory Merge</a></span></dt><dt><span class="sect2"><a href="options.html#id2567038">Regional and Language Options</a></span></dt><dt><span class="sect2"><a href="options.html#id2567171">Miscellaneous</a></span></dt><dt><span class="sect2"><a href="options.html#shortcuts">Configuring Keyboard-Shortcuts</a></span></dt></dl></dd><dt><span class="sect1"><a href="preprocessors.html">Preprocessor Commands</a></span></dt><dd><dl><dt><span class="sect2"><a href="preprocessors.html#sedbasics"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> Basics</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#sedforkdiff3">Examples For <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span>-Use In <span class="application">KDiff3</span></a></span></dt><dt><span class="sect2"><a href="preprocessors.html#id2567900">Order Of Preprocessor Execution</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#id2567963">Warning</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="dirmerge.html">3. Directory Comparison and Merge with <span class="application">KDiff3</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="dirmerge.html#dirmergeintro">Introduction into Directory Comparison and Merge</a></span></dt><dt><span class="sect1"><a href="startingdirmerge.html">Starting Directory Comparison Or Merge</a></span></dt><dd><dl><dt><span class="sect2"><a href="startingdirmerge.html#id2568158">Compare/Merge two directories: </a></span></dt><dt><span class="sect2"><a href="startingdirmerge.html#id2568202">Compare/Merge three directories: </a></span></dt></dl></dd><dt><span class="sect1"><a href="dirmergevisible.html">Directory Merge Visible Information</a></span></dt><dd><dl><dt><span class="sect2"><a href="dirmergevisible.html#name">The Name Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#coloring">The Columns A/B/C and the Coloring Scheme</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#operation">The Operation Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#status">The Status Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#statisticscolulmns">Statistics Columns</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#selectingvisiblefiles">Selecting Listed Files</a></span></dt></dl></dd><dt><span class="sect1"><a href="dothemerge.html">Doing A Directory Merge</a></span></dt><dt><span class="sect1"><a href="dirmergeoptions.html">Options for Comparing and Merging Directories</a></span></dt><dt><span class="sect1"><a href="other.html">Other Functions in Directory Merge Window</a></span></dt><dd><dl><dt><span class="sect2"><a href="other.html#id2569323">Split/Full Screen Mode</a></span></dt><dt><span class="sect2"><a href="other.html#id2569341">Comparing or Merging a Single File</a></span></dt><dt><span class="sect2"><a href="other.html#id2569364">Comparing or Merging Files with Different Names</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="misc.html">4. Miscellaneous Topics</a></span></dt><dd><dl><dt><span class="sect1"><a href="misc.html#networktransparency">Networktransparency via KIO</a></span></dt><dd><dl><dt><span class="sect2"><a href="misc.html#id2569419">KIO-Slaves</a></span></dt><dt><span class="sect2"><a href="misc.html#id2569517">How To Write URLs</a></span></dt><dt><span class="sect2"><a href="misc.html#id2569553">Capabilities of KIO-Slaves</a></span></dt></dl></dd><dt><span class="sect1"><a href="kpart.html">Using <span class="application">KDiff3</span> as a KPart</a></span></dt></dl></dd><dt><span class="chapter"><a href="faq.html">5. Questions and Answers</a></span></dt><dt><span class="chapter"><a href="credits.html">6. Credits and License</a></span></dt><dt><span class="appendix"><a href="installation.html">A. Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="installation.html#getting-kdiff3">How to obtain <span class="application">KDiff3</span></a></span></dt><dt><span class="sect1"><a href="requirements.html">Requirements</a></span></dt><dt><span class="sect1"><a href="compilation.html">Compilation and Installation</a></span></dt></dl></dd></dl></div></div><div style="background-color: #white; color: black; margin-top: 20px; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="introduction.html">Next</a></div><div align="center"> </div></div><div style="background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div class="navLeft"> </div><div class="navRight"> Introduction</div><div class="navCenter"> </div></div><br><br><div class="bannerBottom" style="background-image: url(help:/common/bottom-middle.png); background-repeat: x-repeat; width: 100%; height: 100px; bottom:0px;"><div class="BannerBottomRight"><img src="help:/common/bottom-right.png" style="margin: 0px" alt=""></div><div class="bannerBottomLeft"><img src="help:/common/bottom-left.png" style="margin: 0px;" alt=""></div><div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #cfe1f6"><p>Would you like to make a comment or contribute an update to this page?<br> +</p></div></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="introduction.html">1. Introduction</a></span></dt><dd><dl><dt><span class="sect1"><a href="introduction.html#why">Yet Another Diff Frontend?</a></span></dt><dt><span class="sect1"><a href="screenshots.html">Screenshots and Features</a></span></dt><dt><span class="sect1"><a href="features.html">More Features</a></span></dt><dd><dl><dt><span class="sect2"><a href="features.html#id2490911"> Line-By-Line And Char-By-Char Diff-Viewer</a></span></dt><dt><span class="sect2"><a href="features.html#id2490942"> See White-Space Differences At One Glance</a></span></dt><dt><span class="sect2"><a href="features.html#id2490972"> Triple-Diff</a></span></dt><dt><span class="sect2"><a href="features.html#id2491007"> Comfortable Merge Of Two Or Three Input Files</a></span></dt><dt><span class="sect2"><a href="features.html#id2491031">And ...</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="documentation.html">2. File Comparison And Merge</a></span></dt><dd><dl><dt><span class="sect1"><a href="documentation.html#commandline">Command-Line Options</a></span></dt><dd><dl><dt><span class="sect2"><a href="documentation.html#id2488302">Comparing 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488321">Merging 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488352">Comparing 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488370">Merging 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488418">Special case: Files with the same name </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488444">Commandline for starting a directory comparison or merge: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488514">Other command line options</a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488593">Ignorable command line options</a></span></dt></dl></dd><dt><span class="sect1"><a href="opendialog.html">Open-Dialog</a></span></dt><dt><span class="sect1"><a href="pasteinput.html">Paste and Drop Input</a></span></dt><dt><span class="sect1"><a href="interpretinginformation.html">Comparing Files And Interpreting The Information In The Input Windows</a></span></dt><dd><dl><dt><span class="sect2"><a href="interpretinginformation.html#id2564410">Info Line</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564428">Coloring</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564454">Summary Column</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564475">Overview Column</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#manualdiffhelp">Manually Aligning Lines</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#joinsplitsections">Manually Joining and Splitting Diff Sections</a></span></dt></dl></dd><dt><span class="sect1"><a href="merging.html">Merging And The Merge Output Editor Window</a></span></dt><dd><dl><dt><span class="sect2"><a href="merging.html#id2564630">The Summary Column</a></span></dt><dt><span class="sect2"><a href="merging.html#synchronise_views">Setting The Current Group And Synchronising Merge And Diff View Position</a></span></dt><dt><span class="sect2"><a href="merging.html#id2564684">Choosing Inputs A, B or C For Current Conflict And Editing</a></span></dt><dt><span class="sect2"><a href="merging.html#id2564761">Choosing Input A, B, or C for All Conflicts</a></span></dt><dt><span class="sect2"><a href="merging.html#vcskeywordsmergesupport">Automatic Merge of Version Control Keywords and History (Log)</a></span></dt></dl></dd><dt><span class="sect1"><a href="navigation.html">Navigation And Editing</a></span></dt><dd><dl><dt><span class="sect2"><a href="navigation.html#autoadvance">Auto-Advance</a></span></dt></dl></dd><dt><span class="sect1"><a href="selections.html">Select, Copy And Paste</a></span></dt><dt><span class="sect1"><a href="saving.html">Saving</a></span></dt><dt><span class="sect1"><a href="find.html">Finding Strings</a></span></dt><dt><span class="sect1"><a href="printing.html">Printing</a></span></dt><dt><span class="sect1"><a href="options.html">Options</a></span></dt><dd><dl><dt><span class="sect2"><a href="options.html#id2566321">Font</a></span></dt><dt><span class="sect2"><a href="options.html#id2566353">Colors</a></span></dt><dt><span class="sect2"><a href="options.html#id2566534">Editor Settings</a></span></dt><dt><span class="sect2"><a href="options.html#diffoptions">Diff Settings</a></span></dt><dt><span class="sect2"><a href="options.html#mergeoptions">Merge Settings</a></span></dt><dt><span class="sect2"><a href="options.html#id2566994">Directory Merge</a></span></dt><dt><span class="sect2"><a href="options.html#id2567038">Regional and Language Options</a></span></dt><dt><span class="sect2"><a href="options.html#id2567171">Miscellaneous</a></span></dt><dt><span class="sect2"><a href="options.html#shortcuts">Configuring Keyboard-Shortcuts</a></span></dt></dl></dd><dt><span class="sect1"><a href="preprocessors.html">Preprocessor Commands</a></span></dt><dd><dl><dt><span class="sect2"><a href="preprocessors.html#sedbasics"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> Basics</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#sedforkdiff3">Examples For <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span>-Use In <span class="application">KDiff3</span></a></span></dt><dt><span class="sect2"><a href="preprocessors.html#id2567900">Order Of Preprocessor Execution</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#id2567963">Warning</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="dirmerge.html">3. Directory Comparison and Merge with <span class="application">KDiff3</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="dirmerge.html#dirmergeintro">Introduction into Directory Comparison and Merge</a></span></dt><dt><span class="sect1"><a href="startingdirmerge.html">Starting Directory Comparison Or Merge</a></span></dt><dd><dl><dt><span class="sect2"><a href="startingdirmerge.html#id2568158">Compare/Merge two directories: </a></span></dt><dt><span class="sect2"><a href="startingdirmerge.html#id2568202">Compare/Merge three directories: </a></span></dt></dl></dd><dt><span class="sect1"><a href="dirmergevisible.html">Directory Merge Visible Information</a></span></dt><dd><dl><dt><span class="sect2"><a href="dirmergevisible.html#name">The Name Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#coloring">The Columns A/B/C and the Coloring Scheme</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#operation">The Operation Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#status">The Status Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#statisticscolulmns">Statistics Columns</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#selectingvisiblefiles">Selecting Listed Files</a></span></dt></dl></dd><dt><span class="sect1"><a href="dothemerge.html">Doing A Directory Merge</a></span></dt><dt><span class="sect1"><a href="dirmergeoptions.html">Options for Comparing and Merging Directories</a></span></dt><dt><span class="sect1"><a href="other.html">Other Functions in Directory Merge Window</a></span></dt><dd><dl><dt><span class="sect2"><a href="other.html#id2569323">Split/Full Screen Mode</a></span></dt><dt><span class="sect2"><a href="other.html#id2569341">Comparing or Merging a Single File</a></span></dt><dt><span class="sect2"><a href="other.html#id2569364">Comparing or Merging Files with Different Names</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="misc.html">4. Miscellaneous Topics</a></span></dt><dd><dl><dt><span class="sect1"><a href="misc.html#networktransparency">Networktransparency via TDEIO</a></span></dt><dd><dl><dt><span class="sect2"><a href="misc.html#id2569419">TDEIO-Slaves</a></span></dt><dt><span class="sect2"><a href="misc.html#id2569517">How To Write URLs</a></span></dt><dt><span class="sect2"><a href="misc.html#id2569553">Capabilities of TDEIO-Slaves</a></span></dt></dl></dd><dt><span class="sect1"><a href="kpart.html">Using <span class="application">KDiff3</span> as a KPart</a></span></dt></dl></dd><dt><span class="chapter"><a href="faq.html">5. Questions and Answers</a></span></dt><dt><span class="chapter"><a href="credits.html">6. Credits and License</a></span></dt><dt><span class="appendix"><a href="installation.html">A. Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="installation.html#getting-kdiff3">How to obtain <span class="application">KDiff3</span></a></span></dt><dt><span class="sect1"><a href="requirements.html">Requirements</a></span></dt><dt><span class="sect1"><a href="compilation.html">Compilation and Installation</a></span></dt></dl></dd></dl></div></div><div style="background-color: #white; color: black; margin-top: 20px; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="introduction.html">Next</a></div><div align="center"> </div></div><div style="background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div class="navLeft"> </div><div class="navRight"> Introduction</div><div class="navCenter"> </div></div><br><br><div class="bannerBottom" style="background-image: url(help:/common/bottom-middle.png); background-repeat: x-repeat; width: 100%; height: 100px; bottom:0px;"><div class="BannerBottomRight"><img src="help:/common/bottom-right.png" style="margin: 0px" alt=""></div><div class="bannerBottomLeft"><img src="help:/common/bottom-left.png" style="margin: 0px;" alt=""></div><div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #cfe1f6"><p>Would you like to make a comment or contribute an update to this page?<br> Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>
\ No newline at end of file diff --git a/doc/en/installation.html b/doc/en/installation.html index f0e4823..03ae311 100644 --- a/doc/en/installation.html +++ b/doc/en/installation.html @@ -1,4 +1,4 @@ -<html><head><title>Appendix A. Installation</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="credits.html" title="Chapter 6. Credits and License"><link rel="next" href="requirements.html" title="Requirements"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Installation</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="credits.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="requirements.html">Next</a></div><div class="navCenter"> </div></div><div class="appendix" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="installation"></a>Appendix A. Installation</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="installation.html#getting-kdiff3">How to obtain <span class="application">KDiff3</span></a></span></dt><dt><span class="sect1"><a href="requirements.html">Requirements</a></span></dt><dt><span class="sect1"><a href="compilation.html">Compilation and Installation</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="getting-kdiff3"></a>How to obtain <span class="application">KDiff3</span></h2></div></div></div><p> +<html><head><title>Appendix A. Installation</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="credits.html" title="Chapter 6. Credits and License"><link rel="next" href="requirements.html" title="Requirements"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Installation</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="credits.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="requirements.html">Next</a></div><div class="navCenter"> </div></div><div class="appendix" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="installation"></a>Appendix A. Installation</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="installation.html#getting-kdiff3">How to obtain <span class="application">KDiff3</span></a></span></dt><dt><span class="sect1"><a href="requirements.html">Requirements</a></span></dt><dt><span class="sect1"><a href="compilation.html">Compilation and Installation</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="getting-kdiff3"></a>How to obtain <span class="application">KDiff3</span></h2></div></div></div><p> You can download the latest version of <span class="application">KDiff3</span> from its homepage <a href="http://kdiff3.sourceforge.net" target="_top">http://kdiff3.sourceforge.net</a>. </p><p> <span class="application">KDiff3</span> is also available for other platforms. See the homepage for details. diff --git a/doc/en/interpretinginformation.html b/doc/en/interpretinginformation.html index e33035b..3cf531e 100644 --- a/doc/en/interpretinginformation.html +++ b/doc/en/interpretinginformation.html @@ -1,4 +1,4 @@ -<html><head><title>Comparing Files And Interpreting The Information In The Input Windows</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="pasteinput.html" title="Paste and Drop Input"><link rel="next" href="merging.html" title="Merging And The Merge Output Editor Window"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Comparing Files And Interpreting The Information In The Input Windows</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="pasteinput.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="merging.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="interpretinginformation"></a>Comparing Files And Interpreting The Information In The Input Windows</h2></div></div></div><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_diff.png"><hr></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2564410"></a>Info Line</h3></div></div></div><p> +<html><head><title>Comparing Files And Interpreting The Information In The Input Windows</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="pasteinput.html" title="Paste and Drop Input"><link rel="next" href="merging.html" title="Merging And The Merge Output Editor Window"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Comparing Files And Interpreting The Information In The Input Windows</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="pasteinput.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="merging.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="interpretinginformation"></a>Comparing Files And Interpreting The Information In The Input Windows</h2></div></div></div><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_diff.png"><hr></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2564410"></a>Info Line</h3></div></div></div><p> At the top of each text window is its "info line". The info lines of the input windows contain a letter "A", "B" or "C", the editable filename, a button for browsing, and the line number of the first visible line in the window. diff --git a/doc/en/introduction.html b/doc/en/introduction.html index f766dc1..8a2b5e9 100644 --- a/doc/en/introduction.html +++ b/doc/en/introduction.html @@ -1,4 +1,4 @@ -<html><head><title>Chapter 1. Introduction</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="index.html" title="The KDiff3 Handbook"><link rel="next" href="screenshots.html" title="Screenshots and Features"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Introduction</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="index.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="screenshots.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="introduction"></a>Chapter 1. Introduction</h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="why"></a>Yet Another Diff Frontend?</h2></div></div></div><p> +<html><head><title>Chapter 1. Introduction</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="index.html" title="The KDiff3 Handbook"><link rel="next" href="screenshots.html" title="Screenshots and Features"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Introduction</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="index.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="screenshots.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="introduction"></a>Chapter 1. Introduction</h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="why"></a>Yet Another Diff Frontend?</h2></div></div></div><p> Several graphical diff tools exist. Why choose <span class="application">KDiff3</span>? Let me say, why I wrote it. </p><p> <span class="application">KDiff3</span> started because I had to do a difficult merge. Merging is necessary when several diff --git a/doc/en/kdiff3.1 b/doc/en/kdiff3.1 index 3b9c492..6f2d26b 100644 --- a/doc/en/kdiff3.1 +++ b/doc/en/kdiff3.1 @@ -27,7 +27,7 @@ an integrated editor for comfortable solving of merge-conflicts .IP " \(bu" 6 supports Unicode, UTF-8 and other codecs .IP " \(bu" 6 -supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.) +supports TDEIO on KDE (allows accessing ftp, sftp, fish, smb etc.) .IP " \(bu" 6 Printing of differences .IP " \(bu" 6 diff --git a/doc/en/kpart.html b/doc/en/kpart.html index 92d1f65..685897c 100644 --- a/doc/en/kpart.html +++ b/doc/en/kpart.html @@ -1,4 +1,4 @@ -<html><head><title>Using KDiff3 as a KPart</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="misc.html" title="Chapter 4. Miscellaneous Topics"><link rel="prev" href="misc.html" title="Chapter 4. Miscellaneous Topics"><link rel="next" href="faq.html" title="Chapter 5. Questions and Answers"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Using <span class="application">KDiff3</span> as a KPart</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="misc.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="faq.html">Next</a></div><div class="navCenter">Miscellaneous Topics</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="kpart"></a>Using <span class="application">KDiff3</span> as a KPart</h2></div></div></div><p> +<html><head><title>Using KDiff3 as a KPart</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="misc.html" title="Chapter 4. Miscellaneous Topics"><link rel="prev" href="misc.html" title="Chapter 4. Miscellaneous Topics"><link rel="next" href="faq.html" title="Chapter 5. Questions and Answers"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Using <span class="application">KDiff3</span> as a KPart</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="misc.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="faq.html">Next</a></div><div class="navCenter">Miscellaneous Topics</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="kpart"></a>Using <span class="application">KDiff3</span> as a KPart</h2></div></div></div><p> <span class="application">KDiff3</span> is a KPart. Currently it implements the KParts::ReadOnlyPart-interface. </p><p> It's main use is as difference-viewer in KDevelop. KDevelop always starts the diff --git a/doc/en/merging.html b/doc/en/merging.html index 712d9b1..fab4a3b 100644 --- a/doc/en/merging.html +++ b/doc/en/merging.html @@ -1,4 +1,4 @@ -<html><head><title>Merging And The Merge Output Editor Window</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="interpretinginformation.html" title="Comparing Files And Interpreting The Information In The Input Windows"><link rel="next" href="navigation.html" title="Navigation And Editing"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Merging And The Merge Output Editor Window</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="interpretinginformation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="navigation.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging"></a>Merging And The Merge Output Editor Window</h2></div></div></div><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_merge.png"><hr></div></div><p> +<html><head><title>Merging And The Merge Output Editor Window</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="interpretinginformation.html" title="Comparing Files And Interpreting The Information In The Input Windows"><link rel="next" href="navigation.html" title="Navigation And Editing"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Merging And The Merge Output Editor Window</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="interpretinginformation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="navigation.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging"></a>Merging And The Merge Output Editor Window</h2></div></div></div><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_merge.png"><hr></div></div><p> The merge output editor window (below the diff input windows) also has an info line at the top showing "Output:", the filename and "[Modified]" if you edited something. Usually it will contain some text through the automatic merge facilities, but often it will also diff --git a/doc/en/misc.html b/doc/en/misc.html index 7aa1fb5..2b315ee 100644 --- a/doc/en/misc.html +++ b/doc/en/misc.html @@ -1,5 +1,5 @@ -<html><head><title>Chapter 4. Miscellaneous Topics</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="other.html" title="Other Functions in Directory Merge Window"><link rel="next" href="kpart.html" title="Using KDiff3 as a KPart"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Miscellaneous Topics</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="other.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="kpart.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="misc"></a>Chapter 4. Miscellaneous Topics</h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="networktransparency"></a>Networktransparency via KIO</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569419"></a>KIO-Slaves</h3></div></div></div><p> -KDE supports networktransparency via KIO-slaves. <span class="application">KDiff3</span> uses this +<html><head><title>Chapter 4. Miscellaneous Topics</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="other.html" title="Other Functions in Directory Merge Window"><link rel="next" href="kpart.html" title="Using KDiff3 as a KPart"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Miscellaneous Topics</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="other.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="kpart.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="misc"></a>Chapter 4. Miscellaneous Topics</h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="networktransparency"></a>Networktransparency via TDEIO</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569419"></a>TDEIO-Slaves</h3></div></div></div><p> +KDE supports networktransparency via TDEIO-slaves. <span class="application">KDiff3</span> uses this for reading input files and for scanning directories. This means that you can specify files and directories on local and remote resources via URLs. @@ -13,7 +13,7 @@ Example: </p><p>The first line compares a local file with a file on an FTP-server. The second line compares a directory within an compressed archive with a local directory. </p><p> -Other KIO-slaves that are interesting are: +Other TDEIO-slaves that are interesting are: </p><div class="itemizedlist"><ul type="disc"><li><p>Files from the WWW (http:),</p></li><li><p>Files from the FTP (ftp:),</p></li><li><p>Encrypted file transfer (fish:, sftp:),</p></li><li><p>Windows-ressources (smb:),</p></li><li><p>Local files (file:),</p></li></ul></div><p> Other things that are possible, but probably less useful are: </p><div class="itemizedlist"><ul type="disc"><li><p>Man-pages (man:),</p></li><li><p>Info-pages (info:),</p></li></ul></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569517"></a>How To Write URLs</h3></div></div></div><p> @@ -27,7 +27,7 @@ Other things that are possible, but probably less useful are: E.g. A file with the name "/#foo#" would have the URL "file:/%23foo%23". </p></li><li><p> When URLs don't work as expected, try to open them in Konqueror first. -</p></li></ul></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569553"></a>Capabilities of KIO-Slaves</h3></div></div></div><p> +</p></li></ul></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569553"></a>Capabilities of TDEIO-Slaves</h3></div></div></div><p> Networktransparency has one drawback: Not all ressources have the same cababilities. </p><p> Sometimes this is due to the file system of the server, sometimes due to the protocol. diff --git a/doc/en/navigation.html b/doc/en/navigation.html index e1810d1..0235f7f 100644 --- a/doc/en/navigation.html +++ b/doc/en/navigation.html @@ -1,4 +1,4 @@ -<html><head><title>Navigation And Editing</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="merging.html" title="Merging And The Merge Output Editor Window"><link rel="next" href="selections.html" title="Select, Copy And Paste"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Navigation And Editing</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="merging.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="selections.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="navigation"></a>Navigation And Editing</h2></div></div></div><p> +<html><head><title>Navigation And Editing</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="merging.html" title="Merging And The Merge Output Editor Window"><link rel="next" href="selections.html" title="Select, Copy And Paste"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Navigation And Editing</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="merging.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="selections.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="navigation"></a>Navigation And Editing</h2></div></div></div><p> Much navigation will be done with the scroll bars and the mouse but you can also navigate with the keys. If you click into either window then you can use the cursor buttons left, right, up, down, page up, page down, diff --git a/doc/en/opendialog.html b/doc/en/opendialog.html index 7ea7588..61e3838 100644 --- a/doc/en/opendialog.html +++ b/doc/en/opendialog.html @@ -1,4 +1,4 @@ -<html><head><title>Open-Dialog</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="next" href="pasteinput.html" title="Paste and Drop Input"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Open-Dialog</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="documentation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="pasteinput.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="opendialog"></a>Open-Dialog</h2></div></div></div><p> +<html><head><title>Open-Dialog</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="next" href="pasteinput.html" title="Paste and Drop Input"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Open-Dialog</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="documentation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="pasteinput.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="opendialog"></a>Open-Dialog</h2></div></div></div><p> Since many input files must be selectable, the program has a special open dialog: </p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="open_dialog.png"><hr></div></div><p> The open dialog allows to edit the filenames by hand, selecting a file diff --git a/doc/en/options.html b/doc/en/options.html index 5c74e13..474af7f 100644 --- a/doc/en/options.html +++ b/doc/en/options.html @@ -1,4 +1,4 @@ -<html><head><title>Options</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="printing.html" title="Printing"><link rel="next" href="preprocessors.html" title="Preprocessor Commands"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Options</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="printing.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="preprocessors.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="options"></a>Options</h2></div></div></div><p> +<html><head><title>Options</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="printing.html" title="Printing"><link rel="next" href="preprocessors.html" title="Preprocessor Commands"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Options</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="printing.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="preprocessors.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="options"></a>Options</h2></div></div></div><p> Options and the recent-file-list will be saved when you exit the program, and reloaded when you start it. (Menu Settings->Configure <span class="application">KDiff3</span> ...) </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2566321"></a>Font</h3></div></div></div><p> diff --git a/doc/en/other.html b/doc/en/other.html index 84b9b10..76703ce 100644 --- a/doc/en/other.html +++ b/doc/en/other.html @@ -1,4 +1,4 @@ -<html><head><title>Other Functions in Directory Merge Window</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dirmergeoptions.html" title="Options for Comparing and Merging Directories"><link rel="next" href="misc.html" title="Chapter 4. Miscellaneous Topics"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Other Functions in Directory Merge Window</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="dirmergeoptions.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="misc.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="other"></a>Other Functions in Directory Merge Window</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569323"></a>Split/Full Screen Mode</h3></div></div></div><p> +<html><head><title>Other Functions in Directory Merge Window</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dirmergeoptions.html" title="Options for Comparing and Merging Directories"><link rel="next" href="misc.html" title="Chapter 4. Miscellaneous Topics"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Other Functions in Directory Merge Window</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="dirmergeoptions.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="misc.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="other"></a>Other Functions in Directory Merge Window</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569323"></a>Split/Full Screen Mode</h3></div></div></div><p> Usually the directory merge list view remains visible while a single file is compared or merged. With the mouse you can move the the splitter bar that separates the file list from the text-diff windows. If you don't want this, diff --git a/doc/en/pasteinput.html b/doc/en/pasteinput.html index 98a9109..8c0a0d2 100644 --- a/doc/en/pasteinput.html +++ b/doc/en/pasteinput.html @@ -1,4 +1,4 @@ -<html><head><title>Paste and Drop Input</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="opendialog.html" title="Open-Dialog"><link rel="next" href="interpretinginformation.html" title="Comparing Files And Interpreting The Information In The Input Windows"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Paste and Drop Input</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="opendialog.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="interpretinginformation.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="pasteinput"></a>Paste and Drop Input</h2></div></div></div><p> +<html><head><title>Paste and Drop Input</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="opendialog.html" title="Open-Dialog"><link rel="next" href="interpretinginformation.html" title="Comparing Files And Interpreting The Information In The Input Windows"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Paste and Drop Input</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="opendialog.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="interpretinginformation.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="pasteinput"></a>Paste and Drop Input</h2></div></div></div><p> Sometimes you want to compare parts of a text that is not an own file. <span class="application">KDiff3</span> also allows you to paste text from the clipboard into the diff input window that has the focus. The diff analysis happens immediately then. diff --git a/doc/en/preprocessors.html b/doc/en/preprocessors.html index 0bea10b..fb8214e 100644 --- a/doc/en/preprocessors.html +++ b/doc/en/preprocessors.html @@ -1,4 +1,4 @@ -<html><head><title>Preprocessor Commands</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="options.html" title="Options"><link rel="next" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Preprocessor Commands</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="options.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmerge.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="preprocessors"></a>Preprocessor Commands</h2></div></div></div><p> +<html><head><title>Preprocessor Commands</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="options.html" title="Options"><link rel="next" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Preprocessor Commands</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="options.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmerge.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="preprocessors"></a>Preprocessor Commands</h2></div></div></div><p> <span class="application">KDiff3</span> supports two preprocessor options. </p><p> <div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Preprocessor-Command:</em></span></span></dt><dd><p> diff --git a/doc/en/printing.html b/doc/en/printing.html index a541345..04596ff 100644 --- a/doc/en/printing.html +++ b/doc/en/printing.html @@ -1,4 +1,4 @@ -<html><head><title>Printing</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="find.html" title="Finding Strings"><link rel="next" href="options.html" title="Options"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Printing</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="find.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="options.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="printing"></a>Printing</h2></div></div></div><p> +<html><head><title>Printing</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="find.html" title="Finding Strings"><link rel="next" href="options.html" title="Options"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Printing</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="find.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="options.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="printing"></a>Printing</h2></div></div></div><p> <span class="application">KDiff3</span> supports printing for textfile differences. The "Print..."-command (Ctrl-P) in the File-menu opens a dialog that allows you to select the printer and to adjust other options. diff --git a/doc/en/requirements.html b/doc/en/requirements.html index 1c4c7f0..c556889 100644 --- a/doc/en/requirements.html +++ b/doc/en/requirements.html @@ -1,4 +1,4 @@ -<html><head><title>Requirements</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="prev" href="installation.html" title="Appendix A. Installation"><link rel="next" href="compilation.html" title="Compilation and Installation"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Requirements</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="installation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="compilation.html">Next</a></div><div class="navCenter">Installation</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="requirements"></a>Requirements</h2></div></div></div><p> +<html><head><title>Requirements</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="prev" href="installation.html" title="Appendix A. Installation"><link rel="next" href="compilation.html" title="Compilation and Installation"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Requirements</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="installation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="compilation.html">Next</a></div><div class="navCenter">Installation</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="requirements"></a>Requirements</h2></div></div></div><p> In order to successfully use all features of <span class="application">KDiff3</span>, you need <span class="acronym">KDE</span> >3.1. </p><p> For information about how to run <span class="application">KDiff3</span> on other platforms without KDE please see the diff --git a/doc/en/saving.html b/doc/en/saving.html index 87e9a99..3d648fd 100644 --- a/doc/en/saving.html +++ b/doc/en/saving.html @@ -1,4 +1,4 @@ -<html><head><title>Saving</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="selections.html" title="Select, Copy And Paste"><link rel="next" href="find.html" title="Finding Strings"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Saving</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="selections.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="find.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="saving"></a>Saving</h2></div></div></div><p> +<html><head><title>Saving</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="selections.html" title="Select, Copy And Paste"><link rel="next" href="find.html" title="Finding Strings"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Saving</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="selections.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="find.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="saving"></a>Saving</h2></div></div></div><p> Saving will only be allowed, when all conflicts were solved. If the file already exists and the "Backup files"-option is enabled then the existing file will be renamed with an ".orig"-extension, but if such a file exists diff --git a/doc/en/screenshots.html b/doc/en/screenshots.html index a63712d..23fdf40 100644 --- a/doc/en/screenshots.html +++ b/doc/en/screenshots.html @@ -1,4 +1,4 @@ -<html><head><title>Screenshots and Features</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="introduction.html" title="Chapter 1. Introduction"><link rel="prev" href="introduction.html" title="Chapter 1. Introduction"><link rel="next" href="features.html" title="More Features"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Screenshots and Features</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="introduction.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="features.html">Next</a></div><div class="navCenter">Introduction</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="screenshots"></a>Screenshots and Features</h2></div></div></div><p>This screenshot shows the difference between two text files</p><p>(Using an early version of <span class="application">KDiff3</span>):</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_diff.png"><hr></div></div><p> +<html><head><title>Screenshots and Features</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="introduction.html" title="Chapter 1. Introduction"><link rel="prev" href="introduction.html" title="Chapter 1. Introduction"><link rel="next" href="features.html" title="More Features"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Screenshots and Features</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="introduction.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="features.html">Next</a></div><div class="navCenter">Introduction</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="screenshots"></a>Screenshots and Features</h2></div></div></div><p>This screenshot shows the difference between two text files</p><p>(Using an early version of <span class="application">KDiff3</span>):</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_diff.png"><hr></div></div><p> 3-way-merging is fully supported. This is useful if two people change code independently. The original file (the base) is used to help <span class="application">KDiff3</span> to automatically select the correct changes. diff --git a/doc/en/selections.html b/doc/en/selections.html index 58dc620..06c456d 100644 --- a/doc/en/selections.html +++ b/doc/en/selections.html @@ -1,4 +1,4 @@ -<html><head><title>Select, Copy And Paste</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="navigation.html" title="Navigation And Editing"><link rel="next" href="saving.html" title="Saving"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Select, Copy And Paste</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="navigation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="saving.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="selections"></a>Select, Copy And Paste</h2></div></div></div><p> +<html><head><title>Select, Copy And Paste</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="navigation.html" title="Navigation And Editing"><link rel="next" href="saving.html" title="Saving"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Select, Copy And Paste</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="navigation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="saving.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="selections"></a>Select, Copy And Paste</h2></div></div></div><p> The input windows don't show a cursor, so selections must be made with the mouse by clicking with the left mouse button at the start, holding down the mousebutton and moving to the end, where you release the mouse diff --git a/doc/en/startingdirmerge.html b/doc/en/startingdirmerge.html index 6029dc5..fc5e84f 100644 --- a/doc/en/startingdirmerge.html +++ b/doc/en/startingdirmerge.html @@ -1,4 +1,4 @@ -<html><head><title>Starting Directory Comparison Or Merge</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="next" href="dirmergevisible.html" title="Directory Merge Visible Information"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Starting Directory Comparison Or Merge</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="dirmerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmergevisible.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="startingdirmerge"></a>Starting Directory Comparison Or Merge</h2></div></div></div><p> +<html><head><title>Starting Directory Comparison Or Merge</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="next" href="dirmergevisible.html" title="Directory Merge Visible Information"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Starting Directory Comparison Or Merge</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="dirmerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmergevisible.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="startingdirmerge"></a>Starting Directory Comparison Or Merge</h2></div></div></div><p> This is very similar to the single file merge and comparison. You just have to specify directories on the command line or in the file-open dialog. |