From bb2f527d4592819e2f5a54cc184c6a297fe59fd7 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Sun, 21 Feb 2010 19:04:13 +0100 Subject: [PATCH] Fixed old conflict patool.1 man page --- doc/patool.1 | 10 +++------- doc/patool.txt | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/doc/patool.1 b/doc/patool.1 index cbcfa07..87d4e60 100644 --- a/doc/patool.1 +++ b/doc/patool.1 @@ -100,13 +100,9 @@ Set the verbose option to 1 or 0. .SS \fB[\fP\fI\fP\fB]\fP Supported archive formats are listed by the \fBformats\fP command. .TP -\fImode\fP\fB=/usr/bin/mycommand\fP -Set the application to handle the archive format for given mode. -<<<<<<< HEAD -\fImode\fP can be one of (\fBextract\fP, \fBlist\fP, \fBcreate\fP). -======= -\fImode\fP can be one of \fBextract\fP, \fBlist\fP, \fBtest\fP. ->>>>>>> master +\fIcommand\fP\fB=/usr/bin/mycommand\fP +Set the application to handle the archive format for given command. +\fIcommand\fP can be one of (\fBextract\fP, \fBlist\fP, \fBtest\fP, \fBcreate\fP). .SH FILES \fB/etc/patool.conf\fP, \fB~/.patool.conf\fP - configuration files diff --git a/doc/patool.txt b/doc/patool.txt index c55f84c..ec0a0cf 100644 --- a/doc/patool.txt +++ b/doc/patool.txt @@ -41,6 +41,17 @@ COMMANDS --help Show help for this command. + create + Create an archive from given files. + + --force + Allow overwriting of local archives. + + --verbose + Verbose operation (if the helper application supports it). + + --help Show help for this command. + test Test files in an archive. @@ -71,8 +82,8 @@ CONFIGURATION [] Supported archive formats are listed by the formats command. - mode=/usr/bin/mycommand - Set the application to handle the archive format for given mode. mode can be one of extract, list, test. + command=/usr/bin/mycommand + Set the application to handle the archive format for given command. command can be one of (extract, list, test, create). FILES /etc/patool.conf, ~/.patool.conf - configuration files