cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh

[Dmitry Morozovsky]

On Sat, 29 Apr 2006, Gordon Tetlow wrote:

GT> gordon      2006-04-29 18:21:44 UTC
GT> 
GT>   FreeBSD src repository
GT> 
GT>   Modified files:
GT>     usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
GT>   Log:
GT>   Add auto upgrade capability to mergemaster.

Thanks!

It seems you missed SYNOPSIS flags line:

Index: mergemaster.8
===================================================================
RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.8,v
retrieving revision 1.35
diff -u -r1.35 mergemaster.8
--- mergemaster.8       29 Apr 2006 18:21:43 -0000      1.35
+++ mergemaster.8       30 Apr 2006 08:01:33 -0000
@@ -32,7 +32,7 @@
 .Nd merge configuration files, et al during an upgrade
 .Sh SYNOPSIS
 .Nm
-.Op Fl scrvahipCP
+.Op Fl scrvahipCPU
 .Op Fl m Ar /path/to/sources
 .Op Fl t Ar /path/to/temp/root
 .Op Fl d


Sincerely,
D.Marck                                     [DM5020, MCK-RIPE, DM3-RIPN]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck at rinet.ru ***
------------------------------------------------------------------------