From 02dc85a95b228b7242b0d11ea35619faad96db03 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 10 Sep 2012 16:16:32 -0500 Subject: Split precise from maverick --- .../applications/kdiff3/debian/kdiff3-trinity.sgml | 258 +++++++++++++++++++++ 1 file changed, 258 insertions(+) create mode 100644 ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.sgml (limited to 'ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.sgml') diff --git a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.sgml b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.sgml new file mode 100644 index 000000000..6eaa4064f --- /dev/null +++ b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.sgml @@ -0,0 +1,258 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man kdiff3.sgml | nroff -man | less'. + A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + EIKE"> + SAUER"> + + Oktober 2, 2006"> + + 1"> + eikes@cs.tu-berlin.de>"> + + KDIFF3"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003, 2006 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + compares two or three input files or directories + + + + &dhpackage; + + + + + + + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; tool. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + For comprehensive help, please see khelpcenter help:/kdiff3. + + + &dhpackage; is a program that + + compares or merges two or three text input files or directories + shows the differences line by line and character by character + provides an automatic merge-facility and + an integrated editor for comfortable solving of merge-conflicts + supports Unicode, UTF-8 and other codecs + supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.) + Printing of differences + Manual alignment of lines + Automatic merging of version control history ($Log$) + + + + + + OPTIONS + + This program follows the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. For a full summary of options, run + &dhpackage; --help. + + + + + + + + Merge the input. + + + + + + + Explicit base file. For compatibility with certain tools. + + + + + + + Output file. Implies -m. E.g.: -o newfile.txt + + + + + + + Output file, again. (For compatibility with certain tools.) + + + + + + + No GUI if all conflicts are auto-solvable. (Needs -o file) + + + + + + + Don't solve conflicts automatically. (For compatibility...) + + + + + + + Visible name replacement for first file/base file. + + + + + + + Visible name replacement for second file. + + + + + + + Visible name replacement for third file. + + + + + + + Visible name replacement. May by supplied for each input. + + + + + + + Change a setting, e. g. --cs "AutoAdvance=1". + + + + + + + Show a list of all settings and their values. + + + + + + + Use a different settings file. + + + + + + + Show author of program. + + + + + + + Show version of program. + + + + + + + Show license of program. + + + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 + (or, at your option, any later version published by the Free + Software Foundation). + + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + + + + + + -- cgit v1.2.1