From 02081598c2dcf7faaa89ddac463232dce3aab215 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 18 Apr 2013 17:53:15 -0500 Subject: [PATCH] Update files and references in support of bug report 1446. --- acinclude.m4 | 6 +++--- doc/README | 2 +- doc/createpdfdoc | 2 +- doc/en/common/artistic-license.html | 2 +- doc/en/common/fdl-license.html | 2 +- doc/en/common/gpl-license.html | 2 +- doc/en/common/kde-localised.css.template | 2 +- doc/en/compilation.html | 2 +- doc/en/credits.html | 2 +- doc/en/dirmerge.html | 2 +- doc/en/dirmergeoptions.html | 2 +- doc/en/dirmergevisible.html | 2 +- doc/en/documentation.html | 2 +- doc/en/dothemerge.html | 2 +- doc/en/faq.html | 2 +- doc/en/features.html | 2 +- doc/en/find.html | 2 +- doc/en/index.html | 2 +- doc/en/installation.html | 2 +- doc/en/interpretinginformation.html | 2 +- doc/en/introduction.html | 2 +- doc/en/kpart.html | 2 +- doc/en/merging.html | 2 +- doc/en/misc.html | 2 +- doc/en/navigation.html | 2 +- doc/en/opendialog.html | 2 +- doc/en/options.html | 2 +- doc/en/other.html | 2 +- doc/en/pasteinput.html | 2 +- doc/en/preprocessors.html | 2 +- doc/en/printing.html | 2 +- doc/en/requirements.html | 2 +- doc/en/saving.html | 2 +- doc/en/screenshots.html | 2 +- doc/en/selections.html | 2 +- doc/en/startingdirmerge.html | 2 +- kdiff3plugin/po/Makefile | 2 +- 37 files changed, 39 insertions(+), 39 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 364a2b1..23739c3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -612,13 +612,13 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then - kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share" + kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" - AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) + AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" else - KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl" + KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/tde-chunk.xsl" fi fi diff --git a/doc/README b/doc/README index 182e7b3..6622076 100644 --- a/doc/README +++ b/doc/README @@ -24,7 +24,7 @@ file into HTML. meinproc index.docbook If you prefer everything in one big HTML/Postscript/PDF-file: - LANG=de_DE meinproc --check index.docbook --stylesheet /opt/trinity/share/apps/ksgmltools2/customization/kde-nochunk.xsl + LANG=de_DE meinproc --check index.docbook --stylesheet /opt/trinity/share/apps/ksgmltools2/customization/tde-nochunk.xsl (The LANG=de_DE prevents that meinproc writes the file in UTF-8 encoding, which isn't understood by html2ps.) Create ps-file: html2ps -D -u -n index.html >index.ps diff --git a/doc/createpdfdoc b/doc/createpdfdoc index 5e961c6..c5e53ca 100644 --- a/doc/createpdfdoc +++ b/doc/createpdfdoc @@ -1,7 +1,7 @@ for i in `find * -maxdepth 0 -type d`; do cd $i echo $i -LANG=de_DE meinproc --check index.docbook --stylesheet /opt/trinity/share/apps/ksgmltools2/customization/kde-nochunk.xsl +LANG=de_DE meinproc --check index.docbook --stylesheet /opt/trinity/share/apps/ksgmltools2/customization/tde-nochunk.xsl html2ps -D -u -n index.html >index.ps ps2pdf index.ps ../kdiff3_$i.pdf cd .. diff --git a/doc/en/common/artistic-license.html b/doc/en/common/artistic-license.html index 2069b4e..65aaedf 100644 --- a/doc/en/common/artistic-license.html +++ b/doc/en/common/artistic-license.html @@ -9,7 +9,7 @@ - +

The "Artistic License"

diff --git a/doc/en/common/fdl-license.html b/doc/en/common/fdl-license.html index cb1f8a0..e1afda9 100644 --- a/doc/en/common/fdl-license.html +++ b/doc/en/common/fdl-license.html @@ -9,7 +9,7 @@ - +

GNU Free Documentation License

diff --git a/doc/en/common/gpl-license.html b/doc/en/common/gpl-license.html index 26ae3af..68a63d5 100644 --- a/doc/en/common/gpl-license.html +++ b/doc/en/common/gpl-license.html @@ -9,7 +9,7 @@ - +

GNU General Public License

diff --git a/doc/en/common/kde-localised.css.template b/doc/en/common/kde-localised.css.template index abcd1ec..52b91d1 100644 --- a/doc/en/common/kde-localised.css.template +++ b/doc/en/common/kde-localised.css.template @@ -20,7 +20,7 @@ */ /* - These settings will override kde-default.css. + These settings will override tde-default.css. Any updates should be validated, e.g. http://jigsaw.w3.org/css-validator/ diff --git a/doc/en/compilation.html b/doc/en/compilation.html index 9974fea..6296120 100644 --- a/doc/en/compilation.html +++ b/doc/en/compilation.html @@ -1,4 +1,4 @@ -Compilation and Installation
Compilation and Installation
Prev
Installation

Compilation and Installation

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

Compilation and Installation
Prev
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 ceb4d5b..ed7c389 100644
--- a/doc/en/credits.html
+++ b/doc/en/credits.html
@@ -1,4 +1,4 @@
-Chapter 6. Credits and License
Credits and License
 
Chapter 6. Credits and License

+Chapter 6. Credits and License
Credits and License
Chapter 6. Credits and License

 KDiff3 - File and Directory Comparison and Merge Tool
 

 Program copyright 2002-2007 Joachim Eibl 
diff --git a/doc/en/dirmerge.html b/doc/en/dirmerge.html
index f83a481..e862018 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
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
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 9d126b3..5a4aa6c 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
Directory Comparison and Merge with KDiff3
Options for Comparing and Merging Directories

+Options for Comparing and Merging Directories
Options for Comparing and Merging Directories
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 fd20589..5e530b2 100644
--- a/doc/en/dirmergevisible.html
+++ b/doc/en/dirmergevisible.html
@@ -1,4 +1,4 @@
-Directory Merge Visible Information
Directory Merge Visible Information
Directory Comparison and Merge with KDiff3
Directory Merge Visible Information

+Directory Merge Visible Information
Directory Merge Visible Information
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 9a0ebd6..304bfe6 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
Chapter 2. File Comparison And Merge
Command-Line Options
Comparing 2 files: 
+Chapter 2. File Comparison And Merge
File Comparison And Merge
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 1bf4d11..8951356 100644
--- a/doc/en/dothemerge.html
+++ b/doc/en/dothemerge.html
@@ -1,4 +1,4 @@
-Doing A Directory Merge
Doing A Directory Merge
Directory Comparison and Merge with KDiff3
Doing A Directory Merge

+Doing A Directory Merge
Doing A Directory Merge
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 530e30e..78df594 100644
--- a/doc/en/faq.html
+++ b/doc/en/faq.html
@@ -1,4 +1,4 @@
-Chapter 5. Questions and Answers
Questions and Answers
Chapter 5. Questions and Answers
This document may have been updated since your installation.
+Chapter 5. Questions and Answers
Questions and Answers
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 e5ac9ed..6007450 100644
--- a/doc/en/features.html
+++ b/doc/en/features.html
@@ -1,4 +1,4 @@
-More Features
More Features
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
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
diff --git a/doc/en/find.html b/doc/en/find.html
index ead358b..b38c6fe 100644
--- a/doc/en/find.html
+++ b/doc/en/find.html
@@ -1,4 +1,4 @@
-Finding Strings
Finding Strings
File Comparison And Merge
Finding Strings

+Finding Strings
Finding Strings
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.html b/doc/en/index.html
index 6f9a4a8..404e0af 100644
--- a/doc/en/index.html
+++ b/doc/en/index.html
@@ -1,4 +1,4 @@
-The KDiff3 Handbook
Installation
Appendix A. Installation
Table of Contents
How to obtain KDiff3
Requirements
Compilation and Installation
How to obtain KDiff3

+Appendix A. Installation
Installation
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 90c15fd..e33035b 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
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
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 d7c2429..f766dc1 100644
--- a/doc/en/introduction.html
+++ b/doc/en/introduction.html
@@ -1,4 +1,4 @@
-Chapter 1. Introduction
Introduction
Chapter 1. Introduction
Yet Another Diff Frontend?

+Chapter 1. Introduction
Introduction
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/kpart.html b/doc/en/kpart.html
index 63094d3..92d1f65 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
Miscellaneous Topics
Using KDiff3 as a KPart

+Using KDiff3 as a KPart
Using KDiff3 as a KPart
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 7331292..712d9b1 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
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
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 34b13cf..7aa1fb5 100644
--- a/doc/en/misc.html
+++ b/doc/en/misc.html
@@ -1,4 +1,4 @@
-Chapter 4. Miscellaneous Topics
Miscellaneous Topics
Chapter 4. Miscellaneous Topics
Networktransparency via KIO
KIO-Slaves

+Chapter 4. Miscellaneous Topics
Miscellaneous Topics
Chapter 4. Miscellaneous Topics
Networktransparency via KIO
KIO-Slaves

 KDE supports networktransparency via KIO-slaves. KDiff3 uses this
 for reading input files and for scanning directories.
 This means that you can specify files and directories on local and
diff --git a/doc/en/navigation.html b/doc/en/navigation.html
index ccfce59..e1810d1 100644
--- a/doc/en/navigation.html
+++ b/doc/en/navigation.html
@@ -1,4 +1,4 @@
-Navigation And Editing
Navigation And Editing
File Comparison And Merge
Navigation And Editing

+Navigation And Editing
Navigation And Editing
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 58ec755..7ea7588 100644
--- a/doc/en/opendialog.html
+++ b/doc/en/opendialog.html
@@ -1,4 +1,4 @@
-Open-Dialog
Open-Dialog
File Comparison And Merge
Open-Dialog

+Open-Dialog
Open-Dialog
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 cff21f9..5c74e13 100644
--- a/doc/en/options.html
+++ b/doc/en/options.html
@@ -1,4 +1,4 @@
-Options
Options
File Comparison And Merge
Options

+Options
Options
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 8919bd5..84b9b10 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
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
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 8d913ba..98a9109 100644
--- a/doc/en/pasteinput.html
+++ b/doc/en/pasteinput.html
@@ -1,4 +1,4 @@
-Paste and Drop Input
Paste and Drop Input
File Comparison And Merge
Paste and Drop Input

+Paste and Drop Input
Paste and Drop Input
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 427f717..0bea10b 100644
--- a/doc/en/preprocessors.html
+++ b/doc/en/preprocessors.html
@@ -1,4 +1,4 @@
-Preprocessor Commands
Preprocessor Commands
File Comparison And Merge
Preprocessor Commands

+Preprocessor Commands
Preprocessor Commands
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 bca62f3..a541345 100644
--- a/doc/en/printing.html
+++ b/doc/en/printing.html
@@ -1,4 +1,4 @@
-Printing
Printing
File Comparison And Merge
Printing

+Printing
Printing
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 983137c..1c4c7f0 100644
--- a/doc/en/requirements.html
+++ b/doc/en/requirements.html
@@ -1,4 +1,4 @@
-Requirements
Requirements
Installation
Requirements

+Requirements
Requirements
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 74d24e3..87e9a99 100644
--- a/doc/en/saving.html
+++ b/doc/en/saving.html
@@ -1,4 +1,4 @@
-Saving
Saving
File Comparison And Merge
Saving

+Saving
Saving
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 badb664..a63712d 100644
--- a/doc/en/screenshots.html
+++ b/doc/en/screenshots.html
@@ -1,4 +1,4 @@
-Screenshots and Features
Screenshots and Features
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
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 32cd75e..58dc620 100644
--- a/doc/en/selections.html
+++ b/doc/en/selections.html
@@ -1,4 +1,4 @@
-Select, Copy And Paste
Select, Copy And Paste
File Comparison And Merge
Select, Copy And Paste

+Select, Copy And Paste
Select, Copy And Paste
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 c737748..6029dc5 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
Directory Comparison and Merge with KDiff3
Starting Directory Comparison Or Merge

+Starting Directory Comparison Or Merge
Starting Directory Comparison Or Merge
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.
diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile
index 9be58bf..b174964 100644
--- a/kdiff3plugin/po/Makefile
+++ b/kdiff3plugin/po/Makefile
@@ -119,7 +119,7 @@ KDE_USE_FPIE = -fPIE
 KDE_USE_NMCHECK_FALSE = 
 KDE_USE_NMCHECK_TRUE = #
 KDE_USE_PIE = -pie
-KDE_XSL_STYLESHEET = /usr/share/apps/ksgmltools2/customization/kde-chunk.xsl
+KDE_XSL_STYLESHEET = /usr/share/apps/ksgmltools2/customization/tde-chunk.xsl
 LDFLAGS = 
 LDFLAGS_AS_NEEDED = 
 LDFLAGS_NEW_DTAGS =