diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml index 72ff79ca06..137e7abb5d 100644 --- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml @@ -160,74 +160,71 @@ updating-upgrading - Applying security patches in a timely manner and - upgrading to a newer release of - an operating system are important aspects of - ongoing system administration. - &os; includes a utility + Applying security patches in a timely manner and upgrading + to a newer release of an operating system are important aspects + of ongoing system administration. &os; includes a utility called freebsd-update which can be used to - perform both these tasks. + perform both these tasks. - This utility supports binary - security and errata updates to &os;, - without the need to manually compile and install the patch or a - new kernel. Binary updates are available for all architectures and - releases currently supported by the security team. The list of - supported releases and their estimated end-of-life dates are listed at http://www.FreeBSD.org/security/. + This utility supports binary security and errata updates to + &os;, without the need to manually compile and install the patch + or a new kernel. Binary updates are available for all + architectures and releases currently supported by the security + team. The list of supported releases and their estimated + end-of-life dates are listed at http://www.FreeBSD.org/security/. + + This utility also supports operating system upgrades to + minor point releases as well as upgrades to another release + branch. Before upgrading to a new release, review its release + announcement as it contains important information pertinent to + the release. Release announcements are available from http://www.FreeBSD.org/releases/. + + + If a crontab utilizing the features + of &man.freebsd-update.8; exists, it must be disabled before + upgrading the operating system. + - This utility also supports operating system upgrades to minor point - releases as well as upgrades to another release branch. Before - upgrading to a new release, review its release announcement - as it contains important information pertinent to the - release. Release announcements are available from http://www.FreeBSD.org/releases/. - - - If a crontab utilizing the features - of &man.freebsd-update.8; exists, it must be - disabled before upgrading the operating system. - - This section describes the configuration file used by - freebsd-update, demonstrates how to - apply a security patch and how to upgrade to a minor or major - operating system release, and discusses some of the considerations - when upgrading the operating system. + freebsd-update, demonstrates how to apply a + security patch and how to upgrade to a minor or major operating + system release, and discusses some of the considerations when + upgrading the operating system. The Configuration File The default configuration file for - freebsd-update works as-is. Some users may wish to tweak the default configuration - in /etc/freebsd-update.conf, allowing - better control of the process. The comments in this file explain the available options, - but the following may require a bit more - explanation: + freebsd-update works as-is. Some users may + wish to tweak the default configuration in + /etc/freebsd-update.conf, allowing + better control of the process. The comments in this file + explain the available options, but the following may require a + bit more explanation: # Components of the base system which should be kept updated. Components world kernel This parameter controls which parts of &os; will be kept - up-to-date. The default is to update the - entire base system and the kernel. Individual components can - instead be specified, such as - src/base or - src/sys. However, the best option is to leave this at the default as - changing it to include specific items requires - every needed item to be listed. Over time, this could have disastrous - consequences as source code and binaries may become out of - sync. + up-to-date. The default is to update the entire base system + and the kernel. Individual components can instead be + specified, such as src/base or + src/sys. However, the best option is to + leave this at the default as changing it to include specific + items requires every needed item to be listed. Over time, + this could have disastrous consequences as source code and + binaries may become out of sync. # Paths which start with anything matching an entry in an IgnorePaths # statement will be ignored. IgnorePaths /boot/kernel/linker.hints To leave specified directories, such as - /bin or - /sbin, untouched during - the update process, add their paths to this statement. This - option may be used to prevent + /bin or /sbin, + untouched during the update process, add their paths to this + statement. This option may be used to prevent freebsd-update from overwriting local modifications.