diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
index e489f81a80..e2310785c2 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -884,7 +884,7 @@ Script done, &hellip;</screen>
 	<para>The general format of the command line you will type is as
 	  follows:</para>
 
-	<screen>&prompt.root; <userinput>make -<replaceable/x/ -D<replaceable>VARIABLE</replaceable> <replaceable>target</replaceable></userinput></screen>
+	<screen>&prompt.root; <userinput>make -<replaceable>x</replaceable> -D<replaceable>VARIABLE</replaceable> <replaceable>target</replaceable></userinput></screen>
 
 	<para>In this example, <option>-<replaceable>x</replaceable></option>
 	  is an option that you would pass to &man.make.1;.  See the
@@ -948,12 +948,12 @@ Script done, &hellip;</screen>
 
 	<para>Secondly, it allows you to use NFS mounts to upgrade 
 	  multiple machines on your network.  If you have three machines,
-	  A, B and C that you want to upgrade, run <command>make
+	  <hostid>A</hostid>, <hostid>B</hostid> and <hostid>C</hostid> that you want to upgrade, run <command>make
 	  buildworld</command> and <command>make installworld</command> on
-	  A.  B and C should then NFS mount <filename>/usr/src</filename>
-	  and <filename>/usr/obj</filename> from A, and you can then run
+	  <hostid>A</hostid>.  <hostid>B</hostid> and <hostid>C</hostid> should then NFS mount <filename>/usr/src</filename>
+	  and <filename>/usr/obj</filename> from <hostid>A</hostid>, and you can then run
 	  <command>make installworld</command> to install the results of 
-	  the build on B and C.</para>
+	  the build on <hostid>B</hostid> and <hostid>C</hostid>.</para>
 
 	<para>Although the <maketarget>world</maketarget> target still exists,
 	  you are strongly encouraged not to use it.</para>
@@ -1031,12 +1031,18 @@ Script done, &hellip;</screen>
         <maketarget>buildworld</maketarget></link>.</para>
 
       <note><para>If you want to build a custom kernel, and already have a configuration
-	file, just append <maketarget>KERNCONF='MYKERNEL'</maketarget> to any of the
-	following options:</para></note>
+	file, just use <literal>KERNCONF=<replaceable>MYKERNEL</replaceable></literal>
+	like this:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make buildkernel</userinput>
-&prompt.root; <userinput>make installkernel</userinput></screen>
+&prompt.root; <userinput>make buildkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput>
+&prompt.root; <userinput>make installkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput></screen>
+
+	<para>In FreeBSD&nbsp;4.2 and older you must replace
+	  <literal>KERNCONF=</literal> with <literal>KERNEL=</literal>.
+	  4.2-STABLE that was fetched after Feb 2nd, 2001 does
+	  recognize <literal>KERNCONF=</literal>.</para>
+      </note>
 
       <para>Note that if you have raised <literal>kern.securelevel</literal>
 	above 1 <emphasis>and</emphasis> you have set either the
@@ -1242,17 +1248,17 @@ Script done, &hellip;</screen>
 	time of writing the only files like this are shell startup files in
 	<filename>/var/tmp/root/</filename> and
 	<filename>/var/tmp/root/root/</filename>, although there may be others
-	(depending on when you are reading this.  Make sure you use
-	<command/ls -a/ to catch them.</para>
+	(depending on when you are reading this).  Make sure you use
+	<command>ls -a</command> to catch them.</para>
     
       <para>The simplest way to do this is to use &man.diff.1; to compare the
-	two files.</para>
+	two files:</para>
     
       <screen>&prompt.root; <userinput>diff /etc/shells /var/tmp/root/etc/shells</userinput></screen>
       
       <para>This will show you the differences between your
 	<filename>/etc/shells</filename> file and the new
-	<filename>/etc/shells</filename> file.  Use these to decide whether to
+	<filename>/var/tmp/root/etc/shells</filename> file.  Use these to decide whether to
 	merge in changes that you have made or whether to copy over your old
 	file.</para>
     
@@ -1275,7 +1281,7 @@ Script done, &hellip;</screen>
 	      <filename>/etc</filename> and the other directories, give the
 	      target directory a name based on the current date.  If you were
 	      doing this on the 14th of February 1998 you could do the
-	      following.</para>
+	      following:</para>
 	  
 	    <screen>&prompt.root; <userinput>mkdir /var/tmp/root-19980214</userinput>
 &prompt.root; <userinput>cd /usr/src/etc</userinput>
@@ -1303,7 +1309,7 @@ Script done, &hellip;</screen>
 	  <step>
 	    <para>You can now see the differences that have been made in the
 	      intervening week using &man.diff.1; to create a recursive diff
-	      between the two directories.</para>
+	      between the two directories:</para>
 	      
 	    <screen>&prompt.root; <userinput>cd /var/tmp</userinput>
 &prompt.root; <userinput>diff -r root-19980214 root-19980221</userinput></screen>
@@ -1318,7 +1324,7 @@ Script done, &hellip;</screen>
 	  
 	  <step>
 	    <para>You can now remove the older of the two
-	      <filename>/var/tmp/root-*</filename> directories.</para>
+	      <filename>/var/tmp/root-*</filename> directories:</para>
 	      
 	    <screen>&prompt.root; <userinput>rm -rf /var/tmp/root-19980214</userinput></screen>
 	  </step>
@@ -1330,7 +1336,7 @@ Script done, &hellip;</screen>
 	</procedure>
 
 	<para>You can use &man.date.1; to automate the generation of the
-	  directory names.</para>
+	  directory names:</para>
 	  
 	<screen>&prompt.root; <userinput>mkdir /var/tmp/root-`date "+%Y%m%d"`</userinput></screen>
       </tip>