From owner-freebsd-doc Fri Sep 27 10:40: 7 2002 Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BA1F37B404 for ; Fri, 27 Sep 2002 10:40:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0121343E4A for ; Fri, 27 Sep 2002 10:40:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8RHe2Co082631 for ; Fri, 27 Sep 2002 10:40:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8RHe2pT082630; Fri, 27 Sep 2002 10:40:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58B5B37B401 for ; Fri, 27 Sep 2002 10:39:48 -0700 (PDT) Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B88843E65 for ; Fri, 27 Sep 2002 10:39:48 -0700 (PDT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.12.6/8.12.6) with ESMTP id g8RHdl7R036424 for ; Fri, 27 Sep 2002 10:39:47 -0700 (PDT) (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.12.6/8.12.6/Submit) id g8RHdls7036423; Fri, 27 Sep 2002 10:39:47 -0700 (PDT) Message-Id: <200209271739.g8RHdls7036423@www.freebsd.org> Date: Fri, 27 Sep 2002 10:39:47 -0700 (PDT) From: Steve Davidson To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: docs/43430: Documentation incorrect in /usr/src/Makefile Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 43430 >Category: docs >Synopsis: Documentation incorrect in /usr/src/Makefile >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Fri Sep 27 10:40:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Steve Davidson >Release: 4.6-STABLE (9-27-02) about 4.7 RC2 >Organization: >Environment: 4.6-STABLE (9-27-02) about 4.7 RC2 >Description: I did a cvsup of the 4.6 RELENG (STABLE) branch and then read /usr/src/Makefile and found these instructions: # For individuals wanting to upgrade their sources (even if only a # delta of a few days): # # 1. `cd /usr/src' (or to the directory containing your source tree). # 2. `make buildworld' # 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). # 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). # 5. `reboot' (in single user mode: boot -s from the loader prompt). # 6. `mergemaster -p' # 7. `make installworld' # 8. `mergemaster' # 9. `reboot' # There is no '-p' option to mergemaster; it is difficult to understand what conceptually '-p' would have done if it existed. >How-To-Repeat: Have a look at /usr/src/Makefile >Fix: Fix the documentation. Also elaborate (a little) as to what the steps achieve. I can and did read the mergemaster docs so no need to repeat, but '-p' isn't in the mergemaster docs. >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message