From owner-cvs-all@FreeBSD.ORG  Sun Apr 30 08:02:32 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@freebsd.org
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E4C7216A402;
	Sun, 30 Apr 2006 08:02:32 +0000 (UTC) (envelope-from marck@rinet.ru)
Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1B85143D58;
	Sun, 30 Apr 2006 08:02:31 +0000 (GMT) (envelope-from marck@rinet.ru)
Received: from localhost (localhost [127.0.0.1])
	by woozle.rinet.ru (8.13.6/8.13.4) with ESMTP id k3U82RgU013025;
	Sun, 30 Apr 2006 12:02:29 +0400 (MSD) (envelope-from marck@rinet.ru)
Date: Sun, 30 Apr 2006 12:02:27 +0400 (MSD)
From: Dmitry Morozovsky <marck@rinet.ru>
To: Gordon Tetlow <gordon@freebsd.org>
In-Reply-To: <200604291821.k3TILije020756@repoman.freebsd.org>
Message-ID: <20060430120143.T57302@woozle.rinet.ru>
References: <200604291821.k3TILije020756@repoman.freebsd.org>
X-NCC-RegID: ru.rinet
X-OpenPGP-Key-ID: 6B691B03
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2
	(woozle.rinet.ru [0.0.0.0]); Sun, 30 Apr 2006 12:02:29 +0400 (MSD)
Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org
Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.8
	mergemaster.sh
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Apr 2006 08:02:33 -0000

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@rinet.ru ***
------------------------------------------------------------------------