From owner-svn-doc-all@freebsd.org Fri May 12 20:33:28 2017 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54370D6A286; Fri, 12 May 2017 20:33:28 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3115B785; Fri, 12 May 2017 20:33:28 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4CKXRhh021707; Fri, 12 May 2017 20:33:27 GMT (envelope-from wblock@FreeBSD.org) Received: (from wblock@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4CKXR70021706; Fri, 12 May 2017 20:33:27 GMT (envelope-from wblock@FreeBSD.org) Message-Id: <201705122033.v4CKXR70021706@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wblock set sender to wblock@FreeBSD.org using -f From: Warren Block Date: Fri, 12 May 2017 20:33:27 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r50253 - head/en_US.ISO8859-1/books/handbook/cutting-edge X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2017 20:33:28 -0000 Author: wblock Date: Fri May 12 20:33:27 2017 New Revision: 50253 URL: https://svnweb.freebsd.org/changeset/doc/50253 Log: Recommit this rewrite, recreating all the changes that were wiped out by the version control system. Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Fri May 12 18:33:06 2017 (r50252) +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Fri May 12 20:33:27 2017 (r50253) @@ -246,7 +246,7 @@ MergeChanges /etc/ /var/named/etc/ /boot Merges are either accepted, open an editor, or cause freebsd-update to abort. When in doubt, backup /etc and just accept the merges. - See for more information about + See &man.mergemaster.8; for more information about mergemaster. # Directory in which to store downloaded updates and temporary @@ -1077,7 +1077,7 @@ before running "/usr/sbin/freebsd-update to take advantage of specific hardware. Parts of the base system can be built with non-default settings, or left out entirely where they are not needed or desired. The build - process takes longer to update a system than binary updates, but + process takes longer to update a system than just installing binary updates, but allows complete customization to produce a tailored version of &os;. @@ -1089,23 +1089,6 @@ before running "/usr/sbin/freebsd-update the process in more detail. - - Preparing - - The very first time a computer is updated from source, - run - - &prompt.root; etcupdate extract - - This creates a checkpoint for later comparison and - merging of system settings. - - This step is only done once on a particular - computer. &man.etcupdate.8; does not need any - additional updates after the first - extract. - - Update and Build @@ -1115,7 +1098,7 @@ before running "/usr/sbin/freebsd-update &prompt.root; make -j4 buildworld &prompt.root; make -j4 kernel &prompt.root; make installworld -&prompt.root; etcupdate +&prompt.root; mergemaster -Ui &prompt.root; shutdown -r now @@ -1152,7 +1135,7 @@ before running "/usr/sbin/freebsd-update Install the world. - + Update and merge configuration files in /etc/. @@ -1169,12 +1152,6 @@ before running "/usr/sbin/freebsd-update Preparing for a Source Update - If this is the first time that a source update has - ever been done on this computer, run - etcupdate extract to create a record of - system settings for later update and merging. This step only - needs to be done once on a particular computer. - Read /usr/src/UPDATING. Any manual steps that must be performed before or after an update are described in this file. @@ -1324,12 +1301,10 @@ Working Copy Root Path: /usr/src previously-compiled code in the temporary object directory, /usr/obj. This can speed up later builds by avoiding recompiling code that has not changed. - To force a clean rebuild of everything, remove - /usr/obj before starting a build. - This is roughly equivalent to performing a - make clean, but much faster: + To force a clean rebuild of everything, use + cleanworld before starting a build: - &prompt.root; rm -rf /usr/obj/* + &prompt.root; make cleanworld @@ -1354,14 +1329,6 @@ Working Copy Root Path: /usr/src - - go-fast - - Go-fast: Describe other go-fast options like NO_CLEAN - here. Preferably avoid having different sections for - different versions of &os;. - - Building Only the Kernel @@ -1454,22 +1421,23 @@ Working Copy Root Path: /usr/src libraries are located and removed, then the system is restarted. - + Merging Configuration Files with - <application>etcupdate</application> + &man.mergemaster.8; - etcupdate provides an easy + &man.mergemaster.8; provides an easy way to merge changes that have been made to system configuration files with new versions of those files. - etcupdate - - - - Merging Configuration Files with - <application>mergemaster</application> - - mergemaster -Ui + With , &man.mergemaster.8; + automatically updates files that have not been user-modified + and installs new files that are not already present: + + &prompt.root; mergemaster -Ui + + If a file must be manually merged, an interactive + display allows the user to choose which portions of the files are + kept. See &man.mergemaster.8; for more information.