Compilation and Installation

In order to compile and install KDiff3 on a system with KDE, type the +Compilation and Installation
Installation
Compilation and Installation

In order to compile and install KDiff3 on a system with KDE, type the following in the base directory of the KDiff3 distribution:
% ./configure --prefix=kde-dir
 % make
 % make install
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 @@
-Chapter 6. Credits and License
Credits and License
Prev
Next
 
Chapter 6. Credits and License

+Chapter 6. Credits and License
Credits and License
Prev
Next
 
Chapter 6. Credits and License

 KDiff3 - File and Directory Comparison and Merge Tool
 

 Program copyright 2002-2007 Joachim Eibl (joachim.eibl at gmx.de)
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 @@
-Chapter 3. Directory Comparison and Merge with KDiff3
Directory Comparison and Merge with KDiff3
Prev
Next
 
Chapter 3. Directory Comparison and Merge with KDiff3
Introduction into Directory Comparison and Merge

+Chapter 3. Directory Comparison and Merge with KDiff3
Directory Comparison and Merge with KDiff3
Prev
Next
 
Chapter 3. Directory Comparison and Merge with KDiff3
Introduction into Directory Comparison and Merge

    Often programmers must modify many files in a directory to achieve their
    purpose. For this KDiff3 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 @@
-Options for Comparing and Merging Directories
Options for Comparing and Merging Directories
Prev
Next
Directory Comparison and Merge with KDiff3
Options for Comparing and Merging Directories

+Options for Comparing and Merging Directories
Options for Comparing and Merging Directories
Prev
Next
Directory Comparison and Merge with KDiff3
Options for Comparing and Merging Directories

    The KDiff3-preferences (menu "Settings"->"Configure KDiff3") has
    a section called "Directory Merge" with these options:
 
Recursive Directories:
 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 @@
-Directory Merge Visible Information
Directory Merge Visible Information
Prev
Next
Directory Comparison and Merge with KDiff3
Directory Merge Visible Information

+Directory Merge Visible Information
Directory Merge Visible Information
Prev
Next
Directory Comparison and Merge with KDiff3
Directory Merge Visible Information

    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 @@
-Chapter 2. File Comparison And Merge
File Comparison And Merge
Prev
Next
 
Chapter 2. File Comparison And Merge
Command-Line Options
Comparing 2 files: 
+Chapter 2. File Comparison And Merge
File Comparison And Merge
Prev
Next
 
Chapter 2. File Comparison And Merge
Command-Line Options
Comparing 2 files: 
    kdiff3 file1 file2
 
Merging 2 files: 
    kdiff3 file1 file2 -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 @@
-Doing A Directory Merge
Doing A Directory Merge
Prev
Next
Directory Comparison and Merge with KDiff3
Doing A Directory Merge

+Doing A Directory Merge
Doing A Directory Merge
Prev
Next
Directory Comparison and Merge with KDiff3
Doing A Directory Merge

    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 @@
-Chapter 5. Questions and Answers
Questions and Answers
Prev
Next
 
Chapter 5. Questions and Answers
This document may have been updated since your installation.
+Chapter 5. Questions and Answers
Questions and Answers
Prev
Next
 
Chapter 5. Questions and Answers
This document may have been updated since your installation.
 You can find the latest version at http://docs.kde.org/development/en/extragear-utils/.
5.1. 
    Why is it called "KDiff3"?
 
5.2. 
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 @@
-More Features
More FeaturesPrev
Next
Introduction
More Features
 Line-By-Line And Char-By-Char Diff-Viewer
By using the possiblities of a graphical color display KDiff3 shows
+More Features
More Features
Prev
Next
Introduction
More Features
 Line-By-Line And Char-By-Char Diff-Viewer
By using the possiblities of a graphical color display KDiff3 shows
    exactly what the difference is. When you have to do many code-reviews, you will like this.
 
 See White-Space Differences At One Glance
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.
-
And ...
Fast navigation via buttons.
A mouse-click into a summary column sync's all windows to show the same position.
Select and copy from any window and paste into the merge result window.
Overview column that shows where the changes and conflicts are.
The colors are adjustable to your specific preferences.
Adjustable Tab size.
Option to insert spaces instead of tabs.
Open files comfortably via dialog or specify files on the command line.
Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)
Show the line numbers for each line. 
Paste clipboard or drag text into a diff input window.
Networktransparency via KIO.
Can be used as diff-viewer in KDevelop 3.
Word-wrap for long lines.
Support for Unicode, UTF-8 and other codecs.
Support for right to left languages.
...
Prev
Next
Home
Screenshots and Features 
 File Comparison And Merge
Up


Would you like to make a comment or contribute an update to this page?

+
And ...
Fast navigation via buttons.
A mouse-click into a summary column sync's all windows to show the same position.
Select and copy from any window and paste into the merge result window.
Overview column that shows where the changes and conflicts are.
The colors are adjustable to your specific preferences.
Adjustable Tab size.
Option to insert spaces instead of tabs.
Open files comfortably via dialog or specify files on the command line.
Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)
Show the line numbers for each line. 
Paste clipboard or drag text into a diff input window.
Networktransparency via TDEIO.
Can be used as diff-viewer in KDevelop 3.
Word-wrap for long lines.
Support for Unicode, UTF-8 and other codecs.
Support for right to left languages.
...
Prev
Next
Home
Screenshots and Features 
 File Comparison And Merge
Up


Would you like to make a comment or contribute an update to this page?

         Send feedback to the KDE Docs Team
\ 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 @@
-Finding Strings
Finding Strings
Prev
Next
File Comparison And Merge
Finding Strings

+Finding Strings
Finding Strings
Prev
Next
File Comparison And Merge
Finding Strings

    You can search for a string in any text-window of KDiff3. 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. -->
 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,
+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,
@@ -87,7 +87,7 @@ Please at least include KDE, the KDE package it is in, the name
 in-line-differences
 synchronise
 kpart
-kio
+tdeio
 networktransparent
 editor
 white space
@@ -219,7 +219,7 @@ This screenshot shows &kdiff3; during a directory merge:
    Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)
    Show the line numbers for each line. 
    Paste clipboard or drag text into a diff input window.
-   Networktransparency via KIO.
+   Networktransparency via TDEIO.
    Can be used as diff-viewer in KDevelop 3.
    Word-wrap for long lines.
    Support for Unicode, UTF-8 and other codecs.
@@ -1795,10 +1795,10 @@ So this is what this program can do for you: &kdiff3; ...
 
 Miscellaneous Topics
 
-Networktransparency via KIO
-KIO-Slaves
+Networktransparency via TDEIO
+TDEIO-Slaves
 
-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:
 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.
 
-Other KIO-slaves that are interesting are:
+Other TDEIO-slaves that are interesting are:
 
 
 Files from the WWW (http:),
@@ -1850,7 +1850,7 @@ Other things that are possible, but probably less useful are:
 
 
 
-Capabilities of KIO-Slaves
+Capabilities of TDEIO-Slaves
 
    Networktransparency has one drawback: Not all ressources have the same cababilities.
 
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 @@
 The KDiff3 Handbook
The KDiff3 Handbook
Next
 
The KDiff3 Handbook
Joachim Eibl <joachim.eibl at gmx.de>
Revision 0.9.92 (2007-31-03)
Copyright © 2002-2007 Joachim Eibl
Permission is granted to copy, distribute and/or modify this
+">
The KDiff3 Handbook
Next
 
The KDiff3 Handbook
Joachim Eibl <joachim.eibl at gmx.de>
Revision 0.9.92 (2007-31-03)
Copyright © 2002-2007 Joachim Eibl
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 the section entitled "GNU Free Documentation License".

    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.
-
Table of Contents
1. Introduction
Yet Another Diff Frontend?
Screenshots and Features
More Features
 Line-By-Line And Char-By-Char Diff-Viewer
 See White-Space Differences At One Glance
 Triple-Diff
 Comfortable Merge Of Two Or Three Input Files
And ...
2. File Comparison And Merge
Command-Line Options
Comparing 2 files: 
Merging 2 files: 
Comparing 3 files: 
Merging 3 files: 
Special case: Files with the same name 
Commandline for starting a directory comparison or merge: 
Other command line options
Ignorable command line options
Open-Dialog
Paste and Drop Input
Comparing Files And Interpreting The Information In The Input Windows
Info Line
Coloring
Summary Column
Overview Column
Manually Aligning Lines
Manually Joining and Splitting Diff Sections
Merging And The Merge Output Editor Window
The Summary Column
Setting The Current Group And Synchronising Merge And Diff View Position
Choosing Inputs A, B or C For Current Conflict And Editing
Choosing Input A, B, or C for All Conflicts
Automatic Merge of Version Control Keywords and History (Log)
Navigation And Editing
Auto-Advance
Select, Copy And Paste
Saving
Finding Strings
Printing
Options
Font
Colors
Editor Settings
Diff Settings
Merge Settings
Directory Merge
Regional and Language Options
Miscellaneous
Configuring Keyboard-Shortcuts
Preprocessor Commands
sed Basics
Examples For sed-Use In KDiff3
Order Of Preprocessor Execution
Warning
3. Directory Comparison and Merge with KDiff3
Introduction into Directory Comparison and Merge
Starting Directory Comparison Or Merge
Compare/Merge two directories: 
Compare/Merge three directories: 
Directory Merge Visible Information
The Name Column
The Columns A/B/C and the Coloring Scheme
The Operation Column
The Status Column
Statistics Columns
Selecting Listed Files
Doing A Directory Merge
Options for Comparing and Merging Directories
Other Functions in Directory Merge Window
Split/Full Screen Mode
Comparing or Merging a Single File
Comparing or Merging Files with Different Names
4. Miscellaneous Topics
Networktransparency via KIO
KIO-Slaves
How To Write URLs
Capabilities of KIO-Slaves
Using KDiff3 as a KPart
5. Questions and Answers
6. Credits and License
A. Installation
How to obtain KDiff3
Requirements
Compilation and Installation
Next
 
 
 Introduction
 


Would you like to make a comment or contribute an update to this page?

+
Table of Contents
1. Introduction
Yet Another Diff Frontend?
Screenshots and Features
More Features
 Line-By-Line And Char-By-Char Diff-Viewer
 See White-Space Differences At One Glance
 Triple-Diff
 Comfortable Merge Of Two Or Three Input Files
And ...
2. File Comparison And Merge
Command-Line Options
Comparing 2 files: 
Merging 2 files: 
Comparing 3 files: 
Merging 3 files: 
Special case: Files with the same name 
Commandline for starting a directory comparison or merge: 
Other command line options
Ignorable command line options
Open-Dialog
Paste and Drop Input
Comparing Files And Interpreting The Information In The Input Windows
Info Line
Coloring
Summary Column
Overview Column
Manually Aligning Lines
Manually Joining and Splitting Diff Sections
Merging And The Merge Output Editor Window
The Summary Column
Setting The Current Group And Synchronising Merge And Diff View Position
Choosing Inputs A, B or C For Current Conflict And Editing
Choosing Input A, B, or C for All Conflicts
Automatic Merge of Version Control Keywords and History (Log)
Navigation And Editing
Auto-Advance
Select, Copy And Paste
Saving
Finding Strings
Printing
Options
Font
Colors
Editor Settings
Diff Settings
Merge Settings
Directory Merge
Regional and Language Options
Miscellaneous
Configuring Keyboard-Shortcuts
Preprocessor Commands
sed Basics
Examples For sed-Use In KDiff3
Order Of Preprocessor Execution
Warning
3. Directory Comparison and Merge with KDiff3
Introduction into Directory Comparison and Merge
Starting Directory Comparison Or Merge
Compare/Merge two directories: 
Compare/Merge three directories: 
Directory Merge Visible Information
The Name Column
The Columns A/B/C and the Coloring Scheme
The Operation Column
The Status Column
Statistics Columns
Selecting Listed Files
Doing A Directory Merge
Options for Comparing and Merging Directories
Other Functions in Directory Merge Window
Split/Full Screen Mode
Comparing or Merging a Single File
Comparing or Merging Files with Different Names
4. Miscellaneous Topics
Networktransparency via TDEIO
TDEIO-Slaves
How To Write URLs
Capabilities of TDEIO-Slaves
Using KDiff3 as a KPart
5. Questions and Answers
6. Credits and License
A. Installation
How to obtain KDiff3
Requirements
Compilation and Installation
Next
 
 
 Introduction
 


Would you like to make a comment or contribute an update to this page?

         Send feedback to the KDE Docs Team
\ 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 @@
-Appendix A. Installation
Installation
Prev
Next
 
Appendix A. Installation
Table of Contents
How to obtain KDiff3
Requirements
Compilation and Installation
How to obtain KDiff3

+Appendix A. Installation
Installation
Prev
Next
 
Appendix A. Installation
Table of Contents
How to obtain KDiff3
Requirements
Compilation and Installation
How to obtain KDiff3

 You can download the latest version of KDiff3 from its homepage http://kdiff3.sourceforge.net.
 

 KDiff3 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 @@
-Comparing Files And Interpreting The Information In The Input Windows
Comparing Files And Interpreting The Information In The Input Windows
Prev
Next
File Comparison And Merge
Comparing Files And Interpreting The Information In The Input Windows
Info Line

+Comparing Files And Interpreting The Information In The Input Windows
Comparing Files And Interpreting The Information In The Input Windows
Prev
Next
File Comparison And Merge
Comparing Files And Interpreting The Information In The Input Windows
Info Line

    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 @@
-Chapter 1. Introduction
Introduction
Prev
Next
 
Chapter 1. Introduction
Yet Another Diff Frontend?

+Chapter 1. Introduction
Introduction
Prev
Next
 
Chapter 1. Introduction
Yet Another Diff Frontend?

 Several graphical diff tools exist. Why choose KDiff3? Let me say, why I wrote it.
 

 KDiff3 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 @@
-Using KDiff3 as a KPart
Using KDiff3 as a KPart
Prev
Next
Miscellaneous Topics
Using KDiff3 as a KPart

+Using KDiff3 as a KPart
Using KDiff3 as a KPart
Prev
Next
Miscellaneous Topics
Using KDiff3 as a KPart

 KDiff3 is a KPart. Currently it implements the KParts::ReadOnlyPart-interface.
 

 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 @@
-Merging And The Merge Output Editor Window
Merging And The Merge Output Editor Window
Prev
Next
File Comparison And Merge
Merging And The Merge Output Editor Window

+Merging And The Merge Output Editor Window
Merging And The Merge Output Editor Window
Prev
Next
File Comparison And Merge
Merging And The Merge Output Editor Window

    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 @@
-Chapter 4. Miscellaneous Topics
Miscellaneous Topics
Prev
Next
 
Chapter 4. Miscellaneous Topics
Networktransparency via KIO
KIO-Slaves

-KDE supports networktransparency via KIO-slaves. KDiff3 uses this
+Chapter 4. Miscellaneous Topics
Miscellaneous Topics
Prev
Next
 
Chapter 4. Miscellaneous Topics
Networktransparency via TDEIO
TDEIO-Slaves

+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.
@@ -13,7 +13,7 @@ Example:
 
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.
 

-Other KIO-slaves that are interesting are:
+Other TDEIO-slaves that are interesting are:
 
Files from the WWW (http:),
Files from the FTP (ftp:),
Encrypted file transfer (fish:, sftp:),
Windows-ressources (smb:),
Local files (file:),

 Other things that are possible, but probably less useful are:
 
Man-pages (man:),
Info-pages (info:),
How To Write URLs

@@ -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".
 

    When URLs don't work as expected, try to open them in Konqueror first.
-
Capabilities of KIO-Slaves

+
Capabilities of TDEIO-Slaves

    Networktransparency has one drawback: Not all ressources have the same cababilities.
 

    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 @@
-Navigation And Editing
Navigation And Editing
Prev
Next
File Comparison And Merge
Navigation And Editing

+Navigation And Editing
Navigation And Editing
Prev
Next
File Comparison And Merge
Navigation And Editing

    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 @@
-Open-Dialog
Open-Dialog
Prev
Next
File Comparison And Merge
Open-Dialog

+Open-Dialog
Open-Dialog
Prev
Next
File Comparison And Merge
Open-Dialog

    Since many input files must be selectable, the program has a special open dialog:
 

    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 @@
-Options
Options
Prev
Next
File Comparison And Merge
Options

+Options
Options
Prev
Next
File Comparison And Merge
Options

    Options and the recent-file-list will be saved when you exit the program,
    and reloaded when you start it. (Menu Settings->Configure KDiff3 ...)
 
Font

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 @@
-Other Functions in Directory Merge Window
Other Functions in Directory Merge Window
Prev
Next
Directory Comparison and Merge with KDiff3
Other Functions in Directory Merge Window
Split/Full Screen Mode

+Other Functions in Directory Merge Window
Other Functions in Directory Merge Window
Prev
Next
Directory Comparison and Merge with KDiff3
Other Functions in Directory Merge Window
Split/Full Screen Mode

    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 @@
-Paste and Drop Input
Paste and Drop Input
Prev
Next
File Comparison And Merge
Paste and Drop Input

+Paste and Drop Input
Paste and Drop Input
Prev
Next
File Comparison And Merge
Paste and Drop Input

    Sometimes you want to compare parts of a text that is not an own file. KDiff3 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 @@
-Preprocessor Commands
Preprocessor Commands
Prev
Next
File Comparison And Merge
Preprocessor Commands

+Preprocessor Commands
Preprocessor Commands
Prev
Next
File Comparison And Merge
Preprocessor Commands

 KDiff3 supports two preprocessor options.
 

 
Preprocessor-Command:

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 @@
-Printing
Printing
Prev
Next
File Comparison And Merge
Printing

+Printing
Printing
Prev
Next
File Comparison And Merge
Printing

    KDiff3 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 @@
-Requirements
Requirements
Prev
Next
Installation
Requirements

+Requirements
Requirements
Prev
Next
Installation
Requirements

    In order to successfully use all features of KDiff3, you need KDE >3.1.
 

    For information about how to run KDiff3 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 @@
-Saving
Saving
Prev
Next
File Comparison And Merge
Saving

+Saving
Saving
Prev
Next
File Comparison And Merge
Saving

    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 @@
-Screenshots and Features
Screenshots and Features
Prev
Next
Introduction
Screenshots and Features
This screenshot shows the difference between two text files
(Using an early version of KDiff3):

+Screenshots and Features
Screenshots and Features
Prev
Next
Introduction
Screenshots and Features
This screenshot shows the difference between two text files
(Using an early version of KDiff3):

    3-way-merging is fully supported. This is useful if two people change code independently.
    The original file (the base) is used to help KDiff3 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 @@
-Select, Copy And Paste
Select, Copy And Paste
Prev
Next
File Comparison And Merge
Select, Copy And Paste

+Select, Copy And Paste
Select, Copy And Paste
Prev
Next
File Comparison And Merge
Select, Copy And Paste

    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 @@
-Starting Directory Comparison Or Merge
Starting Directory Comparison Or Merge
Prev
Next
Directory Comparison and Merge with KDiff3
Starting Directory Comparison Or Merge

+Starting Directory Comparison Or Merge
Starting Directory Comparison Or Merge
Prev
Next
Directory Comparison and Merge with KDiff3
Starting Directory Comparison Or Merge

    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.
-- 
cgit v1.2.1