diff --git a/en/handbook/README b/en/handbook/README
index e61b508d24..4779094055 100644
--- a/en/handbook/README
+++ b/en/handbook/README
@@ -284,3 +284,8 @@ for example,
  21. Replace the last few occurences of curly quoted items (`` and '') 
      with the right markup.
 
+ 22. Almost the last lot. I missed a diff I'd done at home. There's a
+     section in the handbook that talks about kernel options, where the
+     quoted options are quoted with `` and ''. Fix them so that standard
+     double quotes are used (so they can cut-n-pasted).
+
diff --git a/en/handbook/handbook.sgml b/en/handbook/handbook.sgml
index a535fe9063..5bc592479a 100644
--- a/en/handbook/handbook.sgml
+++ b/en/handbook/handbook.sgml
@@ -3328,7 +3328,7 @@
 	  
 	  <para>
 	    <variablelist>
-	      <varlistentry><term>machine ``i386''</term>
+	      <varlistentry><term>machine "i386"</term>
 		<listitem>
 		  <para>The first keyword is <emphasis
 		      remap=tt>machine</emphasis>, which, since FreeBSD only
@@ -3343,7 +3343,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>cpu ``<symbol>cpu_type</symbol>''</term>
+	      <varlistentry><term>cpu "<symbol>cpu_type</symbol>"</term>
 		
 		<listitem>
 		  <para>The next keyword is <emphasis remap=tt>cpu</emphasis>,
@@ -3502,7 +3502,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>options ``COMPAT_43''</term>
+	      <varlistentry><term>options "COMPAT_43"</term>
 		
 		<listitem>
 		  <para>Compatibility with 4.3BSD.  Leave this in; some
@@ -3619,7 +3619,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>options ``CD9660''</term>
+	      <varlistentry><term>options "CD9660"</term>
 		
 		<listitem>
 		  <para>ISO 9660 filesystem for CD-ROMs.  Comment it out if
@@ -3776,7 +3776,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device npx0 at isa? port ``IO_NPX'' irq 13
+	      <varlistentry><term>device npx0 at isa? port "IO_NPX" irq 13
 		  vector npxintr</term>
 		
 		<listitem>
@@ -3861,14 +3861,14 @@
 		  <para>
 		    <variablelist>
 		      <varlistentry><term>controller bt0 at isa? port
-			  ``IO_BT0'' bio irq ? vector btintr</term>
+			  "IO_BT0" bio irq ? vector btintr</term>
 			<listitem>
 			  <para>Most Buslogic controllers</para>
 			</listitem>
 		      </varlistentry>
 		      
 		      <varlistentry><term>controller uha0 at isa? port
-			  ``IO_UHA0'' bio irq ? drq 5 vector uhaintr</term>
+			  "IO_UHA0" bio irq ? drq 5 vector uhaintr</term>
 			
 			<listitem>
 			  <para>UltraStor 14F and 34F</para>
@@ -3891,7 +3891,7 @@
 		      </varlistentry>
 		      
 		      <varlistentry><term>controller aha0    at isa? port
-			  ``IO_AHA0'' bio irq ? drq 5 vector ahaintr</term>
+			  "IO_AHA0" bio irq ? drq 5 vector ahaintr</term>
 			
 			<listitem>
 			  <para>Adaptec 154x</para>
@@ -3945,7 +3945,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>options ``SCSI_DELAY=15''</term>
+	      <varlistentry><term>options "SCSI_DELAY=15"</term>
 		
 		<listitem>
 		  <para>This causes the kernel to pause 15 seconds before
@@ -4027,7 +4027,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device vt0 at isa? port ``IO_KBD'' tty irq 1
+	      <varlistentry><term>device vt0 at isa? port "IO_KBD" tty irq 1
 		  vector pcrint</term>
 		
 		<listitem>
@@ -4046,7 +4046,7 @@
 		  
 		  <para>
 		    <variablelist>
-		      <varlistentry><term>options ``PCVT_FREEBSD=210''</term>
+		      <varlistentry><term>options "PCVT_FREEBSD=210"</term>
 			<listitem>
 			  <para>Required with the <emphasis
 			      remap=tt>vt0</emphasis> console driver.</para>
@@ -4086,7 +4086,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device psm0 at isa? port ``IO_KBD''
+	      <varlistentry><term>device psm0 at isa? port "IO_KBD"
 		  conflicts tty irq 12 vector psmintr</term>
 		
 		<listitem>
@@ -4111,7 +4111,7 @@
 	  
 	  <para>
 	    <variablelist>
-	      <varlistentry><term>device sio0 at isa? port ``IO_COM1'' tty irq
+	      <varlistentry><term>device sio0 at isa? port "IO_COM1" tty irq
 		  4 vector siointr<anchor id="kernelconfig-serial"></term>
 		<listitem>
 		  <para><emphasis remap=tt>sio0</emphasis> through <emphasis
@@ -4461,7 +4461,7 @@
 		      example, <emphasis remap=tt>irq 5</emphasis> and remove
 		      the <emphasis remap=tt>conflicts</emphasis> keyword.
 		      Also, you must add the line: <literal>options
-			``SBC_IRQ=5''</literal></para>
+			"SBC_IRQ=5"</literal></para>
 		  </note>
 		</listitem>
 	      </varlistentry>
@@ -4525,14 +4525,14 @@
 	      </varlistentry>
 	      
 	      <varlistentry><term>device uart0 at isa? port 0x330 irq 5 vector
-		  ``m6850intr''</term>
+		  "m6850intr"</term>
 		
 		<listitem>
 		  <para>Stand-alone 6850 UART for MIDI.</para>
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device pca0 at isa? port ``IO_TIMER1''
+	      <varlistentry><term>device pca0 at isa? port "IO_TIMER1"
 		  tty<anchor id="kernelconfig-pcaudio"></term>
 		
 		<listitem>
@@ -4656,7 +4656,7 @@
 	  
 	  <para>
 	    <variablelist>
-	      <varlistentry><term>device joy0 at isa? port ``IO_GAME''</term>
+	      <varlistentry><term>device joy0 at isa? port "IO_GAME"</term>
 		<listitem>
 		  <para>PC joystick device.</para>
 		</listitem>
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index a535fe9063..5bc592479a 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -3328,7 +3328,7 @@
 	  
 	  <para>
 	    <variablelist>
-	      <varlistentry><term>machine ``i386''</term>
+	      <varlistentry><term>machine "i386"</term>
 		<listitem>
 		  <para>The first keyword is <emphasis
 		      remap=tt>machine</emphasis>, which, since FreeBSD only
@@ -3343,7 +3343,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>cpu ``<symbol>cpu_type</symbol>''</term>
+	      <varlistentry><term>cpu "<symbol>cpu_type</symbol>"</term>
 		
 		<listitem>
 		  <para>The next keyword is <emphasis remap=tt>cpu</emphasis>,
@@ -3502,7 +3502,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>options ``COMPAT_43''</term>
+	      <varlistentry><term>options "COMPAT_43"</term>
 		
 		<listitem>
 		  <para>Compatibility with 4.3BSD.  Leave this in; some
@@ -3619,7 +3619,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>options ``CD9660''</term>
+	      <varlistentry><term>options "CD9660"</term>
 		
 		<listitem>
 		  <para>ISO 9660 filesystem for CD-ROMs.  Comment it out if
@@ -3776,7 +3776,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device npx0 at isa? port ``IO_NPX'' irq 13
+	      <varlistentry><term>device npx0 at isa? port "IO_NPX" irq 13
 		  vector npxintr</term>
 		
 		<listitem>
@@ -3861,14 +3861,14 @@
 		  <para>
 		    <variablelist>
 		      <varlistentry><term>controller bt0 at isa? port
-			  ``IO_BT0'' bio irq ? vector btintr</term>
+			  "IO_BT0" bio irq ? vector btintr</term>
 			<listitem>
 			  <para>Most Buslogic controllers</para>
 			</listitem>
 		      </varlistentry>
 		      
 		      <varlistentry><term>controller uha0 at isa? port
-			  ``IO_UHA0'' bio irq ? drq 5 vector uhaintr</term>
+			  "IO_UHA0" bio irq ? drq 5 vector uhaintr</term>
 			
 			<listitem>
 			  <para>UltraStor 14F and 34F</para>
@@ -3891,7 +3891,7 @@
 		      </varlistentry>
 		      
 		      <varlistentry><term>controller aha0    at isa? port
-			  ``IO_AHA0'' bio irq ? drq 5 vector ahaintr</term>
+			  "IO_AHA0" bio irq ? drq 5 vector ahaintr</term>
 			
 			<listitem>
 			  <para>Adaptec 154x</para>
@@ -3945,7 +3945,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>options ``SCSI_DELAY=15''</term>
+	      <varlistentry><term>options "SCSI_DELAY=15"</term>
 		
 		<listitem>
 		  <para>This causes the kernel to pause 15 seconds before
@@ -4027,7 +4027,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device vt0 at isa? port ``IO_KBD'' tty irq 1
+	      <varlistentry><term>device vt0 at isa? port "IO_KBD" tty irq 1
 		  vector pcrint</term>
 		
 		<listitem>
@@ -4046,7 +4046,7 @@
 		  
 		  <para>
 		    <variablelist>
-		      <varlistentry><term>options ``PCVT_FREEBSD=210''</term>
+		      <varlistentry><term>options "PCVT_FREEBSD=210"</term>
 			<listitem>
 			  <para>Required with the <emphasis
 			      remap=tt>vt0</emphasis> console driver.</para>
@@ -4086,7 +4086,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device psm0 at isa? port ``IO_KBD''
+	      <varlistentry><term>device psm0 at isa? port "IO_KBD"
 		  conflicts tty irq 12 vector psmintr</term>
 		
 		<listitem>
@@ -4111,7 +4111,7 @@
 	  
 	  <para>
 	    <variablelist>
-	      <varlistentry><term>device sio0 at isa? port ``IO_COM1'' tty irq
+	      <varlistentry><term>device sio0 at isa? port "IO_COM1" tty irq
 		  4 vector siointr<anchor id="kernelconfig-serial"></term>
 		<listitem>
 		  <para><emphasis remap=tt>sio0</emphasis> through <emphasis
@@ -4461,7 +4461,7 @@
 		      example, <emphasis remap=tt>irq 5</emphasis> and remove
 		      the <emphasis remap=tt>conflicts</emphasis> keyword.
 		      Also, you must add the line: <literal>options
-			``SBC_IRQ=5''</literal></para>
+			"SBC_IRQ=5"</literal></para>
 		  </note>
 		</listitem>
 	      </varlistentry>
@@ -4525,14 +4525,14 @@
 	      </varlistentry>
 	      
 	      <varlistentry><term>device uart0 at isa? port 0x330 irq 5 vector
-		  ``m6850intr''</term>
+		  "m6850intr"</term>
 		
 		<listitem>
 		  <para>Stand-alone 6850 UART for MIDI.</para>
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device pca0 at isa? port ``IO_TIMER1''
+	      <varlistentry><term>device pca0 at isa? port "IO_TIMER1"
 		  tty<anchor id="kernelconfig-pcaudio"></term>
 		
 		<listitem>
@@ -4656,7 +4656,7 @@
 	  
 	  <para>
 	    <variablelist>
-	      <varlistentry><term>device joy0 at isa? port ``IO_GAME''</term>
+	      <varlistentry><term>device joy0 at isa? port "IO_GAME"</term>
 		<listitem>
 		  <para>PC joystick device.</para>
 		</listitem>
diff --git a/en_US.ISO_8859-1/books/handbook/book.sgml b/en_US.ISO_8859-1/books/handbook/book.sgml
index a535fe9063..5bc592479a 100644
--- a/en_US.ISO_8859-1/books/handbook/book.sgml
+++ b/en_US.ISO_8859-1/books/handbook/book.sgml
@@ -3328,7 +3328,7 @@
 	  
 	  <para>
 	    <variablelist>
-	      <varlistentry><term>machine ``i386''</term>
+	      <varlistentry><term>machine "i386"</term>
 		<listitem>
 		  <para>The first keyword is <emphasis
 		      remap=tt>machine</emphasis>, which, since FreeBSD only
@@ -3343,7 +3343,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>cpu ``<symbol>cpu_type</symbol>''</term>
+	      <varlistentry><term>cpu "<symbol>cpu_type</symbol>"</term>
 		
 		<listitem>
 		  <para>The next keyword is <emphasis remap=tt>cpu</emphasis>,
@@ -3502,7 +3502,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>options ``COMPAT_43''</term>
+	      <varlistentry><term>options "COMPAT_43"</term>
 		
 		<listitem>
 		  <para>Compatibility with 4.3BSD.  Leave this in; some
@@ -3619,7 +3619,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>options ``CD9660''</term>
+	      <varlistentry><term>options "CD9660"</term>
 		
 		<listitem>
 		  <para>ISO 9660 filesystem for CD-ROMs.  Comment it out if
@@ -3776,7 +3776,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device npx0 at isa? port ``IO_NPX'' irq 13
+	      <varlistentry><term>device npx0 at isa? port "IO_NPX" irq 13
 		  vector npxintr</term>
 		
 		<listitem>
@@ -3861,14 +3861,14 @@
 		  <para>
 		    <variablelist>
 		      <varlistentry><term>controller bt0 at isa? port
-			  ``IO_BT0'' bio irq ? vector btintr</term>
+			  "IO_BT0" bio irq ? vector btintr</term>
 			<listitem>
 			  <para>Most Buslogic controllers</para>
 			</listitem>
 		      </varlistentry>
 		      
 		      <varlistentry><term>controller uha0 at isa? port
-			  ``IO_UHA0'' bio irq ? drq 5 vector uhaintr</term>
+			  "IO_UHA0" bio irq ? drq 5 vector uhaintr</term>
 			
 			<listitem>
 			  <para>UltraStor 14F and 34F</para>
@@ -3891,7 +3891,7 @@
 		      </varlistentry>
 		      
 		      <varlistentry><term>controller aha0    at isa? port
-			  ``IO_AHA0'' bio irq ? drq 5 vector ahaintr</term>
+			  "IO_AHA0" bio irq ? drq 5 vector ahaintr</term>
 			
 			<listitem>
 			  <para>Adaptec 154x</para>
@@ -3945,7 +3945,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>options ``SCSI_DELAY=15''</term>
+	      <varlistentry><term>options "SCSI_DELAY=15"</term>
 		
 		<listitem>
 		  <para>This causes the kernel to pause 15 seconds before
@@ -4027,7 +4027,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device vt0 at isa? port ``IO_KBD'' tty irq 1
+	      <varlistentry><term>device vt0 at isa? port "IO_KBD" tty irq 1
 		  vector pcrint</term>
 		
 		<listitem>
@@ -4046,7 +4046,7 @@
 		  
 		  <para>
 		    <variablelist>
-		      <varlistentry><term>options ``PCVT_FREEBSD=210''</term>
+		      <varlistentry><term>options "PCVT_FREEBSD=210"</term>
 			<listitem>
 			  <para>Required with the <emphasis
 			      remap=tt>vt0</emphasis> console driver.</para>
@@ -4086,7 +4086,7 @@
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device psm0 at isa? port ``IO_KBD''
+	      <varlistentry><term>device psm0 at isa? port "IO_KBD"
 		  conflicts tty irq 12 vector psmintr</term>
 		
 		<listitem>
@@ -4111,7 +4111,7 @@
 	  
 	  <para>
 	    <variablelist>
-	      <varlistentry><term>device sio0 at isa? port ``IO_COM1'' tty irq
+	      <varlistentry><term>device sio0 at isa? port "IO_COM1" tty irq
 		  4 vector siointr<anchor id="kernelconfig-serial"></term>
 		<listitem>
 		  <para><emphasis remap=tt>sio0</emphasis> through <emphasis
@@ -4461,7 +4461,7 @@
 		      example, <emphasis remap=tt>irq 5</emphasis> and remove
 		      the <emphasis remap=tt>conflicts</emphasis> keyword.
 		      Also, you must add the line: <literal>options
-			``SBC_IRQ=5''</literal></para>
+			"SBC_IRQ=5"</literal></para>
 		  </note>
 		</listitem>
 	      </varlistentry>
@@ -4525,14 +4525,14 @@
 	      </varlistentry>
 	      
 	      <varlistentry><term>device uart0 at isa? port 0x330 irq 5 vector
-		  ``m6850intr''</term>
+		  "m6850intr"</term>
 		
 		<listitem>
 		  <para>Stand-alone 6850 UART for MIDI.</para>
 		</listitem>
 	      </varlistentry>
 	      
-	      <varlistentry><term>device pca0 at isa? port ``IO_TIMER1''
+	      <varlistentry><term>device pca0 at isa? port "IO_TIMER1"
 		  tty<anchor id="kernelconfig-pcaudio"></term>
 		
 		<listitem>
@@ -4656,7 +4656,7 @@
 	  
 	  <para>
 	    <variablelist>
-	      <varlistentry><term>device joy0 at isa? port ``IO_GAME''</term>
+	      <varlistentry><term>device joy0 at isa? port "IO_GAME"</term>
 		<listitem>
 		  <para>PC joystick device.</para>
 		</listitem>