diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1195,9 +1195,10 @@
&prompt.root; make -j4 buildworld
&prompt.root; make -j4 kernel
&prompt.root; shutdown -r now
+&prompt.root; etcupdate -Fp
&prompt.root; cd /usr/src
&prompt.root; make installworld
-&prompt.root; mergemaster -Ui
+&prompt.root; etcupdate -F
&prompt.root; shutdown -r now
@@ -1214,6 +1215,12 @@
from source.
+
+ Update and merge configuration files in
+ /etc/ required before
+ installworld.
+
+
Go to the source directory.
@@ -1241,7 +1248,7 @@
Install the world.
-
+ Update and merge configuration files in
/etc/.
@@ -1536,13 +1543,39 @@
libraries are located and removed, then the system is
restarted.
-
+
+ Merging Configuration Files with
+ &man.etcupdate.8;
+
+ &man.etcupdate.8; is a tool for managing updates to
+ files that are not updated as part of an installworld such
+ as files in /etc/. It manages updates
+ by doing a three-way merge of changes made to these files
+ against the local versions. It is also designed to minimize
+ the amount of user intervention which is the largest benefit
+ in comparison to &man.mergemaster.8;.
+
+ In general, &man.etcupdate.8; does not need any specific
+ arguments for its job. An interesting option might be
+ which will help in merging files where
+ the only difference is in the &os; ID tag.
+
+ If &man.etcupdate.8; is not able to merge a file
+ automatically, the merge conflicts can be resolved by manual
+ interaction by issuing:
+
+ &prompt.root; etcupdate resolve
+
+
+ Merging Configuration Files with
&man.mergemaster.8;
- &man.mergemaster.8; provides an easy
- way to merge changes that have been made to system
- configuration files with new versions of those files.
+ &man.mergemaster.8; provides a way to merge changes that
+ have been made to system configuration files with new
+ versions of those files. &man.mergemaster.8; is an
+ alternative to the more preferred &man.etcupdate.8;
+ tool.With , &man.mergemaster.8;
automatically updates files that have not been user-modified