Index: head/en_US.ISO8859-1/books/handbook/usb-device-mode/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/handbook/usb-device-mode/chapter.xml
+++ head/en_US.ISO8859-1/books/handbook/usb-device-mode/chapter.xml
@@ -127,19 +127,19 @@
       <para>To enable USB device mode serial ports, add those lines
 	to <filename>/etc/ttys</filename>:</para>
 
-      <screen>ttyU0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
-ttyU1	"/usr/libexec/getty 3wire"	vt100	onifconsole secure</screen>
+      <programlisting>ttyU0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyU1	"/usr/libexec/getty 3wire"	vt100	onifconsole secure</programlisting>
 
       <para>Then add these lines to
 	<filename>/etc/devd.conf</filename>:</para>
 
-      <screen>notify 100 {
+      <programlisting>notify 100 {
 	match "system"		"DEVFS";
 	match "subsystem"	"CDEV";
 	match "type"		"CREATE";
 	match "cdev"		"ttyU[0-9]+";
 	action "/sbin/init q";
-};</screen>
+};</programlisting>
 
       <para>Reload the configuration if
 	&man.devd.8; is already running:</para>
@@ -175,13 +175,13 @@
 
 	<screen>&prompt.root; <userinput>cu -l /dev/ttyU0</userinput></screen>
 
-      <para>After pressing the Enter key a few times you will see
+      <para>After pressing the <keycap>Enter</keycap> key a few times you will see
 	a login prompt.</para>
     </sect2>
 
     <sect2>
       <title>Connecting to USB Device Mode Serial Ports from
-	macOS</title>
+	&macos;</title>
 
       <para>To connect to a board configured to provide USB device
 	mode serial ports, connect the USB host, such as a laptop,
@@ -238,8 +238,8 @@
       those lines to <filename>/boot/loader.conf</filename>, creating
       it if it does not already exist:</para>
 
-    <screen>if_cdce_load="YES"
-hw.usb.template=1</screen>
+    <programlisting>if_cdce_load="YES"
+hw.usb.template=1</programlisting>
 
     <para>To load the module and set the template without rebooting
       use:</para>