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