d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

It's not necessary to include both Op and Fl for command line options

Browse Source 
included in the text, so use only the latter.

Clarify that using -U doesn't make sense in combination with -a
This commit is contained in:
Doug Barton 2009-12-30 23:26:29 +00:00
parent 6fb3661e8f
commit 3dbee1749a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=201293
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.sbin/mergemaster/mergemaster.8
View File

@ -61,10 +61,10 @@ down, populating that environment with the various
files. files.
You can specify a different source directory You can specify a different source directory
with the with the
.Op Fl m .Fl m
command line option, or specify the destination command line option, or specify the destination
directory with the directory with the
.Op Fl D .Fl D
option. option.
It then compares each file in that environment It then compares each file in that environment
to its installed counterpart. to its installed counterpart.
@ -91,10 +91,10 @@ compares the files themselves.
You can You can
also specify that the script ignore the Id strings and also specify that the script ignore the Id strings and
compare every file with the compare every file with the
.Op Fl s .Fl s
option. option.
Using the Using the
.Op Fl F .Fl F
option option
.Nm .Nm
will install the new file for you if they differ only by will install the new file for you if they differ only by
@ -126,7 +126,7 @@ installing an updated version of this file you should
probably run probably run
.Xr pwd_mkdb 8 .Xr pwd_mkdb 8
with the with the
.Op Fl p .Fl p
option to rebuild your password databases option to rebuild your password databases
and recreate and recreate
.Pa /etc/passwd . .Pa /etc/passwd .
@ -198,11 +198,13 @@ If the
directory exists, it creates a new one in a previously directory exists, it creates a new one in a previously
non-existent directory. non-existent directory.
This option unsets the verbose flag, This option unsets the verbose flag,
but is compatible with all other options. but other than
.Fl U
it is compatible with all other options.
Setting Setting
.Op Fl a .Fl a
makes makes
.Op Fl w .Fl w
superfluous. superfluous.
.It Fl h .It Fl h
Display usage and help information. Display usage and help information.
@ -253,7 +255,7 @@ instead of the default
Add the date and time to the name of the temporary Add the date and time to the name of the temporary
root directory. root directory.
If If
.Op Fl t .Fl t
is specified, this option must is specified, this option must
follow it if you want the date added too. follow it if you want the date added too.
.It Fl u Ar N .It Fl u Ar N