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 a36a3a85f7..9510942ee2 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -176,11 +176,11 @@
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.
-
+
+ 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
@@ -246,9 +246,9 @@ MergeChanges /etc/ /var/named/etc/ /boot/device.hints
similar to &man.mergemaster.8;, but with fewer options.
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 mergemaster.
+ backup /etc and just accept the merges.
+ See for more information about
+ mergemaster.
# Directory in which to store downloaded updates and temporary
# files used by &os; Update.
@@ -1276,11 +1276,11 @@ before running "/usr/sbin/freebsd-update install"
verify, and apply the changes to the user's copy of the sources.
This process is more efficient than
Subversion and places less strain on
- server resources since it is a push
- rather than a pull model.
+ server resources since it is a push rather
+ than a pull model.
- There are other trade-offs. If a user inadvertently
- wipes out portions of the local archive,
+ There are other trade-offs. If a user inadvertently wipes
+ out portions of the local archive,
Subversion will detect and rebuild
the damaged portions. CTM will not
do this, and if a user deletes some portion of the source tree
@@ -1333,29 +1333,29 @@ before running "/usr/sbin/freebsd-update install"
Read /usr/src/UPDATING for any
- extra steps necessary for that version of the
- source. This file contains important information about
- potential problems and may specify the order to run certain
- commands. Many upgrades require specific additional steps
- such as renaming or deleting specific files prior to
- installing the new world. These will be listed at the end of this file
- where the currently recommended upgrade sequence is
- explicitly spelled out. If
- UPDATING contradicts any steps in this
- chapter, the instructions in UPDATING
- take precedence and should be followed.
+ extra steps necessary for that version of the source. This
+ file contains important information about potential problems
+ and may specify the order to run certain commands. Many
+ upgrades require specific additional steps such as renaming
+ or deleting specific files prior to installing the new
+ world. These will be listed at the end of this file where
+ the currently recommended upgrade sequence is explicitly
+ spelled out. If UPDATING contradicts
+ any steps in this chapter, the instructions in
+ UPDATING take precedence and should be
+ followed.Do Not Use <command>make world</command>
- Some older documentation recommends using
- make world. However, that command skips
- some important steps and should only be used by experts. For
- almost all circumstances make world is the
- wrong thing to do, and the procedure described here should be
- used instead.
+ Some older documentation recommends using make
+ world. However, that command skips some important
+ steps and should only be used by experts. For almost all
+ circumstances make world is the wrong thing
+ to do, and the procedure described here should be used
+ instead.
@@ -1363,8 +1363,8 @@ before running "/usr/sbin/freebsd-update install"
The build world process assumes an upgrade from an older
&os; version using the source of a newer version that was
- obtained using the instructions in
- .
+ obtained using the instructions in .In &os;, the term world includes the
kernel, core system binaries, libraries, programming files,
@@ -1393,25 +1393,25 @@ before running "/usr/sbin/freebsd-update install"
step to do so.These concerns have led to the recommended upgrade
- sequence described in
- the following procedure.
+ sequence described in the following procedure.
- It is a good idea to save the output from running
- make to a file. If something goes wrong, a copy of
- the error message can be posted to one of the &os; mailing
- lists.
+ It is a good idea to save the output from running
+ make to a file. If something goes wrong,
+ a copy of the error message can be posted to one of the &os;
+ mailing lists.
- The easiest way to do this is to use script with a
- parameter that specifies the name of the file to save all
- output to. Do not save the output to
- /tmp as this directory may be cleared at
- next reboot. A better place to save the file is
- /var/tmp. Run this command immediately before rebuilding
- the world, and then type exit when the
- process has finished:
+ The easiest way to do this is to use
+ script with a parameter that specifies
+ the name of the file to save all output to. Do not save the
+ output to /tmp as this directory may be
+ cleared at next reboot. A better place to save the file is
+ /var/tmp. Run this command immediately
+ before rebuilding the world, and then type
+ exit when the process has
+ finished:
- &prompt.root; script /var/tmp/mw.out
+ &prompt.root; script /var/tmp/mw.out
Script started, output file is /var/tmp/mw.out
@@ -1519,16 +1519,16 @@ Script started, output file is /var/tmp/mw.out
or startup scripts which have been added to &os; since the
last update. This is necessary so that the
installworld step will be able
- to use any new system accounts, groups, and
- scripts. Refer to for more
- detailed instructions about this command:
+ to use any new system accounts, groups, and scripts.
+ Refer to for more detailed
+ instructions about this command:
&prompt.root; mergemaster -p
- Install the new world and system binaries from /usr/obj.
+ Install the new world and system binaries from
+ /usr/obj.&prompt.root; cd /usr/src
&prompt.root; make installworld
@@ -1588,22 +1588,25 @@ Script started, output file is /var/tmp/mw.out
This build world process uses several configuration
files.
- The Makefile located in /usr/src
- describes how the programs that comprise &os; should be
- built and the order in which they should be built.
+ The Makefile located in
+ /usr/src describes how the programs that
+ comprise &os; should be built and the order in which they
+ should be built.
- The options available to make are described in
- &man.make.conf.5; and some common examples are included in
+ The options available to make are
+ described in &man.make.conf.5; and some common examples are
+ included in
/usr/share/examples/etc/make.conf. Any
options which are added to /etc/make.conf
will control the how make runs and builds
- programs. These options take effect every time make is
- used, including compiling applications from the Ports
- Collection, compiling custom C programs, or building the &os;
- operating system. Changes to some settings can have far-reaching and
- potentially surprising effects. Read the comments in both
- locations and keep in mind that the defaults have been chosen
- for a combination of performance and safety.
+ programs. These options take effect every time
+ make is used, including compiling
+ applications from the Ports Collection, compiling custom C
+ programs, or building the &os; operating system. Changes to
+ some settings can have far-reaching and potentially surprising
+ effects. Read the comments in both locations and keep in mind
+ that the defaults have been chosen for a combination of
+ performance and safety.src.conf
@@ -1630,17 +1633,17 @@ Script started, output file is /var/tmp/mw.out
In this example,
is an option
- passed to make. Refer to &man.make.1; for examples
- of the available options.
+ passed to make. Refer to &man.make.1; for
+ examples of the available options.
- To pass a variable, specify the variable name with .
- The
+ To pass a variable, specify the variable name with
+ . The
behavior of the Makefile is controlled by
variables. These can either be set in
/etc/make.conf or they can be specified
when using make. For example, this
- variable specifies that profiled libraries
- should not be built:
+ variable specifies that profiled libraries should not be
+ built:&prompt.root; make -DNO_PROFILE target
@@ -1649,43 +1652,43 @@ Script started, output file is /var/tmp/mw.out
NO_PROFILE= true # Avoid compiling profiled libraries
- The target tells make what
- to do and the Makefile defines the
- available targets. Some targets
- are used by the build process to break out the steps
- necessary to rebuild the system into a number of
+ The target tells
+ make what to do and the
+ Makefile defines the available targets.
+ Some targets are used by the build process to break out the
+ steps necessary to rebuild the system into a number of
sub-steps.Having separate options is useful for two reasons. First,
- it allows for a build that does not
- affect any components of a running system. Because of this,
- buildworld can be safely run on a machine
- running in multi-user mode. It is
- still recommended that installworld
- be run in part in single-user mode, though.
+ it allows for a build that does not affect any components of a
+ running system. Because of this,
+ buildworld can be safely run on a
+ machine running in multi-user mode. It is still recommended
+ that installworld be run in part in
+ single-user mode, though.
- Secondly, it allows NFS mounts to be used to upgrade
- multiple machines on a network, as described in .
+ Secondly, it allows NFS mounts to be
+ used to upgrade multiple machines on a network, as described
+ in .It is possible to specify which will
cause make to spawn several simultaneous
- processes.
- Since much of the compiling process is I/O-bound
- rather than CPU-bound, this is useful on both single CPU
- and multi-CPU machines.
+ processes. Since much of the compiling process is
+ I/O-bound rather than
+ CPU-bound, this is useful on both single
+ CPU and multi-CPU
+ machines.
- On a single-CPU machine, run
- the following command to have up to 4 processes running at
- any one time. Empirical evidence posted to the mailing lists
- shows this generally gives the best performance
- benefit.
+ On a single-CPU machine, run the
+ following command to have up to 4 processes running at any one
+ time. Empirical evidence posted to the mailing lists shows
+ this generally gives the best performance benefit.&prompt.root; make -j4 buildworld
- On a multi-CPU machine, try
- values between 6 and 10 to see how they speed things
- up.
+ On a multi-CPU machine, try values
+ between 6 and 10 to see
+ how they speed things up.rebuilding world
@@ -1693,11 +1696,11 @@ Script started, output file is /var/tmp/mw.out
- If any variables were specified to
- make buildworld, specify the same
- variables to make installworld. However,
- must never be used with
- installworld.
+ If any variables were specified to make
+ buildworld, specify the same variables to
+ make installworld. However,
+ must never be used
+ with installworld.For example, if this command was used:
@@ -1707,15 +1710,15 @@ Script started, output file is /var/tmp/mw.out
&prompt.root; make -DNO_PROFILE installworld
- Otherwise, the second command will try to install profiled
- libraries that were not built during the
+ Otherwise, the second command will try to install
+ profiled libraries that were not built during the
make buildworld phase.
-
-
- Merging Configuration Files
+
+
+ Merging Configuration Files
@@ -1734,73 +1737,71 @@ Script started, output file is /var/tmp/mw.out
- &os; provides the &man.mergemaster.8; Bourne script to aid in
- determining the differences between the configuration files
- in /etc, and the configuration files in
- /usr/src/etc. This is
- the recommended solution for keeping the system
- configuration files up to date with those located in the
- source tree.
-
- Before using mergemaster, it is recommended to first copy the existing
- /etc somewhere
- safe. Include which does a recursive copy and
- which preserves times and the ownerships on
- files:
+ &os; provides the &man.mergemaster.8; Bourne script to aid
+ in determining the differences between the configuration files
+ in /etc, and the configuration files in
+ /usr/src/etc. This is the recommended
+ solution for keeping the system configuration files up to date
+ with those located in the source tree.
- &prompt.root; cp -Rp /etc /etc.old
+ Before using mergemaster, it is
+ recommended to first copy the existing
+ /etc somewhere safe. Include
+ which does a recursive copy and
+ which preserves times and the ownerships
+ on files:
- When run, mergemaster
- builds a temporary root environment, from
- / down, and populates it with various
- system configuration files. Those files are then compared
- to the ones currently installed in the system. Files that
- differ will be shown in &man.diff.1; format, with the
- sign representing added or modified
- lines, and representing lines that will
- be either removed completely or replaced with a new file.
- Refer to &man.diff.1; for more information about
- how file differences are
- shown.
+ &prompt.root; cp -Rp /etc /etc.old
- Next, mergemaster will display each file that
- differs, and present options to: delete the new
- file, referred to as the temporary file, install the
- temporary file in its unmodified state, merge the
- temporary file with the currently installed file, or view
- the results again.
+ When run, mergemaster builds a
+ temporary root environment, from / down,
+ and populates it with various system configuration files.
+ Those files are then compared to the ones currently installed
+ in the system. Files that differ will be shown in
+ &man.diff.1; format, with the sign
+ representing added or modified lines, and
+ representing lines that will be either removed completely or
+ replaced with a new file. Refer to &man.diff.1; for more
+ information about how file differences are shown.
- Choosing to delete the temporary file will tell
- mergemaster to keep the current file unchanged and
- to delete the new version. This option is not recommended.
- To
- get help at any time, type ? at the
- mergemaster prompt. If the user chooses to skip a
- file, it will be presented again after all other files have
- been dealt with.
+ Next, mergemaster will display each
+ file that differs, and present options to: delete the new
+ file, referred to as the temporary file, install the temporary
+ file in its unmodified state, merge the temporary file with
+ the currently installed file, or view the results
+ again.
- Choosing to install the unmodified temporary file will
- replace the current file with the new one. For most
- unmodified files, this is the best option.
+ Choosing to delete the temporary file will tell
+ mergemaster to keep the current file
+ unchanged and to delete the new version. This option is not
+ recommended. To get help at any time, type
+ ? at the mergemaster
+ prompt. If the user chooses to skip a file, it will be
+ presented again after all other files have been dealt
+ with.
- Choosing to merge the file will present a text editor,
- and the contents of both files. The files can be merged
- by reviewing both files side by side on the screen, and
- choosing parts from both to create a finished product. When
- the files are compared side by side, l
- selects the left contents and r selects
- contents from the right. The final output will be a file
- consisting of both parts, which can then be installed. This
- option is customarily used for files where settings have
- been modified by the user.
+ Choosing to install the unmodified temporary file will
+ replace the current file with the new one. For most
+ unmodified files, this is the best option.
- Choosing to view the results again will
- redisplay the file differences.
+ Choosing to merge the file will present a text editor, and
+ the contents of both files. The files can be merged by
+ reviewing both files side by side on the screen, and choosing
+ parts from both to create a finished product. When the files
+ are compared side by side, l selects the left
+ contents and r selects contents from the
+ right. The final output will be a file consisting of both
+ parts, which can then be installed. This option is
+ customarily used for files where settings have been modified
+ by the user.
- After mergemaster is done with the system files,
- it will prompt for other options. It may
- prompt to rebuild the password file and will finish up with
- an option to remove left-over temporary files.
+ Choosing to view the results again will redisplay the file
+ differences.
+
+ After mergemaster is done with the
+ system files, it will prompt for other options. It may prompt
+ to rebuild the password file and will finish up with an option
+ to remove left-over temporary files.