From owner-svn-doc-all@FreeBSD.ORG Mon Jan 28 15:14:37 2013 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 53D64DFE; Mon, 28 Jan 2013 15:14:37 +0000 (UTC) (envelope-from dru@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 37B5124F; Mon, 28 Jan 2013 15:14:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SFEbRm013876; Mon, 28 Jan 2013 15:14:37 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SFEbcW013874; Mon, 28 Jan 2013 15:14:37 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201301281514.r0SFEbcW013874@svn.freebsd.org> From: Dru Lavigne Date: Mon, 28 Jan 2013 15:14:37 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40782 - 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.14 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: Mon, 28 Jan 2013 15:14:37 -0000 Author: dru Date: Mon Jan 28 15:14:36 2013 New Revision: 40782 URL: http://svnweb.freebsd.org/changeset/doc/40782 Log: White space fix only. Translators can ignore. Approved by: bcr (mentor) 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 Mon Jan 28 15:13:29 2013 (r40781) +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Mon Jan 28 15:14:36 2013 (r40782) @@ -113,10 +113,10 @@ - Throughout this chapter, the svn command - is used to obtain and update &os; sources. To use it, you will - need to install the port or the package for devel/subversion. + Throughout this chapter, the svn + command is used to obtain and update &os; sources. To use it, + you will need to install the port or the package for devel/subversion. @@ -362,10 +362,11 @@ MergeChanges /etc/ /var/named/etc/Major version upgrades are when &os; is upgraded from one major version to another, like from - &os; 8.X to &os; 9.X. Major version upgrades will remove old object files and - libraries which will break most third party applications. - It is recommended that all installed ports either be removed - and re-installed or upgraded after a major version upgrade by using the + &os; 8.X to &os; 9.X. Major version upgrades will + remove old object files and libraries which will break most + third party applications. It is recommended that all + installed ports either be removed and re-installed or upgraded + after a major version upgrade by using the ports-mgmt/portupgrade utility. A brute-force rebuild of all installed applications can be accomplished with this command: @@ -383,45 +384,47 @@ MergeChanges /etc/ /var/named/etc/Dealing with Custom Kernels If a custom kernel is in use, the upgrade process is - slightly more involved, and the procedure varies depending on - the version of &os;. + slightly more involved, and the procedure varies depending + on the version of &os;. Custom Kernels with &os; 8.X and Earlier A copy of the - GENERIC kernel is needed, and it should - be placed in - /boot/GENERIC. If the - GENERIC kernel is not already present in - the system, it may be obtained using one of the following - methods: + GENERIC kernel is needed, and it + should be placed in /boot/GENERIC. If the + GENERIC kernel is not already present + in the system, it may be obtained using one of the + following methods: If a custom kernel has only been built once, the - kernel in - /boot/kernel.old is + kernel in /boot/kernel.old is actually the GENERIC one. Simply rename this directory to /boot/GENERIC. - Assuming physical access to the machine is possible, a - copy of the GENERIC kernel can be - installed from the CD-ROM media. Insert your installation - disc and use the following commands: + Assuming physical access to the machine is + possible, a copy of the GENERIC + kernel can be installed from the CD-ROM media. Insert + your installation disc and use the following + commands: &prompt.root; mount /cdrom &prompt.root; cd /cdrom/X.Y-RELEASE/kernels &prompt.root; ./install.sh GENERIC Replace X.Y-RELEASE - with the actual version of the release you are using. The - GENERIC kernel will be installed in - /boot/GENERIC by + class="directory">X.Y-RELEASE + with the actual version of the release you are using. + The GENERIC kernel will be + installed in /boot/GENERIC by default. @@ -438,14 +441,15 @@ MergeChanges /etc/ /var/named/etc/For this kernel to be picked up as GENERIC by freebsd-update, the - GENERIC configuration file must not - have been modified in any way. It is also suggested that - it is built without any other special options. + GENERIC configuration file must + not have been modified in any way. It is also + suggested that it is built without any other special + options. - Rebooting to the GENERIC kernel is - not required at this stage. + Rebooting to the GENERIC kernel + is not required at this stage. @@ -455,7 +459,8 @@ MergeChanges /etc/ /var/named/etc/ If a custom kernel has only been built once, the kernel in - /boot/kernel.old + /boot/kernel.old is actually the GENERIC kernel. Rename this directory to /boot/kernel. @@ -490,8 +495,8 @@ MergeChanges /etc/ /var/named/etc/ - Rebooting to the GENERIC kernel is - not required at this stage. + Rebooting to the GENERIC kernel + is not required at this stage. @@ -507,10 +512,11 @@ MergeChanges /etc/ /var/named/etc/After the command has been received, freebsd-update will evaluate the - configuration file and current system in an attempt to gather - the information necessary to update the system. A screen - listing will display what components have been detected and - what components have not been detected. For example: + configuration file and current system in an attempt to + gather the information necessary to update the system. A + screen listing will display what components have been + detected and what components have not been detected. For + example: Looking up update.FreeBSD.org mirrors... 1 mirrors found. Fetching metadata signature for 8.0-RELEASE from update1.FreeBSD.org... done. @@ -531,11 +537,11 @@ Does this look reasonable (y/n)? yAt this point, freebsd-update will attempt to download all files required for the upgrade. In - some cases, the user may be prompted with questions regarding - what to install or how to proceed. + some cases, the user may be prompted with questions + regarding what to install or how to proceed. - When using a custom kernel, the above step will produce a - warning similar to the following: + When using a custom kernel, the above step will produce + a warning similar to the following: WARNING: This system is running a "MYKERNEL" kernel, which is not a kernel configuration distributed as part of FreeBSD 8.0-RELEASE. @@ -543,20 +549,21 @@ This kernel will not be updated: you MUS before running "/usr/sbin/freebsd-update install" This warning may be safely ignored at this point. The - updated GENERIC kernel will be used as an - intermediate step in the upgrade process. + updated GENERIC kernel will be used as + an intermediate step in the upgrade process. After all patches have been downloaded to the local system, they will then be applied. This process may take a while depending on the speed and workload of the machine. - Configuration files will then be merged — this part - of the process requires some user intervention as a file may - be merged or an editor may appear on screen for a manual - merge. The results of every successful merge will be shown to - the user as the process continues. A failed or ignored merge - will cause the process to abort. Users may wish to make a - backup of /etc and - manually merge important files, such as + Configuration files will then be merged — this + part of the process requires some user intervention as a + file may be merged or an editor may appear on screen for a + manual merge. The results of every successful merge will be + shown to the user as the process continues. A failed or + ignored merge will cause the process to abort. Users may + wish to make a backup of /etc and manually merge + important files, such as master.passwd or group at a later time. @@ -576,8 +583,8 @@ before running "/usr/sbin/freebsd-update The kernel and kernel modules will be patched first. At this point the machine must be rebooted. If the system was - running with a custom kernel, use the &man.nextboot.8; command - to set the kernel for the next boot to + running with a custom kernel, use the &man.nextboot.8; + command to set the kernel for the next boot to /boot/GENERIC (which was updated): @@ -585,16 +592,16 @@ before running "/usr/sbin/freebsd-update Before rebooting with the GENERIC - kernel, make sure it contains all drivers required for your - system to boot properly (and connect to the network, if the - machine that is being updated is accessed remotely). In - particular, if the previously running custom kernel - contained built-in functionality usually provided by kernel - modules, make sure to temporarily load these modules into - the GENERIC kernel using the - /boot/loader.conf facility. You may - also wish to disable non-essential services, disk and - network mounts, etc. until the upgrade process is + kernel, make sure it contains all drivers required for + your system to boot properly (and connect to the network, + if the machine that is being updated is accessed + remotely). In particular, if the previously running + custom kernel contained built-in functionality usually + provided by kernel modules, make sure to temporarily load + these modules into the GENERIC kernel + using the /boot/loader.conf facility. + You may also wish to disable non-essential services, disk + and network mounts, etc. until the upgrade process is complete. @@ -607,9 +614,9 @@ before running "/usr/sbin/freebsd-update freebsd-update will need to be started again. The state of the process has been saved and thus, freebsd-update will not start from the - beginning, but will remove all old shared libraries and object - files. To continue to this stage, issue the following - command: + beginning, but will remove all old shared libraries and + object files. To continue to this stage, issue the + following command: &prompt.root; freebsd-update install @@ -623,10 +630,10 @@ before running "/usr/sbin/freebsd-update Rebuilding Ports After a Major Version Upgrade - After a major version upgrade, all third party software will now need to be rebuilt and - re-installed. This is required as installed software may - depend on libraries which have been removed during the upgrade - process. The + After a major version upgrade, all third party software + will now need to be rebuilt and re-installed. This is + required as installed software may depend on libraries which + have been removed during the upgrade process. The ports-mgmt/portupgrade command may be used to automate this process. The following commands may be used to begin this process: @@ -637,19 +644,19 @@ before running "/usr/sbin/freebsd-update &prompt.root; rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db &prompt.root; portupgrade -af - Once this has completed, finish the upgrade process with a - final call to freebsd-update. Issue the - following command to tie up all loose ends in the upgrade - process: + Once this has completed, finish the upgrade process with + a final call to freebsd-update. Issue + the following command to tie up all loose ends in the + upgrade process: &prompt.root; freebsd-update install - If the GENERIC kernel was temporarily - used, this is the time to build and install a new custom - kernel in the usual way. + If the GENERIC kernel was + temporarily used, this is the time to build and install a + new custom kernel in the usual way. - Reboot the machine into the new &os; version. The process - is complete. + Reboot the machine into the new &os; version. The + process is complete. @@ -1493,16 +1500,18 @@ Fetching 133 new ports or files... done. - Use the svn program to - check out the desired development or release branch. - This is the recommended method, providing access to - &os; development as it occurs. The preferred URL - prefix for Subversion - checkout of the -CURRENT base system is - http://svn.freebsd.org/base/head/; + Use the svn program + to check out the desired development or release + branch. This is the recommended method, providing + access to &os; development as it occurs. The + preferred URL prefix for + Subversion checkout of + the -CURRENT base system is + +http://svn.freebsd.org/base/head/; because of the size of the repository, it is - recommended that only desired subtrees be checked out. - + recommended that only desired subtrees be checked + out. @@ -1516,8 +1525,8 @@ Fetching 133 new ports or files... done. environment. - cvsup has been deprecated by - the Project, and is not recommended. + cvsup has been deprecated + by the Project, and is not recommended. @@ -1557,7 +1566,7 @@ Fetching 133 new ports or files... done. for fairly long periods of time. We recommend using Subversion for - any system with Internet connectivity. + any system with Internet connectivity. @@ -1730,22 +1739,22 @@ Fetching 133 new ports or files... done. - Use the svn program to - check out the desired development or release branch. - This is the recommended method, providing access to - &os; development as it occurs. Branch names include - head for the current development - head, and branches identified in the release engineering page, - such as + Use the svn program + to check out the desired development or release + branch. This is the recommended method, providing + access to &os; development as it occurs. Branch + names include head for the + current development head, and branches identified in + the release + engineering page, such as stable/9 or releng/9.0. The preferred URL prefix for Subversion checkout of the base system is http://svn.freebsd.org/base/; because of the size of the repository, it is - recommended that only desired subtrees be checked out. - + recommended that only desired subtrees be checked + out. @@ -1760,8 +1769,8 @@ Fetching 133 new ports or files... done. your environment. - cvsup has been deprecated by - the Project, and is not recommended. + cvsup has been deprecated + by the Project, and is not recommended. @@ -1839,25 +1848,25 @@ Fetching 133 new ports or files... done. anonymous - Subversion, Anonymous - CVS and CVSup use the + Subversion, + Anonymous CVS and + CVSup use the pull model of updating sources. For - Subversion, - the user (or a cron script) invokes the + Subversion, the user (or a + cron script) invokes the svn program, and it brings files up-to-date. Subversion is the preferred means of - updating local source trees. - cvsup and cvs work under - similar principles, but are now deprecated in favour of Subversion. - The updates you receive are up-to-the-minute and - you get them when, and only when, you want them. You can easily - restrict your updates to the specific files or directories that - are of interest to you. Updates are generated on the fly by the - server, according to what you have and what you want to have. - Unless the reason is truly compelling, - Subversion should be used in preference - to other synchronization mechanisms, which have been deprecated - and will be discontinued in the future. + updating local source trees. cvsup and + cvs work under similar principles, but are + now deprecated in favour of Subversion. The updates you receive + are up-to-the-minute and you get them when, and only when, you + want them. You can easily restrict your updates to the specific + files or directories that are of interest to you. Updates are + generated on the fly by the server, according to what you have + and what you want to have. Unless the reason is truly + compelling, Subversion should be used + in preference to other synchronization mechanisms, which have + been deprecated and will be discontinued in the future. CTM