From owner-freebsd-doc@FreeBSD.ORG Sun Dec 5 12:13:41 2010 Return-Path: Delivered-To: doc@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A07CB1065673 for ; Sun, 5 Dec 2010 12:13:41 +0000 (UTC) (envelope-from martin.johnson.uk@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 11A008FC17 for ; Sun, 5 Dec 2010 12:13:40 +0000 (UTC) Received: by wyf19 with SMTP id 19so11233401wyf.13 for ; Sun, 05 Dec 2010 04:13:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:subject:x-enigmail-version:content-type :content-transfer-encoding; bh=FrkXVMWGBla2KyHq317kzLCgcBinvhQzfJUyOWU8R3Y=; b=kszQB20MSXNG0t2fT+TEtwhofMtM4uVk/ittOLbfW0kpOWTTlRL2Qunw3BZP97QWu+ 78vFClKRtBr/2HFL2x2Wkg14T1jxFt7tuNVM/RjsVxU7PM/q6NC+bWgpLLECRGB/GwnC czmWLQlwu6Do/sODbwdE0h1Mj+Wo+Guredj1Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:subject :x-enigmail-version:content-type:content-transfer-encoding; b=M0WTo9ZbYB9Tb4D03EubQlud7BnW9IlUx+wjb1cxCIfJeN4KKQrKOM4pcwlqLbBCLB NdqLATFWL2Vkwyr/oDHzLbvAxpmeCORYIW2FDE42a5lvlfK2wMDmCG6MEFo4GyDjYVK5 Hhp1npXNuFAaVKLlLZY1fUn7F2kgpT5y0PJQM= Received: by 10.216.171.19 with SMTP id q19mr1407772wel.53.1291549690857; Sun, 05 Dec 2010 03:48:10 -0800 (PST) Received: from macbookpro.internal ([217.169.18.188]) by mx.google.com with ESMTPS id y80sm1801523weq.3.2010.12.05.03.48.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 05 Dec 2010 03:48:10 -0800 (PST) Sender: Martin Johnson Message-ID: <4CFB7BF9.3030700@martinshouse.com> Date: Sun, 05 Dec 2010 11:48:09 +0000 From: Martin Johnson User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-GB; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 MIME-Version: 1.0 To: doc@FreeBSD.org X-Enigmail-Version: 1.1.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Subject: http://www.freebsd.org/doc/handbook/makeworld.html X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Dec 2010 12:13:41 -0000 Hello, I'd like to suggest two minor edits for that page. Firstly in the main text :- "mergemaster Now you can update the remaining configuration files, since you have a new world on disk." Suggest "mergemaster -F" (to suppress prompting about countless files where only the VCSID has changed since the last release, and the user hadn't changed that particular default config file). Secondly in the summary paragraph:- # adjkerntz -i # mount -a -t ufs # mergemaster -p # cd /usr/src # installworld # mergemaster # reboot The second mergemaster should be "mergemaster -F". The first one is probably best left as is, since older versions of mergemaster don't have -F. Kind regards, - Martin.