From owner-cvs-src-old@FreeBSD.ORG  Thu Jan  1 12:10:13 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 26C081065759
	for <cvs-src-old@freebsd.org>; Thu,  1 Jan 2009 12:10:13 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 152D58FC13
	for <cvs-src-old@freebsd.org>; Thu,  1 Jan 2009 12:10:13 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n01CACPV010307
	for <cvs-src-old@freebsd.org>; Thu, 1 Jan 2009 12:10:12 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n01CACKd010306
	for cvs-src-old@freebsd.org; Thu, 1 Jan 2009 12:10:12 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200901011210.n01CACKd010306@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	dougb@repoman.freebsd.org using -f
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 1 Jan 2009 12:09:57 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jan 2009 12:10:13 -0000

dougb       2009-01-01 12:09:57 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  SVN rev 186679 on 2009-01-01 12:09:57Z by dougb
  
  General Improvements
  ====================
  1. List the command line options in a more standard way
  2. Improve the explanations of some of the arguments (-A, -D)
  3. Add ARCHSTRING and MTREEDB to the example rc file
  4. Re-sort some of the examples according to the existing distinction
  of "has a command line version" vs. "does not have a command line version"
  
  Document changes for r186678
  ===========================
  1. /usr/src/etc -> /usr/src where needed [1]
  2. Add IGNORE_FILES to the example rc [2] (and remove IGNORE_MOTD)
  3. Update the EXIT STATUS section for [3] and [4]
  
  Update Copyright and .Dd accordingly
  
  PR:             bin/96528 [1]
  Submitted by:   ru [1]
  PR:             bin/106642 [2]
  Submitted by:   Henrik Brix Andersen <henrik@brixandersen.dk>
  PR:             bin/122282 [3]
  Submitted by:   Eygene Ryabinkin <rea-fbsd@codelabs.ru> [3]
  PR:             bin/108183 [4]
  Submitted by:   Riccardo Torrini <riccardo@torrini.org> [4]
  
  Revision  Changes    Path
  1.38      +31 -19    src/usr.sbin/mergemaster/mergemaster.8