From owner-freebsd-doc@FreeBSD.ORG Mon Feb 10 11:30:01 2014 Return-Path: Delivered-To: freebsd-doc@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 425EA21C for ; Mon, 10 Feb 2014 11:30:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 03521132B for ; Mon, 10 Feb 2014 11:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s1ABU0CU089695 for ; Mon, 10 Feb 2014 11:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s1ABU02m089692; Mon, 10 Feb 2014 11:30:00 GMT (envelope-from gnats) Resent-Date: Mon, 10 Feb 2014 11:30:00 GMT Resent-Message-Id: <201402101130.s1ABU02m089692@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Wout Decré Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C1557FFC for ; Mon, 10 Feb 2014 11:20:15 +0000 (UTC) Received: from newred.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AB50212D4 for ; Mon, 10 Feb 2014 11:20:15 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by newred.freebsd.org (8.14.7/8.14.7) with ESMTP id s1ABKEYU052846 for ; Mon, 10 Feb 2014 11:20:14 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.7/8.14.7/Submit) id s1ABKECO052831; Mon, 10 Feb 2014 11:20:14 GMT (envelope-from nobody) Message-Id: <201402101120.s1ABKECO052831@cgiserv.freebsd.org> Date: Mon, 10 Feb 2014 11:20:14 GMT From: Wout Decré To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: docs/186625: Handbook rebuilding "world" upgrade procedure wrong mergemaster command X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 11:30:01 -0000 >Number: 186625 >Category: docs >Synopsis: Handbook rebuilding "world" upgrade procedure wrong mergemaster command >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Mon Feb 10 11:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Wout Decré >Release: >Organization: Canodus >Environment: >Description: Under Procedure 23.2. Overview of Build World Process, step 9: Update any remaining configuration files. # mergemaster -p It suggests you should do the mergemaster command two times with the -p option. Before r43796, this was: # mergemaster >How-To-Repeat: Check http://www.freebsd.org/doc/handbook/makeworld.html >Fix: I think this should just be: # mergemaster >Release-Note: >Audit-Trail: >Unformatted: