diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt index 89b0c4d..79190b0 100644 --- a/doc/en/CMakeLists.txt +++ b/doc/en/CMakeLists.txt @@ -1 +1,2 @@ -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kdiff3) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kdiff3) +kdoctools_create_manpage (man-kdiff3.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}) diff --git a/doc/en/man-kdiff3.1.docbook b/doc/en/man-kdiff3.1.docbook new file mode 100644 index 0000000..f832741 --- /dev/null +++ b/doc/en/man-kdiff3.1.docbook @@ -0,0 +1,203 @@ + + +]> + + + +KDiff3 User's Manual +&Burkhard.Lueck; &Burkhard.Lueck.mail; +2018-05-19 +kdiff3 1.7.0 + + + +kdiff3 +1 + + + +kdiff3 +Tool for Comparison and Merge of Files and Directories + + + + +kdiff3 + + + + + + file + file + file + + + alias1 + alias2 + alias3 + alias + string + + file + + + + + + + +Description +Compares two or three input files or directories. + + + + +Options + + + +Ignored. (User defined.) + + + + + +Ignored. (User defined.) + + + + + +Ignored. (User defined.) + + + + + +Ignored. (User defined.) + + + + + +Merge the input. + + + + + file +Explicit base file. For compatibility with certain tools. + + + + + file +Output file. Implies -m. ⪚: -o newfile.txt + + + + + file +Output file, again. (For compatibility with certain tools.) + + + + + +No GUI if all conflicts are auto-solvable. +(Needs file) + + + + + +Don't solve conflicts automatically. + + + + + alias1 +Visible name replacement for input file 1 (base). + + + + + alias2 +Visible name replacement for input file 2. + + + + + alias3 +Visible name replacement for input file 3. + + + + + alias +Alternative visible name replacement. Supply this once for every input. + + + + + string +Override a config setting. Use once for every setting. +⪚: AutoAdvance=1. + + + + + +Show list of config settings and current values. + + + + + file +Use a different config file. + + + + + +file1 to open (base, if not specified via --) + + + + + +file2 to open + + + + + +file2 to open + + + + + + + + +See Also + +More detailed user documentation is available from help:/kdiff3 +(either enter this &URL; into &konqueror;, or run +khelpcenter +help:/kdiff3). +kf5options(7) +qt5options(7) + + + + +Authors +This manual page was written by &Burkhard.Lueck; &Burkhard.Lueck.mail;. + + +