diff -urpN mc-4.8.8.orig/doc/man/Makefile.am mc-4.8.8/doc/man/Makefile.am --- mc-4.8.8.orig/doc/man/Makefile.am 2013-03-07 11:45:57.000000000 +0100 +++ mc-4.8.8/doc/man/Makefile.am 2013-07-08 20:29:16.539574690 +0200 @@ -3,7 +3,7 @@ if USE_NLS SUBDIRS = $(DOC_LINGUAS) endif -man_MANS = mc.1 mcedit.1 mcview.1 +man_MANS = mc.1 mcedit.1 mcview.1 mcdiff.1 CLEANFILES = $(man_MANS) @@ -11,7 +11,8 @@ EXTRA_DIST = \ date-of-man-include.am \ mc.1.in \ mcedit.1.in \ - mcview.1.in + mcview.1.in \ + mcdiff.1.in DATE_LANG=en_US.UTF-8 DATE_FORMAT=%B %Y diff -urpN mc-4.8.8.orig/doc/man/Makefile.in mc-4.8.8/doc/man/Makefile.in --- mc-4.8.8.orig/doc/man/Makefile.in 2013-04-02 11:41:12.000000000 +0200 +++ mc-4.8.8/doc/man/Makefile.in 2013-07-08 20:30:33.407579744 +0200 @@ -408,13 +408,14 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ DIST_SUBDIRS = es hu it pl ru sr @USE_NLS_TRUE@SUBDIRS = $(DOC_LINGUAS) -man_MANS = mc.1 mcedit.1 mcview.1 +man_MANS = mc.1 mcedit.1 mcview.1 mcdiff.1 CLEANFILES = $(man_MANS) EXTRA_DIST = \ date-of-man-include.am \ mc.1.in \ mcedit.1.in \ - mcview.1.in + mcview.1.in \ + mcdiff.1.in DATE_LANG = en_US.UTF-8 DATE_FORMAT = %B %Y @@ -855,6 +856,10 @@ mcview.1: $(srcdir)/mcview.1.in MAN_FILE=$<; MAN_DATE=$$($(MAN_DATE_CMD)); \ sed $(SED_PARAMETERS) $< > $@ +mcdiff.1: $(srcdir)/mcdiff.1.in + MAN_FILE=$<; MAN_DATE=$$($(MAN_DATE_CMD)); \ + sed $(SED_PARAMETERS) $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urpN mc-4.8.8.orig/doc/man/mcdiff.1.in mc-4.8.8/doc/man/mcdiff.1.in --- mc-4.8.8.orig/doc/man/mcdiff.1.in 1970-01-01 01:00:00.000000000 +0100 +++ mc-4.8.8/doc/man/mcdiff.1.in 2013-07-08 21:03:19.474017497 +0200 @@ -0,0 +1,97 @@ +.TH MCDIFF 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander" +.SH NAME +mcdiff \- Internal diff viewer of GNU Midnight Commander. +.SH USAGE +.B mcdiff +[\-bcCdfhstVx?] file1 file2 +.SH DESCRIPTION +.LP +mcdiff is a link to +.BR mc , +the main GNU Midnight Commander executable. Executing GNU Midnight +Commander under this name requests starting the internal diff viewer +which compares +.I file1 +and +.I file2 +specified on the command line. +.SH OPTIONS +.TP +.I "\-b" +Force black and white display. +.TP +.I "\-c" +Force color mode on terminals where +.B mcdiff +defaults to black and white. +.TP +.I "\-C =,,:= ..." +Specify a different color set. See the +.B Colors +section in mc(1) for more information. +.TP +.I "\-d" +Disable mouse support. +.TP +.I "\-f" +Display the compiled\-in search paths for Midnight Commander files. +.TP +.I "\-t" +Used only if the code was compiled with S\-Lang and terminfo: it makes +the Midnight Commander use the value of the +.B TERMCAP +variable for the terminal information instead of the information on +the system wide terminal database +.TP +.I "\-V" +Displays the version of the program. +.TP +.I "\-x" +Forces xterm mode. Used when running on xterm\-capable terminals (two +screen modes, and able to send mouse escape sequences). +.PP +.SH COLORS +The default colors may be changed by appending to the +.B MC_COLOR_TABLE +environment variable. Foreground and background colors pairs may be +specified for example with: +.PP +.nf +MC_COLOR_TABLE="$MC_COLOR_TABLE:\\ +normal=lightgray,black:\\ +selected=black,green" +.fi +.PP +.SH FILES +.I %prefix%/share/mc/mc.hlp +.IP +The help file for the program. +.PP +.I %prefix%/share/mc/mc.ini +.IP +The default system\-wide setup for GNU Midnight Commander, used only if +the user's own ~/.config/mc/ini file is missing. +.PP +.I %prefix%/share/mc/mc.lib +.IP +Global settings for the Midnight Commander. Settings in this file +affect all users, whether they have ~/.config/mc/ini or not. +.PP +.I ~/.config/mc/ini +.IP +User's own setup. If this file is present, the setup is loaded from +here instead of the system\-wide startup file. +.PP +.SH LICENSE +This program is distributed under the terms of the GNU General Public +License as published by the Free Software Foundation. See the built\-in +help of the Midnight Commander for details on the License and the lack +of warranty. +.SH AVAILABILITY +The latest version of this program can be found at +ftp://ftp.gnu.org/gnu/mc/. +.SH SEE ALSO +mc(1), mcedit(1), mcview(1) +.PP +.SH BUGS +Bugs should be reported to mc\-devel@gnome.org