joachim99@11: <?xml version="1.0" ?>
joachim99@73: <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
joachim99@11:   <!ENTITY kdiff3 "<application>KDiff3</application>">
joachim99@11:   <!ENTITY kappname "&kdiff3;">
joachim99@69:   <!ENTITY package "extragear-utils">
joachim99@11:   <!ENTITY % addindex "IGNORE">
joachim99@11:   <!ENTITY % English "INCLUDE">
joachim99@11: ]>
joachim99@11: 
joachim99@11: <book lang="&language;">
joachim99@11: 
joachim99@11: <!-- This header contains all of the meta-information for the document such
joachim99@11: as Authors, publish date, the abstract, and Keywords -->
joachim99@11: 
joachim99@11: <bookinfo>
joachim99@11: <title>The &kdiff3; Handbook</title>
joachim99@11: 
joachim99@11: <authorgroup>
joachim99@11: <author>
joachim99@11: <!--<personname>-->
joachim99@11: <firstname>Joachim</firstname>
joachim99@11: <surname>Eibl</surname>
joachim99@11: <!--</personname>-->
joachim99@11: <affiliation><address>
joachim99@66:    <email>joachim.eibl at gmx.de</email>
joachim99@11: </address></affiliation>
joachim99@11: </author>
joachim99@73: <!-- TRANS:ROLES_OF_TRANSLATORS -->
joachim99@11: </authorgroup>
joachim99@11: 
joachim99@11: <copyright>
joachim99@77: <year>2002-2007</year>
joachim99@11: <holder>Joachim Eibl</holder>
joachim99@11: </copyright>
joachim99@11: <!-- Translators: put here the copyright notice of the translation -->
joachim99@11: <!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
joachim99@11:      and in the FDL itself on how to use it. -->
joachim99@11: <legalnotice>&FDLNotice;</legalnotice>
joachim99@11: 
joachim99@11: <!-- Date and version information of the documentation
joachim99@11: Don't forget to include this last date and this last revision number, we
joachim99@11: need them for translation coordination !
joachim99@11: Please respect the format of the date (YYYY-MM-DD) and of the version
joachim99@11: (V.MM.LL), it could be used by automation scripts.
joachim99@11: Do NOT change these in the translation. -->
joachim99@11: 
joachim99@77: <date>2007-31-03</date>
joachim99@77: <releaseinfo>0.9.92</releaseinfo>
joachim99@11: 
joachim99@11: 
joachim99@11: <abstract>
joachim99@11: <para>
joachim99@11:    &kdiff3; is a file and directory diff and merge tool which
joachim99@11: <itemizedlist>
joachim99@11: <listitem><para>compares and merges two or three text input files or directories,</para></listitem>
joachim99@11: <listitem><para>shows the differences line by line and character by character(!),</para></listitem>
joachim99@11: <listitem><para>provides an automatic merge-facility,</para></listitem>
joachim99@11: <listitem><para>has an editor for comfortable solving of merge-conflicts,</para></listitem>
joachim99@11: <listitem><para>provides networktransparency via KIO,</para></listitem>
joachim99@68: <listitem><para>has options to highlight or hide changes in white-space or comments,</para></listitem>
joachim99@69: <listitem><para>supports Unicode, UTF-8 and other file encodings,</para></listitem>
joachim99@69: <listitem><para>prints differences,</para></listitem>
joachim99@69: <listitem><para>supports version control keyword and history merging.</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: </para><para>
joachim99@77:    This document describes &kdiff3;-version 0.9.92.
joachim99@11: </para>
joachim99@11: </abstract>
joachim99@11: 
joachim99@11: <!-- This is a set of Keywords for indexing by search engines.
joachim99@11: Please at least include KDE, the KDE package it is in, the name
joachim99@11:  of your application, and a few relevant keywords. -->
joachim99@11: 
joachim99@11: <keywordset>
joachim99@11: <keyword>KDE</keyword>
joachim99@11: <keyword>kdeextragear</keyword>
joachim99@11: <keyword>kdiff3</keyword>
joachim99@11: <keyword>diff</keyword>
joachim99@11: <keyword>merge</keyword>
joachim99@11: <keyword>CVS</keyword>
joachim99@11: <keyword>triplediff</keyword>
joachim99@11: <keyword>compare</keyword>
joachim99@11: <keyword>files</keyword>
joachim99@11: <keyword>directories</keyword>
joachim99@11: <keyword>version control</keyword>
joachim99@11: <keyword>three-way-merge</keyword>
joachim99@11: <keyword>in-line-differences</keyword>
joachim99@11: <keyword>synchronise</keyword>
joachim99@11: <keyword>kpart</keyword>
joachim99@11: <keyword>kio</keyword>
joachim99@11: <keyword>networktransparent</keyword>
joachim99@11: <keyword>editor</keyword>
joachim99@51: <keyword>white space</keyword>
joachim99@51: <keyword>comments</keyword>
joachim99@11: </keywordset>
joachim99@11: 
joachim99@11: </bookinfo>
joachim99@11: 
joachim99@11: <chapter id="introduction"><title>Introduction</title>
joachim99@11: <sect1 id="why"><title>Yet Another Diff Frontend?</title>
joachim99@11: <para>
joachim99@73: Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I wrote it.
joachim99@11: </para><para>
joachim99@73: &kdiff3; started because I had to do a difficult merge. Merging is necessary when several
joachim99@11: people work on the same files in a project. A merge can be somewhat automated, when the
joachim99@11: merge-tool not only has the new modified files (called "branches"), but also the original file
joachim99@11: (called "base"). The merge tool will automatically choose any modification that was only
joachim99@11: done in one branch. When several contributors change the same lines, then the merge tool
joachim99@11: detects a conflict which must be solved manually.
joachim99@11: </para><para>
joachim99@11: The merge then was difficult because one contributor had changed many things and corrected
joachim99@11: the indentation in many places. Another contributor also had changed much text in the same file,
joachim99@11: which resulted in several merge conflicts.
joachim99@11: </para><para>
joachim99@11: The tool I used then, only showed the changed lines, but not what had changed within these
joachim99@11: lines. And there was no information about where only the indentation was changed. The merge
joachim99@11: was a little nightmare.
joachim99@11: </para><para>
joachim99@11: So this was the start. The first version could show differences within a line and showed white space differences.
joachim99@11: Later many other features were added to increase the usefulness.
joachim99@11: </para><para>
joachim99@11: For example if you want to compare some text quickly, then you can copy it to the clipboard and
joachim99@11: paste it into either diff window.
joachim99@11: </para><para>
joachim99@11: A feature that required a big effort was the directory comparison and merge facility, which turned
joachim99@11: the program almost into a full file browser.
joachim99@11: </para><para>
joachim99@73: I hope &kdiff3; works for you too. Have fun!
joachim99@11: </para><para>
joachim99@11: Joachim Eibl (2003)
joachim99@11: </para>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="screenshots"><title>Screenshots and Features</title>
joachim99@11: <para>This screenshot shows the difference between two text files</para>
joachim99@73: <para>(Using an early version of &kdiff3;):</para>
joachim99@11: <screenshot><mediaobject>
joachim99@11:    <imageobject><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
joachim99@11: </mediaobject></screenshot>
joachim99@11: 
joachim99@11: <para>
joachim99@11:    3-way-merging is fully supported. This is useful if two people change code independently.
joachim99@73:    The original file (the base) is used to help &kdiff3; to automatically select the correct
joachim99@11:    changes.
joachim99@11:    The merge-editor below the diff-windows allows you to solve conflicts, while showing you the output you will get.
joachim99@11:    You can even edit the output.
joachim99@11:    This screenshot shows three input files being merged:
joachim99@11: </para><para>
joachim99@11: <screenshot><mediaobject>
joachim99@11:    <imageobject><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
joachim99@11: </mediaobject></screenshot>
joachim99@11: </para>
joachim99@11: 
joachim99@73: <para id="dirmergebigscreenshot">&kdiff3; also helps you to compare and merge complete directories.
joachim99@73: This screenshot shows &kdiff3; during a directory merge:
joachim99@11: </para><para>
joachim99@11: <screenshot><mediaobject>
joachim99@11:    <imageobject><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
joachim99@11: </mediaobject></screenshot>
joachim99@11: </para>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="features"><title>More Features</title>
joachim99@11: <sect2><title> Line-By-Line And Char-By-Char Diff-Viewer</title>
joachim99@73: <para>By using the possiblities of a graphical color display &kdiff3; shows
joachim99@11:    exactly what the difference is. When you have to do many code-reviews, you will like this.
joachim99@11: </para>
joachim99@11: <screenshot><mediaobject>
joachim99@11:    <imageobject><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
joachim99@11: </mediaobject></screenshot>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title> See White-Space Differences At One Glance</title>
joachim99@11: <para>Spaces and tabs that differ appear visibly. When lines differ only
joachim99@11:    in  the  amount of white space this can be seen at one look in the summary
joachim99@11:    column on the left side. (No more worries when people change the indentation.)
joachim99@11: </para>
joachim99@11: <screenshot><mediaobject>
joachim99@11:    <imageobject><imagedata fileref="white_space.png" format="PNG"/></imageobject>
joachim99@11: </mediaobject></screenshot>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title> Triple-Diff</title>
joachim99@11: <para> Analyze three files and see where they differ.
joachim99@11: </para><para>
joachim99@11:    The left/middle/right windows are named A/B/C and have the blue/green/magenta
joachim99@11:    color respectively.
joachim99@11: </para><para>
joachim99@11:    If one file is the same and one file is different on a line then the
joachim99@11:    color   shows which file is different. The red color means that both other
joachim99@11:    files  are different.
joachim99@11: </para>
joachim99@11: <screenshot><mediaobject>
joachim99@11:    <imageobject><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
joachim99@11: </mediaobject></screenshot>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title> Comfortable Merge Of Two Or Three Input Files</title>
joachim99@73: <para> &kdiff3; can be used to merge two or three input files and automatically
joachim99@11:    merges as much as possible. The result is presented in an editable window
joachim99@11:    where most conflicts can be solved with a single mouseclick: Select the
joachim99@11:    buttons  A/B/C from the button-bar to select the source that should be used.
joachim99@11:    You can  also select more than one source. Since this output window is an
joachim99@11:    editor even  conflicts which need further corrections can be solved here without
joachim99@11:    requiring  another tool.
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@11: 
joachim99@66: <sect2><title>And ...</title>
joachim99@11: <itemizedlist>
joachim99@66:    <listitem><para>Fast navigation via buttons.</para></listitem>
joachim99@66:    <listitem><para>A mouse-click into a summary column sync's all windows to show the same position.</para></listitem>
joachim99@66:    <listitem><para>Select and copy from any window and paste into the merge result window.</para></listitem>
joachim99@66:    <listitem><para>Overview column that shows where the changes and conflicts are.</para></listitem>
joachim99@66:    <listitem><para>The colors are adjustable to your specific preferences.</para></listitem>
joachim99@66:    <listitem><para>Adjustable Tab size.</para></listitem>
joachim99@66:    <listitem><para>Option to insert spaces instead of tabs.</para></listitem>
joachim99@66:    <listitem><para>Open files comfortably via dialog or specify files on the command line.</para></listitem>
joachim99@66:    <listitem><para>Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)</para></listitem>
joachim99@66:    <listitem><para>Show the line numbers for each line. </para></listitem>
joachim99@66:    <listitem><para>Paste clipboard or drag text into a diff input window.</para></listitem>
joachim99@66:    <listitem><para>Networktransparency via KIO.</para></listitem>
joachim99@66:    <listitem><para>Can be used as diff-viewer in KDevelop 3.</para></listitem>
joachim99@66:    <listitem><para>Word-wrap for long lines.</para></listitem>
joachim99@68:    <listitem><para>Support for Unicode, UTF-8 and other codecs.</para></listitem>
joachim99@68:    <listitem><para>Support for right to left languages.</para></listitem>
joachim99@66:    <listitem><para>...</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: </sect2>
joachim99@11: </sect1>
joachim99@11: </chapter>
joachim99@11: 
joachim99@69: <chapter id="documentation"><title>File Comparison And Merge</title>
joachim99@11: 
joachim99@11: <sect1 id="commandline"><title>Command-Line Options</title>
joachim99@11: 
joachim99@11: <sect2><title>Comparing 2 files: </title>
joachim99@11: <screen>
joachim99@11:    <command>kdiff3</command> <replaceable>file1 file2</replaceable>
joachim99@11: </screen>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>Merging 2 files: </title>
joachim99@11: <screen>
joachim99@11:    <command>kdiff3</command> <replaceable>file1 file2</replaceable> -m
joachim99@11:    <command>kdiff3</command> <replaceable>file1 file2</replaceable> -o <replaceable>outputfile</replaceable>
joachim99@11: </screen>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>Comparing 3 files: </title>
joachim99@11: <screen>
joachim99@11:    <command>kdiff3</command> <replaceable>file1 file2 file3</replaceable>
joachim99@11: </screen>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>Merging 3 files: </title>
joachim99@11: <screen>
joachim99@11:    <command>kdiff3</command> <replaceable>file1 file2 file3</replaceable> -m
joachim99@11:    <command>kdiff3</command> <replaceable>file1 file2 file3</replaceable> -o <replaceable>outputfile</replaceable>
joachim99@11: </screen>
joachim99@11: <para>
joachim99@11:    Note that <replaceable>file1</replaceable> will be treated as
joachim99@11:    base of <replaceable>file2</replaceable> and
joachim99@11:    <replaceable>file3</replaceable>.
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>Special case: Files with the same name </title>
joachim99@11: <para>
joachim99@11: If all files have the same name but are in different directories, you can
joachim99@11: reduce typework by specifying the filename only for the first file. E.g.:
joachim99@11: </para>
joachim99@11: <screen>
joachim99@11:    <command>kdiff3</command> <replaceable>dir1/filename dir2 dir3</replaceable>
joachim99@11: </screen>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>Commandline for starting a directory comparison or merge: </title>
joachim99@11: <para>This is very similar, but now it's about directories.</para>
joachim99@11: <screen>
joachim99@11:    <command>kdiff3</command> <replaceable>dir1 dir2</replaceable>
joachim99@11:    <command>kdiff3</command> <replaceable>dir1 dir2</replaceable> -o <replaceable>destdir</replaceable>
joachim99@11:    <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable>
joachim99@11:    <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable> -o <replaceable>destdir</replaceable>
joachim99@11: </screen>
joachim99@11: <para>For directory comparison and merge you can continue to read <link linkend="dirmerge">here</link>.</para>
joachim99@11: </sect2>
joachim99@11: 
joachim99@69: <sect2><title>Other command line options</title>
joachim99@69: <para>To see all available command line options type</para>
joachim99@11: <screen>
joachim99@69: <command>kdiff3</command> --help
joachim99@69: </screen>
joachim99@69: <para>Example output:</para>
joachim99@69: <screen>
joachim99@66: Options:
joachim99@66:   -m, --merge               Merge the input.
joachim99@66:   -b, --base file           Explicit base file. For compatibility with certain tools.
joachim99@66:   -o, --output file         Output file. Implies -m. E.g.: -o newfile.txt
joachim99@66:   --out file                Output file, again. (For compatibility with certain tools.)
joachim99@66:   --auto                    No GUI if all conflicts are auto-solvable. (Needs -o file)
joachim99@66:   --qall                    Don't solve conflicts automatically. (For compatibility...)
joachim99@66:   --L1 alias1               Visible name replacement for input file 1 (base).
joachim99@66:   --L2 alias2               Visible name replacement for input file 2.
joachim99@66:   --L3 alias3               Visible name replacement for input file 3.
joachim99@66:   -L, --fname alias         Alternative visible name replacement. Supply this once for every input.
joachim99@69:   --cs string               Override a config setting. Use once for every setting. E.g.: --cs "AutoAdvance=1"
joachim99@69:   --confighelp              Show list of config settings and current values.
joachim99@69:   --config file             Use a different config file.
joachim99@11: </screen>
joachim99@69: <para>The option <option>--cs</option> allows you to adjust a configuration value that is otherwise only adjustable via the configure dialogs. 
joachim99@73: But be aware that when &kdiff3; then terminates the changed value will be stored along with the other settings. 
joachim99@69: With <option>--confighelp</option> you can find out the names of the available items and current values.</para>
joachim99@73: <para>Via <option>--config</option> you can specify a different config file. When you often use &kdiff3; 
joachim99@69: with completely different setups this allows you to easily switch between them.</para>
joachim99@69: </sect2>
joachim99@69: <sect2><title>Ignorable command line options</title>
joachim99@73: <para>Many people want to use &kdiff3; with some version control system. 
joachim99@73: But when that version control system calls &kdiff3; using command line parameters that &kdiff3; doesn't recognise, then &kdiff3; terminates with an error.
joachim99@73: The integration settings allow to specify command line parameters that should be ignored by &kdiff3;. 
joachim99@69: They will appear in the usage help like in this example:</para>
joachim99@69: <screen>
joachim99@69:   --<replaceable>foo</replaceable>                     Ignored. (User defined.)
joachim99@69: </screen>
joachim99@69: <variablelist>
joachim99@69:   <varlistentry><term><emphasis>Command line options to ignore:</emphasis></term><listitem><para>
joachim99@69:      A list of options, separated via semicolon ';'. When one of these options appears on the commandline, 
joachim99@73:      then &kdiff3; will ignore it and run without reporting an error. 
joachim99@69:      (Default is "u;query;html;abort").</para></listitem></varlistentry>
joachim99@69: </variablelist>
joachim99@69: <para>When this isn't enough, then it is recommended to write a shell script that does the option translation.</para>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="opendialog"><title>Open-Dialog</title>
joachim99@11: <para>
joachim99@11:    Since many input files must be selectable, the program has a special open dialog:
joachim99@11: </para>
joachim99@11: <screenshot><mediaobject>
joachim99@11: <imageobject><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
joachim99@11: </mediaobject></screenshot>
joachim99@11: <para>
joachim99@11:    The open dialog allows to edit the filenames by hand, selecting a file
joachim99@11:    via  the file-browser ("File...") or allows to choose recent files from
joachim99@11:    the drop-down lists. If you open the dialog again, then the current names
joachim99@11:    still remain there. The third input file is not required. If the
joachim99@11:    entry   for "C" remains empty, then only a two file diff analysis will be
joachim99@11:    done.
joachim99@11: </para><para>
joachim99@11:    You can also select a directory via "Dir...". If for A a directory is specified
joachim99@11:    then a directory-comparison/merge starts. If A specifies a file but B, C or
joachim99@73:    the output specify a directory, then &kdiff3; uses the filename from A in the
joachim99@11:    specified directories.
joachim99@11: </para><para>
joachim99@11:    If "Merge" is selected, then the "Output"-line becomes editable. But it
joachim99@11:    is not required to specify the output filename immediately. You can also
joachim99@11:    postpone this until saving.
joachim99@11: </para><para>
joachim99@11:    The "Configure..."-button opens the options-dialog, so that you can set
joachim99@11:    the options before running the analysis.
joachim99@11: </para>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="pasteinput"><title>Paste and Drop Input</title>
joachim99@11: <para>
joachim99@73:    Sometimes you want to compare parts of a text that is not an own file. &kdiff3; also
joachim99@11:    allows you to paste text from the clipboard into the diff input window that has the focus.
joachim99@11:    The diff analysis happens immediately then.
joachim99@11:    In the open dialog you need not specify files then, but just close it via "Cancel".
joachim99@11: </para><para>
joachim99@11:    You can also use drag and drop: Drag a file from a file manager
joachim99@11:    or selected text from an editor and drop it onto a diff input window.
joachim99@11: </para><para>
joachim99@11:    What's the idea? Sometimes a file contains two similar functions, but checking how similar
joachim99@11:    they really are is a big effort if you first must create two files and then load them. Now
joachim99@11:    you can simply copy, paste and compare the relevant sections.
joachim99@11: </para><para>
joachim99@73:    Note: Currently you cannot drag anything from &kdiff3;. Only dropping in the diff input
joachim99@11:    is supported.
joachim99@11: </para><para>
joachim99@11:    Warning: Some editors still interpret the drag and drop into another program like cut
joachim99@11:    (instead of copy) and paste. Your original data might be lost then.
joachim99@11: </para>
joachim99@11: </sect1>
joachim99@11: 
joachim99@69: <sect1 id="interpretinginformation"><title>Comparing Files And Interpreting The Information In The Input Windows</title>
joachim99@11: <screenshot><mediaobject>
joachim99@11: <imageobject><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
joachim99@11: </mediaobject></screenshot>
joachim99@69: <sect2><title>Info Line</title><para>
joachim99@11:    At the top of each text window is its "info line". The info lines of
joachim99@69:    the input windows contain a letter "A", "B" or "C", the editable filename,
joachim99@69:    a button for browsing, and the line number of the first visible line in the window. 
joachim99@69:    (Note that window "C" is  optional.) Each info line appears in a different color.
joachim99@11: </para><para>
joachim99@69:    When you selected another file via browsing or finished editing the filename here 
joachim99@69:    by pressing enter, the new file will be loaded and 
joachim99@69:    compared with the already loaded file(s).
joachim99@69: </para></sect2><sect2><title>Coloring</title><para>
joachim99@11:    The three input windows are assigned the letters "A", "B" and "C".
joachim99@11:    "A"   has  color blue, "B" has green and "C" has magenta. (These are the
joachim99@11:    defaults,   but  can be changed in the Settings-Menu.)
joachim99@11: </para><para>
joachim99@11:    When a difference is detected then the color shows which input file
joachim99@11:    differs.   When both other input files differ then the color used to express
joachim99@11:    this is   red by default ("Conflict color" in the Settings).
joachim99@11:    This colorscheme is especially useful in the case of three input files, which will be
joachim99@11:    seen in the next section (<link linkend="merging">Merging</link>).
joachim99@69: </para></sect2><sect2><title>Summary Column</title><para>
joachim99@11:    Left of each text is the "summary column". If differences occurred on a
joachim99@11:    line then the summary column shows the respective color. For a white-space-only
joachim99@11:    difference the summary is chequered. For programming languages where white
joachim99@11:    space is not so important this is useful to see at one glance if anything
joachim99@11:    of importance was modified. (In C/C++ white space is only interesting within
joachim99@11:    strings, comments, for the preprocessor, and some only very esoteric situations.)
joachim99@11: </para><para>
joachim99@11:    The vertical line separating the summary column and the text is interrupted
joachim99@66:    if the input file had no lines there. When word-wrap is enabled then this vertical 
joachim99@66:    line appears dotted for wrapped lines.
joachim99@69: </para></sect2><sect2><title>Overview Column</title><para>
joachim99@11:    On the right side a "overview"-column is visible left of the vertical scrollbar.
joachim99@11:    It shows the compressed summary column of input "A". All the differences
joachim99@11:    and conflicts are visible at one glance. When only two input windows are
joachim99@11:    used, then all differences appear red here because every difference is
joachim99@11:    also   a conflict. A black rectangle frames the visible part of the inputs.
joachim99@11:    For  very long input files, when the number of input lines is bigger than
joachim99@11:    the height of the overview column in pixels, then several input lines share
joachim99@11:    one overview line. A conflict then has top priority over simple differences,
joachim99@11:    which have priority over no change, so that no difference or conflict is
joachim99@11:    lost here.  By clicking into this overview column the corresponding text
joachim99@11:    will be shown.
joachim99@69: </para></sect2><sect2 id="manualdiffhelp"><title>Manually Aligning Lines</title><para>
joachim99@69:    Sometimes the algorithm places the wrong lines next to each other. Or you want to compare 
joachim99@69:    one piece of text with text at a completely different position in the other file.
joachim99@73:    For these situations you can manually instruct &kdiff3; to align certain lines. 
joachim99@69:    Mark the text for which you want to improve the alignment with the mouse as you would 
joachim99@69:    for copy and paste in the first diff view and then choose "Add Manual Diff Alignment" 
joachim99@69:    in the "Diffview"-menu (keyboard shortcut "Ctrl-Y") . An orange bar will appear in 
joachim99@69:    the summary column next to the chosen text. Repeat this for the second and 
joachim99@73:    (if available) third diff view. &kdiff3; will immediately recalculate the differences everytime you do this.
joachim99@69:    and will align the chosen lines. Of course some of the previously matching lines in between 
joachim99@69:    might not match anymore.
joachim99@69: </para><para>
joachim99@69:    Currently merging doesn't support the use of manual diff help.
joachim99@77: </para></sect2><sect2 id="joinsplitsections"><title>Manually Joining and Splitting Diff Sections</title><para>
joachim99@77:    In some cases &kdiff3; will see too many or too few diff sections for merging. In such a 
joachim99@77:    case you can join or split existing sections.
joachim99@77: </para><para>
joachim99@77:    Add new sections by first selecting text in the lines that belong together in either input window (as for copying to the clipboard). 
joachim99@77:    Then choose "Split Diff At Selection" in the "Merge" menu.
joachim99@77:    Splits will be added above the first line and below the last line of the selected text.
joachim99@77:    If you only want to add one section, then select text beginning at another section-split.
joachim99@77: </para><para>
joachim99@77:    For joining sections in either input window select something in the lines from the sections to join.
joachim99@77:    (You can join several sections in one step too.) Then choose "Join selected Diffs" in the "Merge"-menu.
joachim99@69: </para></sect2>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: 
joachim99@11: <sect1 id="merging"><title>Merging And The Merge Output Editor Window</title>
joachim99@11: <screenshot><mediaobject>
joachim99@11: <imageobject><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
joachim99@11: </mediaobject></screenshot>
joachim99@11: <para>
joachim99@11:    The merge output editor window (below the diff input windows) also has an info line at the top showing "Output:", the
joachim99@11:    filename   and "[Modified]" if you edited something. Usually it will contain
joachim99@11:    some text  through the automatic merge facilities, but often it will also
joachim99@11:    contain conflicts.
joachim99@11: </para><para>
joachim99@11:    !!! Saving is disabled until all conflicts are resolved !!! (Use the "Go
joachim99@11:    to prev/next unsolved conflicts"-buttons to find the remaining conflicts.)
joachim99@11: </para><para>
joachim99@11:    With only two input files every difference is also a conflict that must
joachim99@11:    be solved manually.
joachim99@11: </para><para>
joachim99@11:    With three input files the first file is treated as base, while the
joachim99@11:    second   and third input files contain modifications. When at any line only
joachim99@11:    either   input B or input C have changed but not both then the changed source
joachim99@11:    will   automatically be selected. Only when B and C have changed on the same
joachim99@11:    lines,   then the tool detects a conflict that must be solved manually.
joachim99@11:    When B and C are the same, but not the same as A, then C is selected.
joachim99@69: </para><sect2><title>The Summary Column</title><para>
joachim99@11:    The merge output editor window also has a summary column on the left. It shows the
joachim99@11:    letter of the input from which a line was selected or nothing if all three
joachim99@11:    sources where equal on a line. For conflicts it shows a questionmark "?"
joachim99@11:    and the line shows "&lt;Merge Conflict&gt;", all in red. Because solving
joachim99@11:    conflicts  line by line would take very long, the lines are grouped into
joachim99@11:    groups that  have the same difference and conflict characteristics.
joachim99@11:    But only-white-space-conflicts are separated from non-white-space-conflicts
joachim99@11:    in order to ease the merging of files were the indentation changed for many
joachim99@11:    lines.
joachim99@69: </para></sect2><sect2 id="synchronise_views"><title>Setting The Current Group And Synchronising Merge And Diff View Position</title><para>
joachim99@11:    When clicking into  the summary column with the left mouse button in either
joachim99@69:    window then the beginning of the group belonging to that line will shown in all windows.
joachim99@11:    This group then becomes the "current group". It is highlighted with the
joachim99@11:    "Current range (diff) background color" and
joachim99@11:    a black bar appears on the left side of the text.
joachim99@69: </para></sect2><sect2><title>Choosing Inputs A, B or C For Current Conflict And Editing</title><para>
joachim99@73:    The button bar below the menubar contains three input selector buttons 
joachim99@69:    containing the letters "A", "B" and "C". Click the input selector 
joachim99@69:    button to insert (or remove if already inserted) the lines from the respective source.
joachim99@69:    To choose the lines from several inputs click the respective buttons in the
joachim99@69:    needed order. For example if you want that the lines from "B" appear before 
joachim99@69:    the lines from "A" in the output, first click "B", then "A".
joachim99@11: </para><para>
joachim99@69:    If you use the auto-advance option 
joachim99@69:    (<link linkend="autoadvance">"Automatically go to next unsolved conflict after source selection"</link>),
joachim99@69:    you should disable this before choosing lines from several inputs or if you want to
joachim99@73:    edit the lines after your choice. Otherwise &kdiff3; will jump to the next
joachim99@69:    conflict after choosing the first input.
joachim99@11: </para><para>
joachim99@69:    It is often helpful directly edit the merge output. 
joachim99@69:    The summary column will show "m" for every line that was manually modified. 
joachim99@69:    When for instance the differences are aligned in a way that simply choosing 
joachim99@69:    the inputs won't be satisfactory, then you can mark the needed text and use 
joachim99@69:    normal <link linkend="selections">copy and paste</link> to put it into the merge output.
joachim99@11: </para><para>
joachim99@11:    Sometimes, when a line is removed either by automatic merge or by editing
joachim99@11:    and no other lines remain in that group, then the text &lt;No src line&gt;
joachim99@11:    will appear in that line. This is just a placeholder for the group for
joachim99@11:    when  you might change your mind and select some source again. This text won't
joachim99@11:    appear in the saved file or in any selections you want to copy and paste.
joachim99@11: </para><para>
joachim99@11:    The text "&lt;Merge Conflict&gt;" will appear in the clipboard if you
joachim99@11:    copy and   paste some text containing such a line. But still be careful to
joachim99@11:    do so.
joachim99@69: </para></sect2><sect2><title>Choosing Input A, B, or C for All Conflicts</title><para>
joachim99@51:    The normal merge will start by solving simple conflicts automatically.
joachim99@51:    But the "Merge"-menu provides some actions for other common needs.
joachim99@51:    If you have to select the same source for most conflicts, then you can
joachim99@51:    choose "A", "B" or "C" everywhere, or only for the remaining unsolved
joachim99@73:    conflicts, or for unsolved white space conflicts. If you want to decide every
joachim99@51:    single delta yourself, you can "Set deltas to conflicts". Or if you want to
joachim99@73:    return to the automatic choices of &kdiff3; then select
joachim99@73:    "Automatically solve simple conflicts". &kdiff3; then restarts the merge.
joachim99@73:    For actions that change your previous modifications &kdiff3; will ask for your
joachim99@51:    confirmation before proceeding.
joachim99@51: </para><para>
joachim99@73:    Note: When choosing either source for unsolved white space conflicts and
joachim99@51:    the options "Ignore Numbers" or "Ignore C/C++ Comments" are used then changes in
joachim99@73:    numbers or comments will be treated like white space too.
joachim99@69: 
joachim99@69: </para></sect2><sect2 id="vcskeywordsmergesupport"><title>Automatic Merge of Version Control Keywords and History (Log)</title><para>
joachim99@73: Many version control systems support special keywords in the file. (e.g. "&#36;Date&#36;", 
joachim99@73: "&#36;Header&#36;", "&#36;Author&#36;", "&#36;Log&#36;" etc.) During the 
joachim99@69: check-in the version control system (VCS) changes these lines. For instance 
joachim99@73: "&#36;Date&#36;" will turn into "&#36;Date: 2005/03/22 18:45:01 &#36;". Since this line will 
joachim99@69: be different in every version of the file, it would require manual interaction 
joachim99@69: during the merge.
joachim99@69: </para><para>
joachim99@73: &kdiff3; offers automatic merge for these items. For simple lines that match the 
joachim99@73: "Auto merge regular expression"-option in all input-files &kdiff3; will choose 
joachim99@69: the line from B or - if available - from C. (Additionally it is necessary that the lines 
joachim99@69: in question line up in the comparison and the previous line contains no conflict.)
joachim99@69: This auto merge can either be run immediately after a merge starts (activate the option 
joachim99@69: "Run regular expression auto merge on merge start") or later via the merge 
joachim99@69: menu "Run Regular Expression Auto Merge".
joachim99@69: </para><para>
joachim99@69: Automatic merge for version control history (also called "log") is also supported.
joachim99@69: The history automerge can either run immediately when the merge starts by activating the 
joachim99@69: option "Merge version control history on merge start" or later via the merge menu 
joachim99@69: "Automatically Solve History Conflicts".
joachim99@69: </para><para>
joachim99@73: Usually the version control history begins with a line containing the keyword "&#36;Log&#36;".
joachim99@69: This must be matched by the "History start regular expression"-option.
joachim99@73: &kdiff3; detects which subsequent lines are in the history by analysing the leading characters 
joachim99@77: that came before the "&#36;Log&#36;"-keyword. If the same "leading comment"-characters also appears in the following
joachim99@69: lines, then they are also included in the history.
joachim99@69: </para><para>
joachim99@69: During each check-in the VCS writes a unique line specifying version-, date- and time-information 
joachim99@69: followed by lines with user comments.
joachim99@69: These lines form one history-entry. This history section grows with every check-in and the 
joachim99@69: most recent entries appear at the top (after the history start line). 
joachim99@69: </para><para>
joachim99@69: When for parallel development two or more developers check-in a branch of the file then 
joachim99@69: the merge history will contain several entries that appear as conflicts during the merge 
joachim99@73: of the branches. Since merging these can become very tedious, &kdiff3; offers support with two 
joachim99@69: possible strategies: Just insert the history information from both contributors at the top
joachim99@69: or sort the history information by a user defined key.
joachim99@69: </para><para>
joachim99@73: The just-insert-all-entries-method is easier to configure. &kdiff3; just needs a method to
joachim99@69: detect, which lines belong to one history entry. Most VCS insert an empty line after each
joachim99@73: history entry. If there are no other empty lines, this is a sufficient criterion for &kdiff3;.
joachim99@69: Just set an empty "History entry start regular expression". If the empty line criterion 
joachim99@69: isn't sufficient, you can specify a regular expression to detect the history entry start.
joachim99@69: </para><para>
joachim99@73: Note that &kdiff3; will remove duplicate history entrys. If a history entry appeared several times
joachim99@69: in the history of a input file, only one entry will remain in the output.
joachim99@69: </para><para>
joachim99@69: If you want to sort the history, then you have to specify how the sort key should be built.
joachim99@69: Use parentheses in the "History entry start regular expression" to group parts of the regular 
joachim99@69: expression that should later be used for the sort key.
joachim99@69: Then specify the "History entry start sort key order" specifying a comma "," separated list of 
joachim99@69: numbers referring to the position of the group in the regular expression.
joachim99@69: </para><para>
joachim99@69: Because this is not so easy to get right immediately, you are able to test and improve
joachim99@69: the regular expressions and key-generation in a dedicated dialog by pressing the 
joachim99@69: "Test your regular expressions"-button.
joachim99@69: </para><para>Example: Assume a history that looks like this:
joachim99@69: <screen>
joachim99@69: /**************************************************************************
joachim99@73: ** HISTORY:    &#36;Log: \toms_merge_main_view\MyApplication\src\complexalgorithm.cpp &#36;
joachim99@69: **
joachim99@69: **     \main\integration_branch_12   2 Apr 2001 10:45:41   tom
joachim99@69: **  Merged branch simon_branch_15.
joachim99@69: **
joachim99@69: **     \main\henry_bugfix_branch_7\1   30 Mar 2001 19:22:05   henry
joachim99@69: **  Improved the speed for subroutine convertToMesh().
joachim99@69: **  Fixed crash.
joachim99@69: **************************************************************************/
joachim99@69: </screen>
joachim99@73: The history start line matches the regular expression ".*\&#36;Log.*\&#36;.*". Then follow 
joachim99@69: the history entries.
joachim99@69: </para><para>
joachim99@73: The line with the "&#36;Log&#36;"-keyword begins with two "*" after which follows a space. 
joachim99@73: &kdiff3; uses the first non-white-space string as "leading comment" and assumes that
joachim99@69: the history ends in the first line without this leading comment. In this example the
joachim99@69: last line ends with a string that also starts with two "*", but instead of a space 
joachim99@69: character more "*" follow. Hence this line ends the history.
joachim99@69: </para><para>
joachim99@69: If history sorting isn't required then the history entry start line regular expression
joachim99@69: could look like this. (This line is split in two because it wouldn't fit otherwise.)
joachim99@69: <screen>
joachim99@69: \s*\\main\\\S+\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)
joachim99@69:  [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.*
joachim99@69: </screen>
joachim99@69: For details about regular expressions please see the
joachim99@69: <ulink url="http://doc.trolltech.com/3.3/qregexp.html#details">regular expression documentation by Trolltech</ulink>.
joachim99@69: Note that "\s" (with lowercase "s") matches any white space and "\S" (with uppercase "S") matches any non-white-space.
joachim99@69: In our example the history entry start contains first the version info with reg. exp. "\\main\\\S+", the date consisting of day "[0-9]+", month "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)" and year "[0-9][0-9][0-9][0-9]", the time "[0-9][0-9]:[0-9][0-9]:[0-9][0-9]" and finally the developers login name ".*".
joachim99@77: </para><para>
joachim99@77: Note that the "leading comment"-characters (in the example "**") will already be removed by &kdiff3; 
joachim99@69: before trying to match, hence the regular expression begins with a match for none or more white-space characters "\s*".
joachim99@77: Because comment characters can differ in each file (e.g. C/C++ uses other comment characters than a Perl script)
joachim99@77: &kdiff3; takes care of the leading comment characters and you should not specify them in the regular expression.
joachim99@69: </para><para>
joachim99@69: If you require a sorted history. Then the sortkey must be calculated. For this the 
joachim99@69: relevant parts in the regular expression must be grouped by parentheses. 
joachim99@69: (The extra parentheses can also stay in if history sorting is disabled.)
joachim99@69: <screen>
joachim99@69: \s*\\main\\(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)
joachim99@69:  ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*)
joachim99@69: </screen>
joachim99@69: The parentheses now contain 1. version info, 2. day, 3. month, 4. year, 5. time, 6. name. 
joachim99@69: But if we want to sort by date and time, we need to construct a key with the elements in a different order of appearance:
joachim99@69: First the year, followed by month, day, time, version info and name. Hence the sortkey order to specify is "4,3,2,5,1,6".
joachim99@69: </para><para>
joachim99@73: Because  month names aren't good for sorting ("Apr" would be first) &kdiff3; detects in which order 
joachim99@69: the month names were given and uses that number instead ("Apr"->"04"). 
joachim99@69: And if a pure number is found it will be transformed to a 4-digit value with leading zeros for sorting.
joachim99@69: Finally the resulting sort key for the first history entry start line will be:
joachim99@69: <screen>
joachim99@69: 2001 04 0002 10:45:41 integration_branch_12   tom 
joachim99@69: </screen>
joachim99@69: </para><para>
joachim99@77: For more information also see <link linkend="mergeoptions">Merge Settings</link>.
joachim99@11: </para>
joachim99@69: </sect2>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="navigation"><title>Navigation And Editing</title>
joachim99@11: <para>
joachim99@11:    Much navigation will be done with the scroll bars and the mouse but
joachim99@11:    you  can also navigate with the keys. If you click into either window then
joachim99@11:    you  can use the cursor buttons left, right, up, down, page up, page down,
joachim99@11:    home,  end, ctrl-home, ctrl-end as you would in other programs. The overview-column
joachim99@11:    next to the vertical scroll bar of the input files can also be used  for
joachim99@11:    navigating by clicking into it.
joachim99@11: </para><para>
joachim99@11:    You can also use the wheel mouse to scroll up and down.
joachim99@11: </para><para>
joachim99@11:    In the merge output editor you can also use the other keys for editing.
joachim99@11:    You can toggle between insert and overwrite mode with the insert key. (Default
joachim99@11:    is insert-mode.)
joachim99@11: </para><para>
joachim99@11:    A left-mouse-button-click into any summary column will synchronise all
joachim99@11:    windows to show the beginning of the same group of lines (as explained
joachim99@69:    in section <link linkend="synchronise_views">"Setting The Current Group And Synchronising Merge And Diff View Position"</link>).
joachim99@11: </para><para>
joachim99@69:    The button bar also contains nine navigation buttons with which you can
joachim99@11:    jump to the current/first/last difference, to the next/previous difference
joachim99@11:    (ctrl-down/ctrl-up), to the next/previous conflict (ctrl-pgdown/ctrl-pgup),
joachim99@73:    or to the next/previous unsolved conflict. Note that for &kdiff3; a "conflict"
joachim99@11:    that was not automatically solved at the start of the merge stays a "conflict"
joachim99@11:    even if it is solved. Hence the necessity to distinguish "unsolved conflicts".
joachim99@69: </para>
joachim99@69: <sect2 id="autoadvance"><title>Auto-Advance</title>
joachim99@69: <para>
joachim99@11:    There also is a button "Automatically go to next unsolved conflict after
joachim99@11:    source selection" (Auto-Advance). If you enable this, then, when one source
joachim99@73:    is selected, &kdiff3; will jump to and select the next unsolved conflict
joachim99@11:    automatically. This can help when you always want to choose one source only.
joachim99@11:    When you need both sources, or you want to edit after selecting, then you
joachim99@11:    probably want to switch this off. Before proceeding to the next unsolved conflict
joachim99@73:    &kdiff3; shows you the effect of your choice for a short time. This delay is
joachim99@11:    adjustable in the Diff- &amp; Merge-Settings: You can
joachim99@11:    specify the "Auto-Advance delay" in milli seconds between 0 and 2000. Hint:
joachim99@11:    Tired of many clicks? - Use a small Auto-Advance-delay and the shortcuts
joachim99@11:    Ctrl-1/2/3 to select A/B/C for many conflicts.
joachim99@11: </para>
joachim99@69: </sect2>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="selections"><title>Select, Copy And Paste</title>
joachim99@11: <para>
joachim99@11:    The input windows don't show a cursor, so selections must be made
joachim99@11:    with   the mouse by clicking with the left mouse button at the start, holding
joachim99@11:    down   the mousebutton and moving to the end, where you release the mouse
joachim99@11:    button   again. You can also select a word by double clicking it. In the merge
joachim99@11:    output   editor you can also select via the keyboard by holding the "shift"-button
joachim99@11:    and navigation with the cursor keys.
joachim99@11: </para><para>
joachim99@69:    If the selection exceeds the visible range you can move the mouse over the 
joachim99@73:    window borders which causes &kdiff3; to scroll in that direction. 
joachim99@69: </para><para>
joachim99@69:    For very large selections you can also use the navigation keys while holding down 
joachim99@69:    the mouse. E.g. use page up and page down to quickly go to a certain position. At the 
joachim99@69:    end position release the mouse button.
joachim99@69: </para><para>
joachim99@69:    In order to select everything in the current window use menu "Edit"->"Select All" (Ctrl-A).
joachim99@69: </para><para>
joachim99@11:    To copy to the clipboard you must press the "Copy"-button (Ctrl-C or Ctrl-Insert).
joachim99@69:    But there exists an option "Auto Copy Selection". If this is enabled,
joachim99@69:    then whatever you select is copied immediately and you don't need to explicitely
joachim99@11:    copy. But pay attention when using this because the contents of the clipboard
joachim99@69:    might then be destroyed accidentally.
joachim99@11: </para><para>
joachim99@11:    "Cut" (Ctrl-X or Shift-Delete) copies to the clipboard and deletes the
joachim99@69:    selected text.
joachim99@69: </para><para>
joachim99@69:    "Paste" (Ctrl-V or Shift-Insert) inserts the text in the clipboard at the 
joachim99@69:    cursorposition or over the current selection.
joachim99@69:    If you paste to either diff input window the contents of the clipboard will 
joachim99@69:    be shown in that window and the comparison will restart immediately. This is 
joachim99@69:    useful if you want to quickly grab a piece of text from somewhere and 
joachim99@69:    compare it with something else without first creating files.
joachim99@11: </para>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="saving"><title>Saving</title>
joachim99@11: <para>
joachim99@11:    Saving will only be allowed, when all conflicts were solved. If the file
joachim99@11:    already exists and the "Backup files"-option is enabled then the existing
joachim99@11:    file will be renamed with an ".orig"-extension, but if such a file exists
joachim99@11:    it will be deleted. When you exit or start another diff-analysis and data
joachim99@73:    wasn't saved yet, then &kdiff3; will ask if you want to save, cancel or proceed
joachim99@73:    without saving. (&kdiff3; does not catch any signals. So if you "kill" &kdiff3;
joachim99@11:    then your data will be lost.)
joachim99@11: </para><para>
joachim99@11:    Line endings are saved according to the normal method on the underlying
joachim99@11:    operating system. For Unices each line ends with an linefeed-character "\n",
joachim99@11:    while for Win32-based systems each line ends with a carriage-return + a linefeed
joachim99@73:    "\r\n". &kdiff3; does not preserve the line-endings of the input files, which
joachim99@73:    also means that you shouldn't use &kdiff3; with binary files.
joachim99@11: </para>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="find"><title>Finding Strings</title>
joachim99@11: <para>
joachim99@73:    You can search for a string in any text-window of &kdiff3;. The "Find ..."-command
joachim99@11:    (Ctrl-F) in the Edit-menu opens a dialog that lets you specify the string
joachim99@11:    to search for. You can also select the windows which should be searched.
joachim99@11:    Searching will always start at the top. Use the "Find Next"-command (F3)
joachim99@69:    to proceed to the next occurrence. If you select to search several windows then the first
joachim99@11:    window will be searched from top to bottom before the search starts in the next
joachim99@11:    window at the top again, etc.
joachim99@11: </para>
joachim99@11: </sect1>
joachim99@11: 
joachim99@69: <sect1 id="printing"><title>Printing</title>
joachim99@69: <para>
joachim99@73:    &kdiff3; supports printing for textfile differences. The "Print..."-command (Ctrl-P) 
joachim99@69:    in the File-menu opens a dialog that allows you to select the printer and to adjust
joachim99@69:    other options.
joachim99@69: </para><para>
joachim99@69:    There are several possibilities to adjust the range. Due to different printing 
joachim99@69:    dialogs on different operating systems, the method to achieve certain range selections varies.
joachim99@69: </para>
joachim99@69: <variablelist>
joachim99@69:    <varlistentry><term>All:</term><listitem><para>Print everything.</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term>Current:</term><listitem><para>Print a page starting at the first visible line in the window. 
joachim99@69:        (On systems without this option this can be achived by specifying page number 10000 for printing.)</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term>Selection:</term><listitem><para>
joachim99@69:        Before choosing to print select text with the mouse (like for copy and paste) 
joachim99@69:        in one of the diff input windows to define the start and end line. If no text 
joachim99@69:        in one of the diff input windows was selected, then this won't be an available 
joachim99@69:        choice. (On systems without this option this can be achived by specifying page 
joachim99@69:        number 9999 for printing.)</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term>Range:</term><listitem><para>Specify the first and last page.
joachim99@69:        </para></listitem></varlistentry>
joachim99@69: </variablelist>
joachim99@69: <para>
joachim99@69:    Other important options for printing will be taken from the normal options:
joachim99@69: </para><itemizedlist>
joachim99@69:    <listitem><para>Font, font size</para></listitem>
joachim99@69:    <listitem><para>Show line numbers</para></listitem>
joachim99@69:    <listitem><para>Word wrap</para></listitem>
joachim99@69:    <listitem><para>Colors</para></listitem>
joachim99@69:    <listitem><para>etc.</para></listitem>
joachim99@69: </itemizedlist>
joachim99@69: <para>
joachim99@69:    Landscape formatting is also recommended for printing.
joachim99@69: </para>
joachim99@69: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="options"><title>Options</title>
joachim99@11: <para>
joachim99@11:    Options and the recent-file-list will be saved when you exit the program,
joachim99@73:    and reloaded when you start it. (Menu Settings->Configure &kdiff3; ...)
joachim99@11: </para>
joachim99@11: <sect2><title>Font</title>
joachim99@11: <para>
joachim99@11:    Select a fixed width font. (On some systems this dialog will also
joachim99@11:    present    variable width fonts, but you should not use them.)
joachim99@11: </para>
joachim99@11: <variablelist>
joachim99@11:    <varlistentry><term><emphasis>Italic Font for Deltas:</emphasis></term><listitem><para> If you select this, then text differences
joachim99@11:        will be drawn with the italic version of the selected font. If the font
joachim99@11:        doesn't  support italic, then this does nothing.</para>
joachim99@11:    </listitem></varlistentry>
joachim99@11: </variablelist>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>Colors</title>
joachim99@11: <variablelist>
joachim99@11:    <varlistentry><term><emphasis>Foreground color:</emphasis></term><listitem><para> Usually black. </para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Background color:</emphasis></term><listitem><para> Usually white. </para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Diff Background color:</emphasis></term><listitem><para> Usually light gray. </para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Color A:</emphasis></term><listitem><para> Usually dark blue. </para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Color B:</emphasis></term><listitem><para> Usually dark green. </para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Color C:</emphasis></term><listitem><para> Usually dark magenta. </para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Conflict Color:</emphasis></term><listitem><para> Usually red.</para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Current range background color:</emphasis></term><listitem><para> Usually light yellow.</para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Current range diff background color:</emphasis></term><listitem><para> Usually dark yellow.</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Color for manually selected diff ranges:</emphasis></term><listitem><para> Usually orange.</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Newest file color in directory comparison:</emphasis></term><listitem><para> Usually green.</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Oldest file color in directory comparison:</emphasis></term><listitem><para> Usually red.</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Middle age file color in directory comparison:</emphasis></term><listitem><para> Usually dark yellow.</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Color for missing files in directory comparison:</emphasis></term><listitem><para> Usually black.</para></listitem></varlistentry>
joachim99@11: </variablelist>
joachim99@11: <para>
joachim99@69:    Changing the colors for directory comparison will be effective only when starting the next directory comparison.
joachim99@69: </para>
joachim99@69: <para>
joachim99@11:    On systems with only 16 or 256 colors some colors are not available in pure
joachim99@11:    form. On such systems the "Defaults"-button will choose a pure color.
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>Editor Settings</title>
joachim99@11: <variablelist>
joachim99@11:    <varlistentry><term><emphasis>Tab inserts spaces:</emphasis></term><listitem><para> If this is disabled and you press the
joachim99@11:       tabulator key,   a tab-character is inserted, otherwise the appropriate
joachim99@11:       amount  of characters   is inserted.</para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>   Tab size:</emphasis></term><listitem><para> Can be adjusted for your specific needs. Default is 8. </para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>   Auto indentation:</emphasis></term><listitem><para> When pressing Enter or Return the indentation
joachim99@11:       of the previous  line is used for the new line. </para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>   Auto copy selection:</emphasis></term><listitem><para> Every selection is immediately copied
joachim99@11:       to the clipboard   when active and you needn't explicitely copy it. </para></listitem></varlistentry>
joachim99@66:    <varlistentry><term><emphasis>   Line end style:</emphasis></term><listitem><para> When saving you can select what line 
joachim99@66:       end style you prefer. The default setting is the common choice for the used operating system. </para></listitem></varlistentry>
joachim99@11: </variablelist>
joachim99@11: </sect2>
joachim99@11: 
joachim99@77: <sect2 id="diffoptions"><title>Diff Settings</title>
joachim99@11: <para>
joachim99@73:    When comparing files, &kdiff3; first it tries to match lines that are equal
joachim99@11:    in all input files. Only during this step it might ignore white space. The
joachim99@11:    second step compares each line. In this step white space will not be ignored.
joachim99@11:    Also during the merge white space will not be ignored.
joachim99@11: </para>
joachim99@11: 
joachim99@11: <variablelist>
joachim99@11:    <varlistentry><term><emphasis>Preserve Carriage Return:</emphasis></term><listitem><para> Some editors (on some systems) save
joachim99@11:       carriage return '\r' and linefeed '\n'-characters at the end of line, while
joachim99@73:       others will only save the linefeed '\n'. Usually &kdiff3; ignores the carriage
joachim99@11:       return, but then files that don't have equal sizes, look equal in side by
joachim99@11:       side comparison. When this option is on, then the carriage return characters
joachim99@11:       are made visible but are treated as white space. This option must be off
joachim99@11:       during a merge. Default is off.</para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Ignore numbers:</emphasis></term><listitem><para> Default is off. Number characters ('0'-'9', '.', '-')
joachim99@11:       will be ignored  in the first  part of the analysis in which the line matching is
joachim99@11:       done. In the result the differences will be shown nevertheless, but they are treated
joachim99@11:       as white space.
joachim99@11:    </para></listitem></varlistentry>
joachim99@51:    <varlistentry><term><emphasis>Ignore C/C++ comments:</emphasis></term><listitem><para> Default is off.
joachim99@51:       Changes in comments will be treated like changes in white space.
joachim99@51:    </para></listitem></varlistentry>
joachim99@66:    <varlistentry><term><emphasis>Ignore case:</emphasis></term><listitem><para>  Default is off. 
joachim99@66:       Case-differences of characters (like 'A' vs. 'a') will be treated like changes in white space.
joachim99@11:    </para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Preprocessor-Command:</emphasis></term><listitem><para>
joachim99@66:    See <link linkend="preprocessors">next section</link>.
joachim99@11:    </para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Line-Matching Preprocessor-Command:</emphasis></term><listitem><para>
joachim99@66:    See <link linkend="preprocessors">next section</link>.
joachim99@11:    </para></listitem></varlistentry>
joachim99@51:    <varlistentry><term><emphasis>Try Hard:</emphasis></term><listitem><para>
joachim99@51:       Try hard to find an even smaller delta. (Default is on.) This will probably
joachim99@11:       be effective for complicated and big files. And slow for very big files.
joachim99@11:    </para></listitem></varlistentry>
joachim99@77: </variablelist>
joachim99@77: </sect2>
joachim99@77: 
joachim99@77: <sect2 id="mergeoptions"><title>Merge Settings</title>
joachim99@77: <variablelist>
joachim99@11:    <varlistentry><term><emphasis>Auto Advance Delay (ms):</emphasis></term><listitem><para> When in auto-advance-mode this setting specifies
joachim99@11:       how long to show the result of the selection before jumping to the next unsolved
joachim99@11:       conflict.
joachim99@11:    </para></listitem></varlistentry>
joachim99@51:    <varlistentry><term><emphasis>White space 2/3-file merge default:</emphasis></term><listitem><para>
joachim99@51:       Automatically solve all white-space conflict by choosing the specified file.
joachim99@73:       (Default is manual choice.) Useful if white space really isn't important in many files.
joachim99@51:       If you need this only occasionally better use "Choose A/B/C For All Unsolved Whitespace Conflicts"
joachim99@51:       in the merge menu. Note that if you enable either "Ignore numbers" or "Ignore C/C++ comments"
joachim99@51:       then this auto-choice also applies for conflicts in numbers or comments.
joachim99@51:    </para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Auto merge regular expression:</emphasis></term><listitem><para>
joachim99@73:       Regular expression for lines where &kdiff3; should automatically choose one source. See also <link linkend="vcskeywordsmergesupport">Automatic Merge ...</link>
joachim99@69:    </para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Run regular expression auto merge on merge start:</emphasis></term><listitem><para>
joachim99@73:       If activated &kdiff3; runs the automatic merge using the "Auto merge regular expression" when a merge is started.
joachim99@69:    </para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>History start regular expression:</emphasis></term><listitem><para>
joachim99@69:       Regular expression for the start of the merge history entry.
joachim99@73:       Usually this line contains the "&#36;Log&#36;"-keyword.
joachim99@73:       Default value: ".*\&#36;Log.*\&#36;.*"
joachim99@69:    </para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>History entry start regular expression:</emphasis></term><listitem><para>
joachim99@69:       A merge history entry consists of several lines.
joachim99@69:       Specify the regular expression to detect the first line (without the leading comment).
joachim99@69:       Use parentheses to group the keys you want to use for sorting.
joachim99@73:       If left empty, then &kdiff3; assumes that empty lines separate history entries.
joachim99@69:       See also <link linkend="vcskeywordsmergesupport">Automatic Merge ...</link>
joachim99@69:    </para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>History merge sorting:</emphasis></term><listitem><para>
joachim99@69:       Enable version control history sorting.
joachim99@69:    </para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>History entry start sort key order:</emphasis></term><listitem><para>
joachim99@69:       Each parentheses used in the regular expression for the history start entry
joachim99@69:       groups a key that can be used for sorting.
joachim99@69:       Specify the list of keys (that are numbered in order of occurrence
joachim99@69:       starting with 1) using ',' as separator (e.g. "4,5,6,1,2,3,7").
joachim99@69:       If left empty, then no sorting will be done.
joachim99@69:       See also <link linkend="vcskeywordsmergesupport">Automatic Merge ...</link>
joachim99@69:    </para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Merge version control history on merge start:</emphasis></term><listitem><para>
joachim99@73:       If activated &kdiff3; runs the automatic history merging using aforementioned options when a merge is started.
joachim99@69:    </para></listitem></varlistentry>
joachim99@77:    <varlistentry><term><emphasis>Max number of history entries:</emphasis></term><listitem><para>
joachim99@77:       &kdiff3; truncates the history list after the specified number of entries. Use -1 to avoid truncation. (Default is -1).
joachim99@77:    </para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Test your regular expressions</emphasis></term><listitem><para>
joachim99@69:       This button shows a dialog that allows you to improve and test the regular expressions above.
joachim99@69:       Just copy the respective data from your files into the example lines. The "Match results" 
joachim99@69:       will immediately show whether the match succeeds or not.
joachim99@69:       The "Sort key result" will display the key used for history merge sorting.
joachim99@69:    </para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Irrelevant merge command:</emphasis></term><listitem><para>
joachim99@73:       Specify a command of your own that should be called when &kdiff3; detects 
joachim99@69:       that for a three file merge the file from B doesn't contribute any 
joachim99@69:       relevant data that isn't already contained in the file from C.
joachim99@69:       The command is called with the three filenames as parameters.
joachim99@69:       Data matched by the "Auto merge regular expression" or in the 
joachim99@69:       history isn't considered relevant.
joachim99@69:    </para></listitem></varlistentry>
joachim99@11: </variablelist>
joachim99@11: 
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>Directory Merge</title>
joachim99@11: <para>
joachim99@11:    These options are concerned with scanning the directory and handling the
joachim99@11:    merge: See the <link linkend="dirmergeoptions">Directory Comparison/Merge
joachim99@11:    Docs</link> for details.
joachim99@11: </para><para>
joachim99@11: Yet there is one option here that is also relevant for saving single files:
joachim99@11: </para>
joachim99@11: <variablelist>
joachim99@11:    <varlistentry><term><emphasis>Backup files:</emphasis></term><listitem><para> When a file is saved and an older version already
joachim99@11:       exists, then the original version will be renamed with an ".orig" extension.
joachim99@11:       If an old backup file with ".orig" extension already exists then this will
joachim99@11:       be deleted without backup.
joachim99@11:    </para></listitem></varlistentry>
joachim99@11: </variablelist>
joachim99@11: </sect2>
joachim99@11: 
joachim99@68: <sect2><title>Regional and Language Options</title>
joachim99@68:   <variablelist>
joachim99@73:     <varlistentry><term><emphasis>Language:</emphasis></term><listitem><para>Adjust the language of the user interface. Changing this option doesn't affect the running program. You have to exit and restart &kdiff3; so that the language is changed. (This option is not available in the KDE version of &kdiff3; because the language is adjustable in the global KDE settings.) 
joachim99@68: 	</para></listitem></varlistentry>
joachim99@68:     <varlistentry><term><emphasis>Use the same encoding for everything:</emphasis></term><listitem><para> The following encoding options can be adjusted separately for each item or if this option is true, all values will take the first value.
joachim99@68: 	</para></listitem></varlistentry>
joachim99@68:     <varlistentry><term><emphasis>Local Encoding:</emphasis></term><listitem><para>Above the codec-selectors appears a note that tells you what the local encoding is. (This is not adjustable but for your information just in case you don't know your local encoding, but need to select it.)
joachim99@68: 	</para></listitem></varlistentry>
joachim99@68:     <varlistentry><term><emphasis>File Encoding for A/B/C:</emphasis></term><listitem><para> Adjust the file encoding for input files. This has an effect on how the special characters are interpreted. Since you can adjust each codec separately you can even compare and merge files that were saved using different codecs.
joachim99@68: 	</para></listitem></varlistentry>
joachim99@68:     <varlistentry><term><emphasis>File Encoding for Merge Output and Saving:</emphasis></term><listitem><para> When you have edited a file, then you can adjust which encoding will be used when saving to disk.
joachim99@68: 	</para></listitem></varlistentry>
joachim99@68:     <varlistentry><term><emphasis>File Encoding for Preprocessor Files:</emphasis></term><listitem><para>When you define preprocessors then they might not be able to operate on your codec. (e.g.: Your files are 16-bit-unicode and your preprocessor can only take 8-bit-ascii.) With this option you can define the encoding of preprocessor output.
joachim99@68: 	</para></listitem></varlistentry>
joachim99@73:     <varlistentry><term><emphasis>Right To Left Language:</emphasis></term><listitem><para>Some languages are written right to left. When this option is enabled, &kdiff3; draws the text from right to left in the diff input windows and in the merge output window. Note that if you start &kdiff3; with the command line option "--reverse" then all layouting will be done right to left too. (This is a feature provided by Qt.) This documentation was written assuming that "Right To Left Language" or reverse layout are disabled. So some references to "left" or "right" must be replaced by their respective counterpart if you use these options.
joachim99@68: 	</para></listitem></varlistentry>
joachim99@68: 
joachim99@68:   </variablelist>
joachim99@68: </sect2>
joachim99@68: 
joachim99@11: <sect2><title>Miscellaneous</title>
joachim99@11: <para>(These options and actions are available in menus or the buttonbar.)</para>
joachim99@11: <variablelist>
joachim99@11:   <varlistentry><term><emphasis>Show line numbers:</emphasis></term><listitem><para> You can select if line numbers should be
joachim99@11:      shown for the input files.</para></listitem></varlistentry>
joachim99@11:   <varlistentry><term><emphasis>Show space and tabulator characters for differences:</emphasis></term><listitem><para> Sometimes
joachim99@11:      the visible spaces and tabs are disturbing. You can turn this off.</para></listitem></varlistentry>
joachim99@51:   <varlistentry><term><emphasis>Show white space:</emphasis></term><listitem><para> Turn this off to suppress
joachim99@51:       any highlighting of white-space-only changes in the text or overview-columns.
joachim99@51:       (Note that this also applies to changes in numbers or comments if the options "Ignore numbers"
joachim99@51:       or "Ignore C/C++ comments" are active.)</para></listitem></varlistentry>
joachim99@66:   <varlistentry><term><emphasis>Overview options:</emphasis></term><listitem><para>
joachim99@66:      These choices are only available when you compare three files. In normal mode all
joachim99@66:      differences are shown in one color-coded overview-column. But sometimes you are  
joachim99@66:      especially interested in the differences between only two of these three files.
joachim99@66:      Selecting "A vs. B", "A vs. C" or "B vs. C"-overview will show a second overview 
joachim99@66:      column with the required information next to the normal overview.
joachim99@66:   </para></listitem></varlistentry>
joachim99@66:   <varlistentry><term><emphasis>Word wrap diff windows:</emphasis></term><listitem><para>
joachim99@66:      Wrap lines when their length would exceed the width of a window.
joachim99@66:   </para></listitem></varlistentry>
joachim99@11:   <varlistentry><term><emphasis>Show Window A/B/C:</emphasis></term><listitem><para> Sometimes you want to use the space on
joachim99@11:       the screen better for long lines. Hide the windows that are not important.
joachim99@11:       (In the Windows-menu.)</para></listitem></varlistentry>
joachim99@11:   <varlistentry><term><emphasis>Toggle Split Orientation:</emphasis></term><listitem><para>
joachim99@11:       Switch between diff windows shown next to each other (A left of B left of C) or above
joachim99@11:       each other (A above B above C). This should also help for long lines. (In the Windows-menu.)
joachim99@11:       </para></listitem></varlistentry>
joachim99@51:   <varlistentry><term><emphasis>Start a merge quickly:</emphasis></term><listitem><para>
joachim99@51:       Sometimes you are viewing the deltas and decide to merge.
joachim99@51:       <inlinemediaobject><imageobject><imagedata fileref="merge_current.png" format="PNG"/></imageobject></inlinemediaobject>
joachim99@11:       "Merge current file" in the Directory-menu also works if you only compare
joachim99@11:       two files. A single click starts the merge and uses the filename of the last
joachim99@11:       input-file as the default output filename. (When this is used to restart
joachim99@11:       a merge, then the output filename will be preserved.)</para></listitem></varlistentry>
joachim99@11: </variablelist>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2 id="shortcuts"><title>Configuring Keyboard-Shortcuts</title>
joachim99@11: <para>
joachim99@11:    Currently only the KDE-version supports user-configurable keyboard-shortcuts.
joachim99@11:    (Menu Settings->Configure Shortcuts...)
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@11: </sect1>
joachim99@66: 
joachim99@66: <sect1 id="preprocessors"><title>Preprocessor Commands</title>
joachim99@66: <para>
joachim99@73: &kdiff3; supports two preprocessor options.
joachim99@66: </para><para>
joachim99@66: <variablelist>
joachim99@66:    <varlistentry><term><emphasis>Preprocessor-Command:</emphasis></term><listitem><para>
joachim99@66:       When any file is read, it will be piped through this external command.
joachim99@66:       The output of this command will be visible instead of the original file.
joachim99@66:       You can write your own preprocessor that fulfills your specific needs.
joachim99@66:       Use this to cut away disturbing parts of the file, or to automatically
joachim99@66:       correct the indentation etc.
joachim99@66:    </para></listitem></varlistentry>
joachim99@66:    <varlistentry><term><emphasis>Line-Matching Preprocessor-Command:</emphasis></term><listitem><para>
joachim99@66:       When any file is read, it will be piped through this external command. If
joachim99@66:       a preprocessor-command (see above) is also specified, then the output of the
joachim99@66:       preprocessor is the input of the line-matching preprocessor.
joachim99@66:       The output will only be used during the line matching phase of the analysis.
joachim99@66:       You can write your own preprocessor that fulfills your specific needs.
joachim99@66:       Each input line must have a corresponding output line.
joachim99@66:    </para></listitem></varlistentry>
joachim99@66: </variablelist>
joachim99@66: </para>
joachim99@66: <para>
joachim99@66: The idea is to allow the user greater flexibility while configuring the diff-result.
joachim99@66: But this requires an external program, and many users don't want to write one themselves.
joachim99@66: The good news is that very often <command>sed</command> or <command>perl</command> 
joachim99@66: will do the job. 
joachim99@66: </para>
joachim99@66: <para>Example: Simple testcase: Consider file a.txt (6 lines):
joachim99@66: <screen>
joachim99@66:       aa
joachim99@66:       ba
joachim99@66:       ca
joachim99@66:       da
joachim99@66:       ea
joachim99@66:       fa
joachim99@66: </screen>
joachim99@66: And file b.txt (3 lines):
joachim99@66: <screen>
joachim99@66:       cg
joachim99@66:       dg
joachim99@66:       eg
joachim99@66: </screen>
joachim99@66: Without a preprocessor the following lines would be placed next to each other:
joachim99@66: <screen>
joachim99@66:       aa - cg
joachim99@66:       ba - dg
joachim99@66:       ca - eg
joachim99@66:       da
joachim99@66:       ea
joachim99@66:       fa
joachim99@66: </screen>
joachim99@66: This is probably not wanted since the first letter contains the actually interesting information.
joachim99@66: To help the matching algorithm to ignore the second letter we can use a line matching preprocessor 
joachim99@66: command, that replaces 'g' with 'a':
joachim99@66: <screen>
joachim99@66:    <command>sed</command> 's/g/a/'
joachim99@66: </screen>
joachim99@66: With this command the result of the comparison would be:
joachim99@66: <screen>
joachim99@66:       aa
joachim99@66:       ba
joachim99@66:       ca - cg
joachim99@66:       da - dg
joachim99@66:       ea - eg
joachim99@66:       fa
joachim99@66: </screen>
joachim99@66: Internally the matching algorithm sees the files after running the line matching preprocessor,
joachim99@66: but on the screen the file is unchanged. (The normal preprocessor would change the data also on 
joachim99@66: the screen.)
joachim99@66: </para>
joachim99@66: 
joachim99@66: <sect2 id="sedbasics"><title><command>sed</command> Basics</title>
joachim99@66: <para>
joachim99@66: This section only introduces some very basic features of <command>sed</command>. For more
joachim99@66: information see <ulink url="info:/sed">info:/sed</ulink> or 
joachim99@66: <ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html">
joachim99@66: http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink>.
joachim99@66: A precompiled version for Windows can be found at <ulink url="http://unxutils.sourceforge.net">
joachim99@66: http://unxutils.sourceforge.net</ulink>.
joachim99@66: Note that the following examples assume that the <command>sed</command>-command is in some 
joachim99@66: directory in the PATH-environment variable. If this is not the case, you have to specify the full absolute
joachim99@69: path for the command. 
joachim99@66: </para>
joachim99@69: <note><para>Also note that the following examples use the single quotation mark (') which won't work for Windows. 
joachim99@69: On Windows you should use the double quotation marks (") instead.</para></note>
joachim99@66: <para>
joachim99@66: In this context only the <command>sed</command>-substitute-command is used:
joachim99@66: <screen>
joachim99@66:    <command>sed</command> 's/<replaceable>REGEXP</replaceable>/<replaceable>REPLACEMENT</replaceable>/<replaceable>FLAGS</replaceable>'
joachim99@66: </screen>
joachim99@73: Before you use a new command within &kdiff3;, you should first test it in a console.
joachim99@66: Here the <command>echo</command>-command is useful. Example:
joachim99@66: <screen>
joachim99@66:    <command>echo</command> abrakadabra | <command>sed</command> 's/a/o/'
joachim99@66:    -> obrakadabra
joachim99@66: </screen>
joachim99@66: This example shows a very simple sed-command that replaces the first occurance 
joachim99@66: of "a" with "o". If you want to replace all occurances then you need the "g"-flag:
joachim99@66: <screen>
joachim99@66:    <command>echo</command> abrakadabra | <command>sed</command> 's/a/o/g'
joachim99@66:    -> obrokodobro
joachim99@66: </screen>
joachim99@66: The "|"-symbol is the pipe-command that transfers the output of the previous 
joachim99@66: command to the input of the following command. If you want to test with a longer file
joachim99@66: then you can use <command>cat</command> on Unix-like systems or <command>type</command> 
joachim99@66: on Windows-like systems. <command>sed</command> will do the substitution for each line.
joachim99@66: <screen>
joachim99@66:    <command>cat</command> <replaceable>filename</replaceable> | <command>sed</command> <replaceable>options</replaceable>
joachim99@66: </screen>
joachim99@66: </para>
joachim99@66: </sect2>
joachim99@73: <sect2 id="sedforkdiff3"><title>Examples For <command>sed</command>-Use In &kdiff3;</title>
joachim99@66: <sect3><title>Ignoring Other Types Of Comments</title>
joachim99@66: <para>
joachim99@73: Currently &kdiff3; understands only C/C++ comments. Using the
joachim99@66: Line-Matching-Preprocessor-Command you can also ignore
joachim99@66: other types of comments, by converting them into C/C++-comments.
joachim99@66: 
joachim99@66: Example: To ignore comments starting with "#", you would like to convert them
joachim99@66: to "//". Note that you also must enable the "Ignore C/C++-Comments" option to get 
joachim99@66: an effect. An appropriate Line-Matching-Preprocessor-Command would be:
joachim99@66: 
joachim99@66: <screen>
joachim99@66:    <command>sed</command> 's/#/\/\//'
joachim99@66: </screen>
joachim99@66: Since for <command>sed</command> the "/"-character has a special meaning, it is necessary to place the 
joachim99@66: "\"-character before each "/" in the replacement-string. Sometimes the "\" is required
joachim99@66: to add or remove a special meaning of certain characters. The single quotation marks (') before 
joachim99@66: and after the substitution-command are important now, because otherwise the shell will
joachim99@66: try to interpret some special characters like '#', '$' or '\' before passing them to 
joachim99@69: <command>sed</command>. <emphasis>Note that on Windows you will need the double quotation marks (") here. Windows
joachim99@69: substitutes other characters like '%', so you might have to experiment a little bit.</emphasis>
joachim99@66: </para>
joachim99@66: </sect3>
joachim99@66: <sect3><title>Caseinsensitive Diff</title>
joachim99@66: <para>
joachim99@66: Use the following Line-Matching-Preprocessor-Command to convert all input to uppercase:
joachim99@66: <screen>
joachim99@66:    <command>sed</command> 's/\(.*\)/\U\1/'
joachim99@66: </screen>
joachim99@66: Here the ".*" is a regular expression that matches any string and in this context matches 
joachim99@66: all characters in the line. 
joachim99@66: The "\1" in the replacement string refers to the matched text within the first pair of "\(" and "\)".
joachim99@66: The "\U" converts the inserted text to uppercase.
joachim99@66: </para>
joachim99@66: </sect3>
joachim99@66: 
joachim99@66: <sect3><title>Ignoring Version Control Keywords</title>
joachim99@66: <para>
joachim99@66: CVS and other version control systems use several keywords to insert automatically
joachim99@66: generated strings (<ulink url="info:/cvs/Keyword substitution">info:/cvs/Keyword substitution</ulink>).
joachim99@66: All of them follow the pattern "$KEYWORD generated text$". We now need a
joachim99@66: Line-Matching-Preprocessor-Command that removes only the generated text:
joachim99@66: <screen>
joachim99@66:    <command>sed</command> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
joachim99@66: </screen>
joachim99@66: The "\|" separates the possible keywords. You might want to modify this list 
joachim99@66: according to your needs.
joachim99@66: The "\" before the "$" is necessary because otherwise the "$" matches the end of the line.
joachim99@66: </para>
joachim99@66: <para>
joachim99@66: While experimenting with <command>sed</command> you might come to understand and even like
joachim99@66: these regular expressions. They are useful because there are many other programs that also 
joachim99@66: support similar things.
joachim99@66: </para>
joachim99@66: </sect3>
joachim99@66: 
joachim99@66: <sect3><title>Ignoring Numbers</title>
joachim99@66: <para>
joachim99@66: Ignoring numbers actually is a built-in option. But as another example, this is how
joachim99@66: it would look as a Line-Matching-Preprocessor-command.
joachim99@66: <screen>
joachim99@66:    <command>sed</command> 's/[0123456789.-]//g'
joachim99@66: </screen>
joachim99@66: Any character within '[' and ']' is a match and will be replaced with nothing.
joachim99@66: </para>
joachim99@66: </sect3>
joachim99@66: 
joachim99@66: <sect3><title>Ignoring Certain Columns</title>
joachim99@66: <para>
joachim99@66: Sometimes a text is very strictly formatted, and contains columns that you always want to ignore, while there are
joachim99@66: other columns you want to preserve for analysis. In the following example the first five columns (characters) are 
joachim99@66: ignored, the next ten columns are preserved, then again five columns are ignored and the rest of the line is preserved.
joachim99@66: <screen>
joachim99@66:    <command>sed</command> 's/.....\(..........\).....\(.*\)/\1\2/'
joachim99@66: </screen>
joachim99@66: Each dot '.' matches any single character. The "\1" and "\2" in the replacement string refer to the matched text within the first 
joachim99@66: and second pair of "\(" and "\)" denoting the text to be preserved.
joachim99@66: </para>
joachim99@66: </sect3>
joachim99@66: 
joachim99@66: <sect3><title>Combining Several Substitutions</title>
joachim99@66: <para>
joachim99@66: Sometimes you want to apply several substitutions at once. You can then use the 
joachim99@66: semicolon ';' to separate these from each other. Example:
joachim99@66: <screen>
joachim99@66:    <command>echo</command> abrakadabra | <command>sed</command> 's/a/o/g;s/\(.*\)/\U\1/'
joachim99@66:    -> OBROKODOBRO
joachim99@66: </screen>
joachim99@66: </para>
joachim99@66: </sect3>
joachim99@66: 
joachim99@66: <sect3><title>Using <command>perl</command> instead of <command>sed</command></title>
joachim99@66: <para>
joachim99@66: Instead of <command>sed</command> you might want to use something else like 
joachim99@66: <command>perl</command>.
joachim99@66: <screen>
joachim99@66:    <command>perl</command> -p -e 's/<replaceable>REGEXP</replaceable>/<replaceable>REPLACEMENT</replaceable>/<replaceable>FLAGS</replaceable>'
joachim99@66: </screen>
joachim99@66: But some details are different in <command>perl</command>. Note that where 
joachim99@66: <command>sed</command> needed "\(" and "\)" <command>perl</command>
joachim99@66: requires the simpler "(" and ")" without preceding '\'. Example:
joachim99@66: <screen>
joachim99@66:    <command>sed</command> 's/\(.*\)/\U\1/'
joachim99@66:    <command>perl</command> -p -e 's/(.*)/\U\1/'
joachim99@66: </screen>
joachim99@66: </para>
joachim99@66: </sect3>
joachim99@66: </sect2>
joachim99@66: 
joachim99@66: <sect2><title>Order Of Preprocessor Execution</title>
joachim99@66: <para>
joachim99@66: The data is piped through all internal and external preprocessors in the 
joachim99@66: following order:
joachim99@66: </para>
joachim99@66: <itemizedlist>
joachim99@66: <listitem><para>Normal preprocessor,</para></listitem>
joachim99@66: <listitem><para>Line-Matching-Preprocessor,</para></listitem>
joachim99@66: <listitem><para>Ignore case (conversion to uppercase),</para></listitem>
joachim99@66: <listitem><para>Detection of C/C++ comments,</para></listitem>
joachim99@66: <listitem><para>Ignore numbers,</para></listitem>
joachim99@66: <listitem><para>Ignore white space</para></listitem>
joachim99@66: </itemizedlist>
joachim99@66: <para>
joachim99@66: The data after the normal preprocessor will be preserved for display and merging. The
joachim99@66: other operations only modify the data that the line-matching-diff-algorithm sees.
joachim99@66: </para><para>
joachim99@66: In the rare cases where you use a normal preprocessor note that 
joachim99@66: the line-matching-preprocessor sees the output of the normal preprocessor as input.
joachim99@66: </para>
joachim99@66: </sect2>
joachim99@66: 
joachim99@66: <sect2><title>Warning</title>
joachim99@66: <para>
joachim99@66: The preprocessor-commands are often very useful, but as with any option that modifies
joachim99@69: your texts or hides away certain differences automatically, you might accidentally overlook 
joachim99@66: certain differences and in the worst case destroy important data.
joachim99@66: </para><para>
joachim99@73: For this reason during a merge if a normal preprocessor-command is being used &kdiff3; 
joachim99@66: will tell you so and ask you if it should be disabled or not. 
joachim99@66: But it won't warn you if a Line-Matching-Preprocessor-command is active. The merge will not complete until
joachim99@66: all conflicts are solved. If you disabled "Show White Space" then the differences that
joachim99@66: were removed with the Line-Matching-Preprocessor-command will also be invisible. If the 
joachim99@66: Save-button remains disabled during a merge (because of remaining conflicts), make sure to enable 
joachim99@66: "Show White Space". If you don't wan't to merge these less important differences manually
joachim99@73: you can select "Choose [A|B|C] For All Unsolved White space Conflicts" in the Merge-menu.
joachim99@66: </para>
joachim99@66: </sect2>
joachim99@66: </sect1>
joachim99@11: </chapter>
joachim99@11: 
joachim99@11: 
joachim99@73: <chapter id="dirmerge"><title>Directory Comparison and Merge with &kdiff3;</title>
joachim99@69: <sect1 id="dirmergeintro"><title>Introduction into Directory Comparison and Merge</title>
joachim99@11: <para>
joachim99@11:    Often programmers must modify many files in a directory to achieve their
joachim99@73:    purpose. For this &kdiff3; also lets you compare and merge complete directories
joachim99@11:    recursively!
joachim99@11: </para><para>
joachim99@11:    Even though comparing and merging directories seems to be quite obvious,
joachim99@11:    there are several details that you should know about. Most important is of
joachim99@11:    course the fact that now many files might be affected by each operation.
joachim99@11:    If you don't have backups of your original data, then it can be very hard
joachim99@11:    or even impossible to return to the original state. So before starting a merge,
joachim99@11:    make sure that your data is safe, and going back is possible. If you make
joachim99@11:    an archive or use some version control system is your decision, but even
joachim99@11:    experienced programmers and integrators need the old sources now and then.
joachim99@73:    And note that even though I (the author of &kdiff3;) try to do my best, I can't
joachim99@11:    guarantee that there are no bugs. According to the GNU-GPL there is NO WARRANTY
joachim99@11:    whatsoever for this program. So be humble and always keep in mind:
joachim99@11: </para>
joachim99@11: <blockquote><para>
joachim99@11:    <emphasis>To err is human, but to really mess things up you need a computer.</emphasis>
joachim99@11: </para></blockquote>
joachim99@11: <para>
joachim99@73: So this is what this program can do for you: &kdiff3; ...
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11:      <listitem><para>... reads and compares two or three directories recursively,</para></listitem>
joachim99@11:      <listitem><para>... takes special care of symbolic links,</para></listitem>
joachim99@11:      <listitem><para>... lets you browse files on mouse double click,</para></listitem>
joachim99@11:      <listitem><para>... for each item proposes a merge operation, which you can change
joachim99@11:                          before starting the directory merge,</para></listitem>
joachim99@11:      <listitem><para>... lets you simulate the merge and lists the actions that would
joachim99@11:                          take  place, without actually doing them,</para></listitem>
joachim99@11:      <listitem><para>... lets you really do the merge, and lets you interact whenever
joachim99@11:                          manual interaction is needed,</para></listitem>
joachim99@51:      <listitem><para>... lets you run the selected operation for all items (key F7) or the selected item (key F6),</para></listitem>
joachim99@51:      <listitem><para>... lets you continue the merge after manual interaction with key F7,</para></listitem>
joachim99@11:      <listitem><para>... optionally creates backups, with the ".orig" extension,</para></listitem>
joachim99@11:      <listitem><para>...</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="startingdirmerge"><title>Starting Directory Comparison Or Merge</title>
joachim99@11: <para>
joachim99@11:    This is very similar to the single file merge and comparison. You just
joachim99@11:    have  to specify directories on the command line or in the file-open
joachim99@11:    dialog.
joachim99@11: </para>
joachim99@11: <sect2><title>Compare/Merge two directories: </title>
joachim99@11: <screen>
joachim99@11:    <command>kdiff3</command> <replaceable>dir1 dir2</replaceable>
joachim99@11:    <command>kdiff3</command> <replaceable>dir1 dir2</replaceable> -o <replaceable>destdir</replaceable>
joachim99@11: </screen>
joachim99@11: <para>
joachim99@73:    If no destination directory is specified, then &kdiff3; will use <replaceable>dir2</replaceable>.
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>Compare/Merge three directories: </title>
joachim99@11: <screen>
joachim99@11:    <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable>
joachim99@11:    <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable> -o <replaceable>destdir</replaceable>
joachim99@11: </screen>
joachim99@11: <para>
joachim99@11:    When three directories are merged then <replaceable>dir1</replaceable>
joachim99@11:    is used as the base for the merge.
joachim99@73:    If no destination directory is specified, then &kdiff3; will use <replaceable>dir3</replaceable>
joachim99@11:    as the  destination directory for the merge.
joachim99@11: </para>
joachim99@11: 
joachim99@11: <para>
joachim99@11:    Note that only the comparison starts automatically, not the merge. For this you first must
joachim99@51:    select a menu entry or the key F7. (More details later.)
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@11: </sect1>
joachim99@11: 
joachim99@69: <sect1 id="dirmergevisible"><title>Directory Merge Visible Information</title>
joachim99@11: <para>
joachim99@11:    While reading the directories a message-box appears that informs you of
joachim99@11:    the progress. If you abort the directory scan, then only files that have
joachim99@11:    been  compared until then will be listed.
joachim99@11: </para><para>
joachim99@73:    When the directory scan is complete then &kdiff3; will show a listbox with
joachim99@11:    the results left, ...
joachim99@11: </para>
joachim99@11: <screenshot><mediaobject>
joachim99@11: <imageobject><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject> <!--alt="Image of the directory browser."-->
joachim99@11: </mediaobject></screenshot>
joachim99@11: <para>
joachim99@11:    ... and details about the currently selected item on the right:
joachim99@11: </para>
joachim99@11: <screenshot><mediaobject>
joachim99@11: <imageobject><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
joachim99@11:    <!--alt="Image with information about the selected item."-->
joachim99@11: </mediaobject></screenshot>
joachim99@11: 
joachim99@11: <sect2 id="name"><title>The Name Column</title>
joachim99@11: <para>
joachim99@11:    Each file and directory that was found during the scan is shown here in
joachim99@11:    a tree. You can select an item by clicking it with the mouse once.
joachim99@11: </para><para>
joachim99@11:    The directories are collapsed by default. You can expand and collapse
joachim99@11:    them by clicking on the "+"/"-" or by double-clicking the item or
joachim99@11:    by using  the left/right-arrow-keys. The "Directory"-menu also contains two
joachim99@11:    actions "Fold all subdirs" and "Unfold all subdirs" with which you can
joachim99@11:    collapse or expand all directories at once.
joachim99@11: </para><para>
joachim99@11:    If you double-click a file item then the file comparison starts and the
joachim99@11:    file-diff-window will appear.
joachim99@11: </para>
joachim99@11: <para>
joachim99@11:    The image in the name column reflects the file type in the first
joachim99@11:    directory  ("A"). It can be one of these:
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11:      <listitem><para>Normal file</para></listitem>
joachim99@11:      <listitem><para>Normal directory (directory-image)</para></listitem>
joachim99@11:      <listitem><para>Link to a file (file-image with a link arrow)</para></listitem>
joachim99@11:      <listitem><para>Link to a directory (directory-image with a link arrow)</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: <para>
joachim99@11:    If the file type is different in the other directories, then this is visible
joachim99@11:    in the columns A/B/C and in the window that shows the details about the selected
joachim99@11:    item. Note that for such a case no merge operation can be selected automatically.
joachim99@11:    When starting the merge, then the user will be informed of problems of that
joachim99@11:    kind.
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2 id="coloring"><title>The Columns A/B/C and the Coloring Scheme</title>
joachim99@11: <para>
joachim99@11:    As can be seen in the image above the colors red, green, yellow and black
joachim99@11:    are used in the columns A/B/C.
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11:      <listitem><para>Black: This item doesn't exist in this directory.</para></listitem>
joachim99@11:      <listitem><para>Green: Newest item.</para></listitem>
joachim99@11:      <listitem><para>Yellow: Older than green, newer than red.</para></listitem>
joachim99@11:      <listitem><para>Red: Oldest item.</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: <para>
joachim99@11:    But for items that were identical in the comparison their color also is
joachim99@11:    identical even if the age is not.
joachim99@11: </para><para>
joachim99@11:    Directories are considered equal if all items they contain are identical.
joachim99@11:    Then they also will have the same color. But the age of a directory is not
joachim99@11:    considered for its color.
joachim99@11: </para><para>
joachim99@11:    The idea for this coloring scheme I came upon in
joachim99@11:    <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff">dirdiff</ulink>. The colors
joachim99@11:    resemble the colors of a leaf that is green when new, turns yellow later and red
joachim99@11:    when old.
joachim99@11: </para>
joachim99@11: 
joachim99@11: </sect2><sect2 id="operation"><title>The Operation Column</title>
joachim99@11: <para>
joachim99@73:    After comparing the directories &kdiff3; also evaluates a proposal for a
joachim99@11:    merge  operation. This is shown in the "Operation" column. You can modify
joachim99@11:    the operation  by clicking on the operation you want to change. A small menu
joachim99@51:    will popup and allows you to select an operation for that item. (You can also
joachim99@51:    select the most needed operations via keyboard.
joachim99@51:    Ctrl+1/2/3/4/Del will select A/B/C/Merge/Delete respectively if available.)
joachim99@51:    This operation will be executed during the merge. It depends on the item and
joachim99@51:    on the merge-mode you are in, what operations are available. The merge-mode is one of
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@51:      <listitem><para>Three directory-merge ("A" is treated as older base of both).</para></listitem>
joachim99@11:      <listitem><para>Two directory-merge.</para></listitem>
joachim99@11:      <listitem><para>Two directory-sync-mode (activate via option "Synchronize Directories").</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: <para>
joachim99@11:    In three directory merge the operation proposal will be: If for an item ...
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11:      <listitem><para>... all three directories are equal: Copy from C</para></listitem>
joachim99@11:      <listitem><para>... A and C are equal but B is not: Copy from B (or if B does not
joachim99@11:                          exist, delete the destination if exists)</para></listitem>
joachim99@11:      <listitem><para>... A and B are equal but C is not: Copy from C (or if C does not
joachim99@11:                          exist, delete the destination if exists)</para></listitem>
joachim99@11:      <listitem><para>... B and C are equal but A is not: Copy from C (or if C does not
joachim99@11:                          exist, delete the destination if exists)</para></listitem>
joachim99@11:      <listitem><para>... only A exists: Delete the destination (if exists)</para></listitem>
joachim99@11:      <listitem><para>... only B exists: Copy from B</para></listitem>
joachim99@11:      <listitem><para>... only C exists: Copy from C</para></listitem>
joachim99@11:      <listitem><para>... A, B and C are not equal: Merge</para></listitem>
joachim99@11:      <listitem><para>... A, B and C don't have the same file type (e.g. A is a directory,
joachim99@11:                          B is a file): "Error: Conflicting File Types". While such items exist the
joachim99@11:                          directory merge cannot start.</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: <para>
joachim99@11:    In two directory merge the operation proposal will be: If for an item ...
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11:      <listitem><para>... both directories are equal: Copy from B</para></listitem>
joachim99@11:      <listitem><para>... A exists, but not B: Copy from A</para></listitem>
joachim99@11:      <listitem><para>... B exists, but not A: Copy from B</para></listitem>
joachim99@11:      <listitem><para>... A and B exist but are not equal: Merge</para></listitem>
joachim99@11:      <listitem><para>... A and B don't have the same file type (e.g. A is a directory,
joachim99@11:                          B is a file): "Error: Conflicting File Types". While such items exist the
joachim99@11:                          directory merge cannot start.</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: <para>
joachim99@11:    Sync-mode is active if only two directories and no explicit destination
joachim99@73:    were specified and if the option "Synchronize directories" is active. &kdiff3;
joachim99@11:    then selects a default operation so that both directories are the same afterwards.
joachim99@11:    If for an item ...
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11:      <listitem><para>... both directories are equal: Nothing will be done.</para></listitem>
joachim99@11:      <listitem><para>... A exists, but not B: Copy A to B</para></listitem>
joachim99@11:      <listitem><para>... B exists, but not A: Copy B to A</para></listitem>
joachim99@11:      <listitem><para>... A and B exist, but are not equal: Merge and store the result
joachim99@11:                          in  both directories. (For the user the visible save-filename is B,
joachim99@73:                          but then &kdiff3; copies B also to A.)</para></listitem>
joachim99@11:      <listitem><para>... A and B don't have the same file type (e.g. A is a directory,
joachim99@11:                          B is a file): "Error: Conflicting File Types". While such items exist the
joachim99@11:                          directory merge cannot start.</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: <para>
joachim99@11:    When two directories are merged and the option "Copy newer instead of merging" is selected,
joachim99@73:    then &kdiff3; looks at the dates and proposes to choose the newer file. If the files are not
joachim99@11:    equal but have equal dates, then the operation will contain
joachim99@11:    "Error: Dates are equal but files are not." While such items exist the
joachim99@11:    directory merge cannot start.
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2 id="status"><title>The Status Column</title>
joachim99@11: <para>
joachim99@11:    During the merge one file after the other will be processed. The status
joachim99@11:    column will show "Done" for items where the merge operation has succeeded,
joachim99@11:    and other texts if something unexpected happened. When a merge is complete,
joachim99@11:    then you should make a last check to see if the status for all items is
joachim99@11:    agreeable.
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@66: 
joachim99@66: <sect2 id="statisticscolulmns"><title>Statistics Columns</title>
joachim99@66: <para>
joachim99@66:    When the file comparison mode "Full Analysis" is enabled in the options, then
joachim99@73:    &kdiff3; will show extra columns containing the numbers of unsolved, solved, nonwhite and whitespace
joachim99@66:    conflicts. (The solved-column will only show when comparing or merging three directories.)
joachim99@66: </para>
joachim99@66: </sect2>
joachim99@66: 
joachim99@69: <sect2 id="selectingvisiblefiles"><title>Selecting Listed Files</title>
joachim99@69: <para>   
joachim99@69:    Several options influence which files are listed here. Some are accessible in the 
joachim99@69:    <link linkend="dirmergeoptions">settings dialog</link>. The Directory-menu contains the entries:
joachim99@69: </para><para><itemizedlist>
joachim99@69:      <listitem><para>"Show Identical Files": Files that have been detected equal in all input directories.</para></listitem>
joachim99@69:      <listitem><para>"Show Different Files": Files that exist in two or more directories but are not equal.</para></listitem>
joachim99@69:      <listitem><para>"Show Files only in A": Files that exist only in A, but not in B or C.</para></listitem>
joachim99@69:      <listitem><para>"Show Files only in B": Files that exist only in B, but not in A or B.</para></listitem>
joachim99@69:      <listitem><para>"Show Files only in C": Files that exist only in C, but not in A or B.</para></listitem>
joachim99@69: </itemizedlist></para>
joachim99@69: <para>
joachim99@69:    Activate only the "Show"-options for the items you want listed. If for example you only want to list all items that 
joachim99@69:    exist either in A or in B but not in both, you'll have to activate "Show Files only in A" and "Show Files only in B" 
joachim99@69:    and deactivate all others ("Show Identical Files", "Show Different Files", "Show Files only in C").
joachim99@69:    The list will be updated immediately to reflect the change.
joachim99@69: </para><para>
joachim99@69:    These options also apply for directories with one exception: Disabling "Show Different Files" will not hide 
joachim99@69:    any complete directories. This will work only for files within.
joachim99@69: </para><para>
joachim99@73:    Note that of these only the "Show Identical Files"-option is persistant. The others are enabled when starting &kdiff3;. 
joachim99@69: </para>
joachim99@69: </sect2>
joachim99@69: 
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: 
joachim99@69: <sect1 id="dothemerge"><title>Doing A Directory Merge</title>
joachim99@11: <para>
joachim99@51:    You can either merge the currently selected item (file or directory), or all items.
joachim99@11:    When you have made all your operation choices (in all subdirectories too)
joachim99@11:    then you can start the merge.
joachim99@11: </para><para>
joachim99@11:    Be aware that if you didn't specify a destination directory explicitely,
joachim99@11:    then the destination will be "C" in three directory mode, "B" in two directory
joachim99@11:    merge mode, and in sync-mode it will be "A" or/and "B".
joachim99@11: </para><para>
joachim99@11:    If you have specified a destination directory also check that all items
joachim99@11:    that should be in the output, are in the tree. There are some options that
joachim99@11:    cause certain items to be omitted from the directory comparison and merge.
joachim99@11:    Check these options to avoid unpleasant surprises:
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11:      <listitem><para>"Recursive Directories": If this is off, then items in subdirectories
joachim99@11:                      will not be found.</para></listitem>
joachim99@11:      <listitem><para>"Pattern"/"Anti-Pattern": Include/exclude items that match</para></listitem>
joachim99@11:      <listitem><para>"Exclude Hidden Files"</para></listitem>
joachim99@69:      <listitem><para><link linkend="selectingvisiblefiles">"Show"-options</link> (Show Identical/Different Files, Files only in A/B/C)</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: <para>
joachim99@69:    If you change the settings in order to list more files, you must do a rescan via menu "Directory"->"Rescan" yourself.
joachim99@73:    (The reason for this is that for faster comparison-speed &kdiff3; omits the comparison for files suppressed by these criteria.)
joachim99@69:    If you changed your file and dir patterns to exclude files, then the file-list will immediately be updated on closing
joachim99@69:    the options-dialog.
joachim99@69: </para><para>
joachim99@69:    Note that when you write to a completely new directory then you usually also want to copy the identical files.
joachim99@69:    In that case enable the "Show Identical Files"-option. If your destination-directory is one of the inputs, 
joachim99@69:    then this isn't necessary because the file is already there.
joachim99@11: </para><para>
joachim99@11:    If you are satisfied so far, the rest is easy.
joachim99@11: </para><para>
joachim99@51:    To merge all items: Select "Start/Continue directory merge" in the "Directory"-menu
joachim99@69:    or press F7 (which is the default shortcut).
joachim99@51:    To merge only the current item: Select "Run Operation For Current Item"
joachim99@51:    or press F6.
joachim99@11: </para><para>
joachim99@69:    If due to conflicting filetypes still some items with invalid operations
joachim99@11:    exist, then a messagebox will appear and these items will be pointed out,
joachim99@11:    so you can select a valid operation for the item.
joachim99@11: </para><para>
joachim99@51:    If you merge all items a dialog will appear giving you the options "Do it", "Simulate
joachim99@11:    it" and "Cancel".
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11:      <listitem><para>Select "Simulate it" if you want to see what would be done without
joachim99@11:                      actually doing it. A verbose list of all operations will be shown.</para></listitem>
joachim99@11:      <listitem><para>Otherwise select "Do it" to really start merging.</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: <para>
joachim99@73:    Then &kdiff3; will run the specified operation for all items. If manual
joachim99@11:    interaction  is required (single file merge), then a merge window will open
joachim99@11:    (<link linkend="dirmergebigscreenshot">see the big screenshot</link>).
joachim99@11: </para><para>
joachim99@69:    When you have finished with manually merging a file, again select "Start/Continue directory
joachim99@69:    merge" or the key F7. If you haven't saved it yet, a dialog will ask you to
joachim99@73:    do so. Then &kdiff3; will continue with the next item.
joachim99@11: </para><para>
joachim99@73:    When &kdiff3; encounters an error, it will tell you so and will show the
joachim99@51:    verbose-status-information. At the bottom of this list, there will be some
joachim99@51:    error messages which should help you to understand the cause of the problem.
joachim99@73:    When you continue merging (F7 key) &kdiff3; will give you the choice to retry
joachim99@51:    or skip the item that caused the problem. This means that before continuing
joachim99@51:    you can choose another operation or solve the problem by other means.
joachim99@11: </para><para>
joachim99@73:    When the merge is complete, then &kdiff3; will inform you via a message
joachim99@11:    box.
joachim99@51: </para><para>
joachim99@69:    If some items were merged individually before running the directorymerge then 
joachim99@73:    &kdiff3; remembers this (while this
joachim99@51:    merge-session goes on), and doesn't merge them again when later the merge for
joachim99@51:    all items is run. Even when the merge was skipped or nothing was saved these
joachim99@69:    items count as completed. Only when you change the merge operation the 
joachim99@69:    "Done"-status of the item will be removed and it can be merged again.
joachim99@11: </para>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="dirmergeoptions"><title>Options for Comparing and Merging Directories</title>
joachim99@11: <para>
joachim99@73:    The &kdiff3;-preferences (menu "Settings"-&gt;"Configure &kdiff3;") has
joachim99@11:    a section called "Directory Merge" with these options:
joachim99@11: </para>
joachim99@11: 
joachim99@11: <variablelist>
joachim99@11:    <varlistentry><term><emphasis>Recursive Directories:</emphasis></term><listitem><para> Select whether to search directories
joachim99@11:          recursively.</para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>File Pattern(s):</emphasis></term><listitem><para> Only files that match any pattern here will
joachim99@69:          be put in the tree. More than one pattern may be specified here by using
joachim99@11:          the semicolon ";" as separator. Valid wildcards: '*' and '?'. (e.g. "*.cpp;*.h").
joachim99@69:          Default is "*". This pattern is not used on directories.</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>File Anti-Pattern(s):</emphasis></term><listitem><para> Files that match this pattern
joachim99@11:          will be excluded from the tree. More than one pattern may be specified here
joachim99@11:          via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default
joachim99@69:          is "*.orig;*.o;*.obj".</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Directory Anti-Pattern(s):</emphasis></term><listitem><para> Directories that match this pattern
joachim99@69:          will be excluded from the tree. More than one pattern may be specified here
joachim99@69:          via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default
joachim99@69:          is "CVS;deps;.svn".</para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Use CVS-Ignore:</emphasis></term><listitem><para>
joachim99@11:          Ignore files and directories that would also be ignored by CVS.
joachim99@11:          Many automatically generated files are ignored by CVS.
joachim99@11:          The big advantage is that this can be directory specific via a local ".cvsignore"-file.
joachim99@11:          (See <ulink url="info:/cvs/cvsignore">info:/cvs/cvsignore</ulink>.)</para></listitem></varlistentry>
joachim99@73:    <varlistentry><term><emphasis>Find Hidden Files and Directories:</emphasis></term><listitem><para> On some file systems files
joachim99@11:          have an "Hidden"-attribute. On other systems a filename starting with a dot
joachim99@11:          "." causes it to be hidden. This option allows you to decide whether to
joachim99@11:          include  these files in the tree or not. Default is on.</para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Follow File Links:</emphasis></term><listitem><para> For links to files: When disabled, then
joachim99@11:          the symbolic links are compared. When enabled, then the files behind the
joachim99@11:          links are compared. Default is off.</para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Follow Directory Links:</emphasis></term><listitem><para> For links to directories: When disabled,
joachim99@11:          then the symbolic links will be compared. When enabled then the link will
joachim99@11:          be treated like a directory and it will be scanned recursively. (Note that
joachim99@11:          the program doesn't check if the link is "recursive". So for example a directory
joachim99@11:          that contains a link to the directory would cause an infinite loop, and after
joachim99@11:          some time when the stack overflows or all memory is used up, crash the program.)
joachim99@11:          Default is off.</para></listitem></varlistentry>
joachim99@69:    <varlistentry><term><emphasis>Case Sensitive Filename Comparison:</emphasis></term><listitem><para> 
joachim99@69:          Default is false on Windows, true for other operating systems.</para></listitem></varlistentry>
joachim99@66:    <varlistentry><term><emphasis>File Comparison Mode:</emphasis></term><listitem><para>
joachim99@66: <variablelist>            
joachim99@66:    <varlistentry><term><emphasis>Binary Comparison:</emphasis></term><listitem><para>
joachim99@66:          This is the default file comparison mode.
joachim99@66:          </para></listitem></varlistentry>         
joachim99@66:    <varlistentry><term><emphasis>Full Analysis:</emphasis></term><listitem><para>
joachim99@66:          Do a full analysis of each file and show the statistics information columns.
joachim99@66:          (Number of solved, unsolved, nonwhite and white conflicts.)
joachim99@66:          The full analysis is slower than a simple binary analysis, and much
joachim99@66:          slower when used on files that don't contain text. 
joachim99@66:          (Specify the appropriate file-antipatterns.)
joachim99@66:          </para></listitem></varlistentry>         
joachim99@11:    <varlistentry><term><emphasis>Trust the modification date:</emphasis></term><listitem><para> If you compare big directories
joachim99@11:          over a slow network, it might be faster to compare the modification dates
joachim99@11:          and file length alone. But this speed improvement comes with the price of
joachim99@11:          a little uncertainty. Use this option with care. Default is off.</para></listitem></varlistentry>
joachim99@51:    <varlistentry><term><emphasis>Trust the size:</emphasis></term><listitem><para>
joachim99@51:          Similar to trusting the modification date. No real comparison happens. Two
joachim99@51:          files are considered equal if their file-sizes are equal. This is useful
joachim99@51:          when the file-copy operation didn't preserve the modification date.
joachim99@51:          Use this option with care. Default is off.</para></listitem></varlistentry>
joachim99@66: </variablelist></para></listitem></varlistentry>
joachim99@66:          
joachim99@11:    <varlistentry><term><emphasis>Synchronize Directories:</emphasis></term><listitem><para> Activates "Sync-Mode" when two directories
joachim99@11:          are compared and no explicit destination directory was specified. In this
joachim99@11:          mode the proposed operations will be chosen so that both source directories
joachim99@11:          are equal afterwards. Also the merge result will be written to both directories.
joachim99@11:          Default is off.</para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Copy newer instead of merging:</emphasis></term><listitem><para> Instead of merging the proposed
joachim99@11:          operation will copy the newer source if changes happened. (Considered unsafe,
joachim99@69:          because it implies that you know, that the other file hasn't been edited
joachim99@11:          too. Check to make sure in every case.) Default is off.</para></listitem></varlistentry>
joachim99@11:    <varlistentry><term><emphasis>Backup files:</emphasis></term><listitem><para> If a file or complete directory is replaced
joachim99@11:          by  another or is deleted then the original version will be renamed with an
joachim99@11:          ".orig"  extension. If an old backup file with ".orig" extension already exists
joachim99@11:          then  this will be deleted without backup. This also affects the normal merging
joachim99@11:          of single files, not only in directory-merge mode. Default is on.</para></listitem></varlistentry>
joachim99@11: </variablelist>
joachim99@11: </sect1>
joachim99@11: 
joachim99@69: <sect1 id="other"><title>Other Functions in Directory Merge Window</title>
joachim99@11: <sect2><title>Split/Full Screen Mode</title>
joachim99@11: <para>
joachim99@11:    Usually the directory merge list view remains visible while a single file
joachim99@11:    is compared or merged. With the mouse you can move the the splitter bar that
joachim99@11:    separates the file list from the text-diff windows. If you don't want this,
joachim99@11:    you can disable "Split Screen View" in the "Directory"-menu. Then you can
joachim99@11:    use "Toggle View" in the "Directory"-menu to switch between the file list
joachim99@11:    and the text-diff view that then occupy the full screen.
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@11: <sect2><title>Comparing or Merging a Single File</title>
joachim99@11: <para>
joachim99@11:    Probably you will prefer a simple double mouse click on a file in order
joachim99@11:    to compare it. Nevertheless there also exists an entry in the "Directory"-menu.
joachim99@69:    You can also directly merge a single file by selecting it and 
joachim99@69:    choosing "Merge current file" in the "Merge"-Menu. On saving the
joachim99@11:    result, the status will be set to done, and the file will not be merged again
joachim99@11:    if a directory merge is started.
joachim99@11: </para><para>
joachim99@11:    But note that this status information will be lost when you rerun a directory
joachim99@11:    scan: "Directory"-menu: "Rescan"
joachim99@11: </para>
joachim99@11: </sect2>
joachim99@69: <sect2><title>Comparing or Merging Files with Different Names</title>
joachim99@69: <para>
joachim99@69:    Sometimes you need to compare or merge files with different names (e.g. the current 
joachim99@69:    file and the backup in the same folder).
joachim99@69: </para><para>
joachim99@69:    Select the exact file by clicking onto the icon in the column A, B or C. The first 
joachim99@69:    file selected thus will be marked with an "A", the second and third with "B" and "C" 
joachim99@69:    regardless on what column they are in. Only up to three files can be chosen like this.
joachim99@69: </para><para>
joachim99@69:    Proceed by choosing "Compare Explicitely Selected Files" or "Merge Explicitely 
joachim99@69:    Selected Files" from the "Directory"-menu. For your convenience these menu entries 
joachim99@69:    also appear as context menu when you right-click the last selected file.
joachim99@69: </para><para>
joachim99@69:    The comparison or merge of a file will happen in the same window. 
joachim99@69:    If this method is used for directories a new window will be opened.
joachim99@69: </para></sect2>
joachim99@11: </sect1>
joachim99@11: </chapter>
joachim99@11: 
joachim99@11: <chapter id="misc">
joachim99@11: <title>Miscellaneous Topics</title>
joachim99@11: <sect1 id="networktransparency">
joachim99@11: <title>Networktransparency via KIO</title>
joachim99@11: <sect2><title>KIO-Slaves</title>
joachim99@11: <para>
joachim99@73: KDE supports networktransparency via KIO-slaves. &kdiff3; uses this
joachim99@11: for reading input files and for scanning directories.
joachim99@11: This means that you can specify files and directories on local and
joachim99@69: remote resources via URLs.
joachim99@11: </para><para>
joachim99@11: Example:
joachim99@11: </para><para>
joachim99@11: <screen>
joachim99@11:    <command>kdiff3</command> test.cpp  ftp://ftp.faraway.org/test.cpp
joachim99@11:    <command>kdiff3</command> tar:/home/hacker/archive.tar.gz/dir ./dir
joachim99@11: </screen>
joachim99@11: </para>
joachim99@11: <para>The first line compares a local file with a file on an FTP-server. The second line
joachim99@11: compares a directory within an compressed archive with a local directory.
joachim99@11: </para><para>
joachim99@11: Other KIO-slaves that are interesting are:
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11: <listitem><para>Files from the WWW (http:),</para></listitem>
joachim99@11: <listitem><para>Files from the FTP (ftp:),</para></listitem>
joachim99@11: <listitem><para>Encrypted file transfer (fish:, sftp:),</para></listitem>
joachim99@11: <listitem><para>Windows-ressources (smb:),</para></listitem>
joachim99@11: <listitem><para>Local files (file:),</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: <para>
joachim99@11: Other things that are possible, but probably less useful are:
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11: <listitem><para>Man-pages (man:),</para></listitem>
joachim99@11: <listitem><para>Info-pages (info:),</para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>How To Write URLs</title>
joachim99@11: <para>
joachim99@11:    An URL has a different syntax compared with paths for local files and directories.
joachim99@11:    Some things should be considered:
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11: <listitem><para>
joachim99@51:    A path can be relative and can contain "." or "..". This is not possible for URLs
joachim99@51:    which are always absolute.
joachim99@11: </para></listitem><listitem><para>
joachim99@11:    Special characters must be written with "escaping". ("#"->"%23", space->"%20", etc.)
joachim99@11:    E.g. A file with the name "/#foo#" would have the URL "file:/%23foo%23".
joachim99@11: </para></listitem><listitem><para>
joachim99@11:    When URLs don't work as expected, try to open them in Konqueror first.
joachim99@11: </para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: 
joachim99@11: </sect2>
joachim99@11: 
joachim99@11: <sect2><title>Capabilities of KIO-Slaves</title>
joachim99@11: <para>
joachim99@11:    Networktransparency has one drawback: Not all ressources have the same cababilities.
joachim99@11: </para><para>
joachim99@73:    Sometimes this is due to the file system of the server, sometimes due to the protocol.
joachim99@11:    Here is a short list of restrictions:
joachim99@11: </para>
joachim99@11: <itemizedlist>
joachim99@11: <listitem><para>
joachim99@11:    Sometimes there is no support for links.
joachim99@11: </para></listitem><listitem><para>
joachim99@51:    Or there is no way to distinguish if a link points to a file or a directory; always
joachim99@51:    assuming a file. (ftp:, sftp:).
joachim99@11: </para></listitem><listitem><para>
joachim99@11:    Can't always determine the filesize.
joachim99@11: </para></listitem><listitem><para>
joachim99@11:    Limited support for permissions.
joachim99@11: </para></listitem><listitem><para>
joachim99@51:    No possibility to modify permissions or modification time, so permissions or time
joachim99@51:    of a copy will differ from the original. (See the option "Trust the size".)
joachim99@68:    (To modify permissions or modification time is only possible for local files.)
joachim99@11: </para></listitem>
joachim99@11: </itemizedlist>
joachim99@11: </sect2>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="kpart">
joachim99@11: <title>Using &kdiff3; as a KPart</title>
joachim99@11: <para>
joachim99@11: &kdiff3; is a KPart. Currently it implements the KParts::ReadOnlyPart-interface.
joachim99@11: </para><para>
joachim99@11: It's main use is as difference-viewer in KDevelop. KDevelop always starts the
joachim99@73: internal difference viewer first. To invoke &kdiff3; press the right mouse button
joachim99@11: on the difference viewer window and select "Show in KDiff3Part" from the contextmenu.
joachim99@11: </para><para>
joachim99@73: &kdiff3; normally requires two complete files as input. When used as part &kdiff3;
joachim99@73: will assume that the inputfile is a patch-file in the unified format. &kdiff3;
joachim99@11: then retrieves the original filenames from the patch-file. At least one of
joachim99@73: the two files must be available. &kdiff3; will then invoke <command>patch</command> to
joachim99@11: recreate the second file.
joachim99@11: </para><para>
joachim99@11: In Konqueror you can select a patch-file and select "Preview in"-"KDiff3Part" from
joachim99@11: the contextmenu. Be aware that this won't work if none of the original files are
joachim99@11: available, and it is not reliable if the original file(s) have changed since the
joachim99@11: patch-file was generated.
joachim99@11: </para><para>
joachim99@73: When run as a part &kdiff3; only provides the a two-file-diff, a very small toolbar
joachim99@11: and menu. Merging or directory-comparison are not supported then.
joachim99@11: </para>
joachim99@11: </sect1>
joachim99@11: </chapter>
joachim99@11: 
joachim99@11: <chapter id="faq">
joachim99@11: <title>Questions and Answers</title>
joachim99@11: 
joachim99@11: &reporting.bugs;
joachim99@11: &updating.documentation;
joachim99@11: 
joachim99@11: <qandaset id="faqlist">
joachim99@11: 
joachim99@11: <qandaentry><question><para>
joachim99@73:    Why is it called "&kdiff3;"?
joachim99@11: </para></question><answer><para>
joachim99@11:    Tools named "KDiff" and "KDiff2" (now called "Kompare") already exist. Also "KDiff3" should suggest
joachim99@11:    that it can merge like the "diff3"-tool in the Diff-Tool collection.
joachim99@11: </para></answer></qandaentry>
joachim99@11: 
joachim99@11: <qandaentry><question><para>
joachim99@11:    Why did I release it under GPL?
joachim99@11: </para></question><answer><para>
joachim99@11:    I'm using GPL programs for a very long time now and learned very much
joachim99@11:    by  having a look at many of the sources. Hence this is my "Thank You"
joachim99@11:    to   all  programmers that also did so or will do the same.
joachim99@11: </para></answer></qandaentry>
joachim99@11: 
joachim99@11: <qandaentry><question><para>
joachim99@11:    Some buttons and functions are missing. What's wrong?
joachim99@11: </para></question><answer><para>
joachim99@11:    You compiled from source but you probably didn't specify the correct KDE-prefix
joachim99@11:    with configure. By default configure wants to install in /usr/local but then KDE can't
joachim99@11:    find the user-interface ressource file (i.e. kdiff3ui.rc). The README-file contains
joachim99@11:    more information about the correct prefix.
joachim99@11: </para></answer></qandaentry>
joachim99@11: 
joachim99@11: <qandaentry><question><para>
joachim99@11:    Often lines that are similar but not identical appear next to each other
joachim99@11:    but sometimes not. Why?
joachim99@11: </para></question><answer><para>
joachim99@11:    Lines where only the amount of white space characters is different
joachim99@11:    are   treated as "equal" at first, while just one different non-white character
joachim99@11:    causes the lines to be "different". If similar lines appear next to each
joachim99@11:    other, this actually is coincidence but this fortunately is often the case.
joachim99@69:    See also <link linkend="manualdiffhelp">Manual Diff Help</link>.
joachim99@11: </para></answer></qandaentry>
joachim99@11: 
joachim99@11: <qandaentry><question><para>
joachim99@11:    Why must all conflicts be solved before the merge result can be saved?
joachim99@11: </para></question><answer><para>
joachim99@11:    For each equal or different section the editor in the merge result
joachim99@11:    window    remembers where it begins or ends. This is needed so that conflicts
joachim99@11:    can  be solved manually by simply selecting the source button (A, B or C).
joachim99@11:    This  information is lost while saving as text and it is too much effort to
joachim99@11:    create  a special file format that supports saving and restoring all necessary
joachim99@11:    information.
joachim99@11: </para></answer></qandaentry>
joachim99@11: 
joachim99@11: <qandaentry><question><para>
joachim99@69:    How can I synchronise the diff and merge views, so that all views show the same text position?
joachim99@69: </para></question><answer><para>
joachim99@69:   Click into the summary column left of the text. (<link linkend="synchronise_views">See also here.</link>)
joachim99@69: </para></answer></qandaentry>
joachim99@69: 
joachim99@69: <qandaentry><question><para>
joachim99@11:    Why does the editor in the merge result window not have an "undo"-function?
joachim99@11: </para></question><answer><para>
joachim99@11:   This was too much effort until now. You can always
joachim99@11:   restore a version from one source (A, B or C) by clicking the respective
joachim99@11:   button. For big editing the use of another editor is recommended anyway.
joachim99@11: </para></answer></qandaentry>
joachim99@11: 
joachim99@11: <qandaentry><question><para>
joachim99@11:    When I removed some text, then suddenly "&lt;No src line&gt;" appeared
joachim99@73:    and cannot be deleted. What does that mean and how can one remove this?
joachim99@11: </para></question><answer><para>
joachim99@11:    For each equal or different section the editor in the merge result
joachim99@11:    window    remembers where it begins or ends. "&lt;No src line&gt;" means
joachim99@11:    that    there is nothing left in a section, not even a new line character.
joachim99@11:    This  can happen either while merging automatically or by editing. This is
joachim99@11:    no problem,   since this hint won't appear in the saved file. If you want
joachim99@11:    the orignal source  back just select the section (click on the left summary
joachim99@11:    column) and then click the source button with the needed contents (A/B or
joachim99@11:    C).
joachim99@11: </para></answer></qandaentry>
joachim99@11: 
joachim99@11: <qandaentry><question><para>
joachim99@73:    Why doesn't &kdiff3; support syntax-highlighting?
joachim99@11: </para></question><answer><para>
joachim99@73:    &kdiff3; already uses many colors for difference highlighting. More
joachim99@11:    highlighting    would be confusing. Use another editor for this.
joachim99@11: </para></answer></qandaentry>
joachim99@11: 
joachim99@11: <qandaentry><question><para>
joachim99@73:    Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; files?
joachim99@69: </para></question><answer><para>
joachim99@73:    Although &kdiff3; will analyse any kind of file the result will probably
joachim99@69:    not be very satisfactory for you.
joachim99@69: </para><para>
joachim99@73:    &kdiff3; was made to compare pure text files. OpenOffice, Word, Excel etc.
joachim99@69:    store much more information in the files (about fonts, pictures, pages,
joachim99@73:    colors etc.) which &kdiff3; doesn't know about. So &kdiff3; will 
joachim99@69:    show you the contents of the file interpreted as pure text, but 
joachim99@69:    this might be unreadable or at least it will look very odd.
joachim99@69: </para><para>
joachim99@69:    Since most programs nowadays store their contents in XML-format, you might 
joachim99@69:    be able to read it as pure text. So if the change was only small,
joachim99@73:    &kdiff3; still might help you.
joachim99@69: </para><para>
joachim99@69:    The best solution if you only want to compare the text (without embedded 
joachim99@69:    objects like pictures) is to use "Select All" and "Copy" in your program 
joachim99@73:    to copy the interesting text to the clipoard and then in &kdiff3; paste the 
joachim99@69:    text into either diff input window. 
joachim99@69:    (See also <link linkend="selections">Select, Copy And Paste</link>.)
joachim99@69: </para></answer></qandaentry>
joachim99@69: 
joachim99@69: <qandaentry><question><para>
joachim99@69:    Where has the the directory option "List only deltas" gone?
joachim99@69: </para></question><answer><para>
joachim99@69:    There are now several <link linkend="selectingvisiblefiles">"Show"-options</link> in the directory menu.
joachim99@69:    Disabling "Show identical files" will achieve what enabling "List only deltas" used to do.
joachim99@69: </para></answer></qandaentry>
joachim99@69: 
joachim99@69: <qandaentry><question><para>
joachim99@69:    How can I make a big selection in the diff input window
joachim99@69:    because scrolling takes so long?
joachim99@69: </para></question><answer><para>
joachim99@69:    Start the selection as usual (click and hold the left mouse button). 
joachim99@69:    Then use the navigation keys (e.g. page up, page down) while holding the left mouse button down.
joachim99@69:    (See also <link linkend="selections">Select, Copy And Paste</link>.)
joachim99@69: </para></answer></qandaentry>
joachim99@69: 
joachim99@69: <qandaentry><question><para>
joachim99@11:    There is so much information here, but your question is still not answered?
joachim99@11: </para></question><answer><para>
joachim99@11:    Please send me your question. I appreciate every comment.
joachim99@11: </para></answer></qandaentry>
joachim99@11: 
joachim99@11: </qandaset>
joachim99@11: </chapter>
joachim99@11: 
joachim99@11: <chapter id="credits">
joachim99@11: 
joachim99@11: <title>Credits and License</title>
joachim99@11: 
joachim99@11: <para>
joachim99@11: &kdiff3; - File and Directory Comparison and Merge Tool
joachim99@11: </para>
joachim99@11: <para>
joachim99@77: Program copyright 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</email>
joachim99@11: </para>
joachim99@11: <para>
joachim99@73: Several cool ideas and bugreports came from colleagues and many people out in the Wild Wild Web. Thank you!
joachim99@11: </para>
joachim99@11: 
joachim99@11: <para>
joachim99@77: Documentation Copyright &copy; 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</email>
joachim99@11: </para>
joachim99@11: 
joachim99@11: <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
joachim99@11: 
joachim99@11: &underFDL;               <!-- FDL: do not remove -->
joachim99@11: 
joachim99@11: 
joachim99@11: &underGPL;        	 <!-- GPL License -->
joachim99@11: 
joachim99@11: </chapter>
joachim99@11: 
joachim99@11: <appendix id="installation">
joachim99@11: <title>Installation</title>
joachim99@11: 
joachim99@11: <sect1 id="getting-kdiff3">
joachim99@11: <title>How to obtain &kdiff3;</title>
joachim99@11: 
joachim99@11: <para>
joachim99@73: You can download the latest version of &kdiff3; from its homepage <ulink url="http://kdiff3.sourceforge.net">http://kdiff3.sourceforge.net</ulink>.
joachim99@11: </para><para>
joachim99@73: &kdiff3; is also available for other platforms. See the homepage for details.
joachim99@11: </para>
joachim99@11: 
joachim99@11: 
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="requirements">
joachim99@11: <title>Requirements</title>
joachim99@11: 
joachim99@11: <para>
joachim99@66:    In order to successfully use all features of &kdiff3;, you need &kde; >3.1.
joachim99@11: </para><para>
joachim99@73:    For information about how to run &kdiff3; on other platforms without KDE please see the
joachim99@11:    <ulink url="http://kdiff3.sourceforge.net">homepage</ulink>.
joachim99@11: </para><para>
joachim99@11: You can find a list of changes at <ulink
joachim99@11: url="http://kdiff3.sourceforge.net/ChangeLog">http://kdiff3.sourceforge.net/ChangeLog</ulink>
joachim99@11: or in the "ChangeLog"-file of the source package.
joachim99@11: </para>
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: <sect1 id="compilation">
joachim99@11: <title>Compilation and Installation</title>
joachim99@11: 
joachim99@11: <para>In order to compile and install &kdiff3; on a system with KDE, type the
joachim99@11: following in the base directory of the &kdiff3; distribution:</para>
joachim99@11: 
joachim99@11: <screen><prompt>%</prompt> <userinput><command>./configure --prefix=<replaceable>kde-dir</replaceable></command></userinput>
joachim99@11: <prompt>%</prompt> <userinput><command>make</command></userinput>
joachim99@11: <prompt>%</prompt> <userinput><command>make</command> install</userinput>
joachim99@11: </screen>
joachim99@11: <para>
joachim99@11: <replaceable>kde-dir</replaceable> specifies the directory
joachim99@11: containing KDE on your system. If you are not sure, read the README-file for details.
joachim99@11: </para>
joachim99@69: <para>If you don't use KDE don't use <command>configure</command> but follow the instructions for Qt-only systems in the README file.</para>
joachim99@11: <para>Since &kdiff3; uses <command>autoconf</command> and
joachim99@11: <command>automake</command> you should have no trouble compiling it. Should you
joachim99@11: run into problems please report them to the &kde; mailing lists.</para>
joachim99@11: 
joachim99@11: </sect1>
joachim99@11: 
joachim99@11: </appendix>
joachim99@11: 
joachim99@11: &documentation.index;
joachim99@11: </book>
joachim99@11: 
joachim99@11: <!--
joachim99@11: Local Variables:
joachim99@11: mode: sgml
joachim99@11: sgml-minimize-attributes:nil
joachim99@11: sgml-general-insert-case:lower
joachim99@11: sgml-indent-step:0
joachim99@11: sgml-indent-data:nil
joachim99@11: End:
joachim99@11: 
joachim99@11: vim:tabstop=2:shiftwidth=2:expandtab
joachim99@11: -->