From owner-freebsd-doc Sat Oct 12 2:50: 4 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 3013F37B401 for ; Sat, 12 Oct 2002 02:50:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78CFD43EC2 for ; Sat, 12 Oct 2002 02:50: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 g9C9o2Co024973 for ; Sat, 12 Oct 2002 02:50: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 g9C9o2YE024972; Sat, 12 Oct 2002 02:50:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6024A37B401 for ; Sat, 12 Oct 2002 02:40:26 -0700 (PDT) Received: from hoolan.org (db217.csie.ncu.edu.tw [140.115.50.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F49C43E7B for ; Sat, 12 Oct 2002 02:40:25 -0700 (PDT) (envelope-from jeff@hoolan.org) Received: from hoolan.org (jeff@localhost [127.0.0.1]) by hoolan.org (8.12.5/8.12.5) with ESMTP id g9C9eGXN043856 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Sat, 12 Oct 2002 17:40:17 +0800 (CST) (envelope-from jeff@hoolan.org) Received: (from jeff@localhost) by hoolan.org (8.12.5/8.12.5/Submit) id g9C9eBKd043853; Sat, 12 Oct 2002 17:40:11 +0800 (CST) (envelope-from jeff) Message-Id: <200210120940.g9C9eBKd043853@hoolan.org> Date: Sat, 12 Oct 2002 17:40:11 +0800 (CST) From: Yung-Sheng Tang Reply-To: Yung-Sheng Tang To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: docs/43959: encourage mergemaster in INSTALL.txt 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: 43959 >Category: docs >Synopsis: encourage mergemaster in INSTALL.txt >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 12 02:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Yung-Sheng Tang >Release: FreeBSD 4.6.2-RELEASE i386 >Organization: HOOLAN International >Environment: System: FreeBSD hoolan.org 4.6.2-RELEASE FreeBSD 4.6.2-RELEASE #0: Sat Aug 17 12:03:36 CST 2002 root@hoolan.org:/usr/src/sys/compile/HOOLAN i386 >Description: If mergemaster is officially supported, I recommend that we update INSTALL.{txt,html} <3.1.1 Upgrade Overview> to include the procedure of running mergemaster after upgrade. >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message