Do what I swore would be done:

o Remove 4.X information, this includes notes and sections.

o Update documentation to reflect 5.X and 6.X.

o In some areas, try to make the new content version agnostic.

o Skip areas stating "5.[0-5] and later" as it's relevant - we
need a better way to handle these.

For several items, I checked the NOTES files, manual pages,
CVS history, etc.

Discussed on:		-doc
A few ideas from:	remko

1 files changed, 7 insertions, 8 deletions

diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml b/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
index fedc1d5b5a..267f81ecc0 100644
--- a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
@@ -218,7 +218,7 @@ label=FreeBSD</programlisting>
 	they have been split into two, but you would always install them
 	together.  They are copied from the combined file
 	<filename>/boot/boot</filename> by the installer or
-	<application>disklabel</application> (see below).</para>
+	<application>bsdlabel</application> (see below).</para>
 
       <para>They are located outside file systems, in the first track of
 	the boot slice, starting with the first sector.  This is where <link
@@ -230,7 +230,7 @@ label=FreeBSD</programlisting>
       <para><filename>boot1</filename> is very simple, since it
 	can only be 512 bytes
 	in size, and knows just enough about the FreeBSD
-	<firstterm>disklabel</firstterm>, which stores information
+	<firstterm>bsdlabel</firstterm>, which stores information
 	about the slice, to find and execute <filename>boot2</filename>.</para>
       
       <para><filename>boot2</filename> is slightly more sophisticated, and understands
@@ -254,9 +254,9 @@ boot:</screen>
 
       <para>If you ever need to replace the installed
 	<filename>boot1</filename> and <filename>boot2</filename> use
-	&man.disklabel.8;:</para>
+	&man.bsdlabel.8;:</para>
       
-      <screen>&prompt.root; <userinput>disklabel -B <replaceable>diskslice</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>bsdlabel -B <replaceable>diskslice</replaceable></userinput></screen>
 
       <para>where <replaceable>diskslice</replaceable> is the disk and slice
 	you boot from, such as <devicename>ad0s1</devicename> for the first
@@ -266,10 +266,10 @@ boot:</screen>
 	<title>Dangerously Dedicated Mode</title>
 
 	<para>If you use just the disk name, such as
-	  <devicename>ad0</devicename>, in the &man.disklabel.8; command you
+	  <devicename>ad0</devicename>, in the &man.bsdlabel.8; command you
 	  will create a dangerously dedicated disk, without slices.  This is
 	  almost certainly not what you want to do, so make sure you double
-	  check the &man.disklabel.8; command before you press
+	  check the &man.bsdlabel.8; command before you press
 	  <keycap>Return</keycap>.</para>
       </warning>
     </sect2>
@@ -801,8 +801,7 @@ console none                            unknown off insecure</programlisting>
 
     <note>
       <para>Power management requires &man.acpi.4; support in the kernel
-	or loaded as module for FreeBSD&nbsp;5.X and &man.apm.4;
-	support for FreeBSD&nbsp;4.X.</para>
+	or loaded as module for.</para>
     </note>
 
   </sect1>