From owner-freebsd-doc  Sun Mar 24 13:10: 7 2002
Delivered-To: freebsd-doc@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id C8A2B37B405
	for <freebsd-doc@hub.freebsd.org>; Sun, 24 Mar 2002 13:10:00 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g2OLA0s31190;
	Sun, 24 Mar 2002 13:10:00 -0800 (PST)
	(envelope-from gnats)
Received: from wonkity.com (wonkity.com [63.93.4.4])
	by hub.freebsd.org (Postfix) with ESMTP id C319E37B404
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Mar 2002 13:05:54 -0800 (PST)
Received: from wonkity.com (localhost.wonkity.com [127.0.0.1])
	by wonkity.com (8.12.1/8.11.6) with ESMTP id g2OL5ruF047168
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Mar 2002 14:05:54 -0700 (MST)
	(envelope-from wblock@wonkity.com)
Received: (from wblock@localhost)
	by wonkity.com (8.12.1/8.12.1/Submit) id g2OL5rJ5047167;
	Sun, 24 Mar 2002 14:05:53 -0700 (MST)?g
	(envelope-from wblock)
Message-Id: <200203242105.g2OL5rJ5047167@wonkity.com>
Date: Sun, 24 Mar 2002 14:05:53 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
Reply-To: Warren Block <wblock@wonkity.com>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Subject: docs/36263: Handbook section 19.4.10 skips over mergemaster step
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-doc.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-doc>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-doc>
X-Loop: FreeBSD.org


>Number:         36263
>Category:       docs
>Synopsis:       Handbook section 19.4.10 skips over mergemaster step
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 24 13:10:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Warren Block
>Release:        Handbook 2nd Edition
>Organization:
none
>Environment:
Paper and online version
>Description:
Section 19.4.10 of the Handbook (2nd Edition) skips over the use of
mergemaster.  It details steps to use instead of mergemaster, but
mergemaster instructions are not included.
>How-To-Repeat:
See section 19.4.10.
>Fix:
Add a "Using mergemaster" title and mergemaster instructions before existing
instructions in 19.4.10, and show a mergemaster command line and usage
instructions.
De-emphasize the manual merging method section, or at least break it from
the mergemaster section with a title.
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message