Merge the Updating chapter into the Cutting Edge chapter, and rename the

new chapter "Updating and Upgrading FreeBSD."

Update other chapters to reference the new chapter name.

While here, add Audit chapter to the preface section.

Reviewed by:    murray, manolis, remko, pgj, -doc

1 files changed, 2 insertions, 2 deletions

diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index 2ae7f7e260..1facdd81a5 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -336,7 +336,7 @@ following line in &man.loader.conf.5:
 	you to realize that you have deleted your custom kernel
 	configuration file.  Also, do not edit <filename>GENERIC</filename>
 	directly, as it may get overwritten the next time you
-	<link linkend="cutting-edge">update your source tree</link>, and
+	<link linkend="updating-upgrading">update your source tree</link>, and
 	your kernel modifications will be lost.</para>
 
       <para>You might want to keep your kernel configuration file
@@ -374,7 +374,7 @@ following line in &man.loader.conf.5:
 
     <note>
       <para>If you <link
-        linkend="cutting-edge">sync your source tree</link> with the
+        linkend="updating-upgrading">sync your source tree</link> with the
         latest sources of the &os; project,
         be sure to always check the file
         <filename>/usr/src/UPDATING</filename> before you perform any update