diff --git a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml
index b5294e63fc..d24c06c5c4 100644
--- a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml
@@ -123,7 +123,7 @@ KMOD=skeleton
<para>Simply running <command>make</command> with this makefile
will create a file <filename>skeleton.ko</filename> that can
be loaded into your system by typing:
-<screen>&prompt.root; kldload -v ./skeleton.ko</screen>
+<screen>&prompt.root; <userinput>kldload -v ./skeleton.ko</userinput></screen>
</para>
</sect2>
</sect1>
@@ -336,13 +336,13 @@ DEV_MODULE(echo,echo_loader,NULL);</programlisting>
<para>To install this driver you will first need to make a node on
your filesystem with a command such as:</para>
- <screen>&prompt.root; mknod /dev/echo c 33 0</screen>
+ <screen>&prompt.root; <userinput>mknod /dev/echo c 33 0</userinput></screen>
<para>With this driver loaded you should now be able to type
something like:</para>
- <screen>&prompt.root; echo -n "Test Data" > /dev/echo
-&prompt.root; cat /dev/echo
+ <screen>&prompt.root; <userinput>echo -n "Test Data" > /dev/echo</userinput>
+&prompt.root; <userinput>cat /dev/echo</userinput>
Test Data</screen>
<para>Real hardware devices in the next chapter..</para>
diff --git a/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml
index b5294e63fc..d24c06c5c4 100644
--- a/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml
@@ -123,7 +123,7 @@ KMOD=skeleton
<para>Simply running <command>make</command> with this makefile
will create a file <filename>skeleton.ko</filename> that can
be loaded into your system by typing:
-<screen>&prompt.root; kldload -v ./skeleton.ko</screen>
+<screen>&prompt.root; <userinput>kldload -v ./skeleton.ko</userinput></screen>
</para>
</sect2>
</sect1>
@@ -336,13 +336,13 @@ DEV_MODULE(echo,echo_loader,NULL);</programlisting>
<para>To install this driver you will first need to make a node on
your filesystem with a command such as:</para>
- <screen>&prompt.root; mknod /dev/echo c 33 0</screen>
+ <screen>&prompt.root; <userinput>mknod /dev/echo c 33 0</userinput></screen>
<para>With this driver loaded you should now be able to type
something like:</para>
- <screen>&prompt.root; echo -n "Test Data" > /dev/echo
-&prompt.root; cat /dev/echo
+ <screen>&prompt.root; <userinput>echo -n "Test Data" > /dev/echo</userinput>
+&prompt.root; <userinput>cat /dev/echo</userinput>
Test Data</screen>
<para>Real hardware devices in the next chapter..</para>
diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
index c495b69b10..27f0757ff0 100644
--- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
@@ -680,9 +680,7 @@ fe80:2::%ep0/64 link#2 UC ep0</screen>
of the packet, which should be more than 65,535. For example,
type as follows:</para>
- <para><userinput>
- &prompt.user; <command>ping6 -b 70000 -s 68000 ::1</command>
- </userinput></para>
+ <screen>&prompt.user; <userinput>ping6 -b 70000 -s 68000 ::1</userinput></screen>
<para>The IPv6 specification requires that the Jumbo Payload option
must not be used in a packet that carries a fragment header. If
@@ -697,10 +695,10 @@ fe80:2::%ep0/64 link#2 UC ep0</screen>
statistics are incremented. You can see the statistics as output of
&man.netstat.8; command with `-s -p ip6' option:</para>
- <screen> &prompt.user; <command>netstat -s -p ip6</command>
+ <screen>&prompt.user; <userinput>netstat -s -p ip6</userinput>
ip6:
(snip)
- 1 with data size < data length</screen>
+ 1 with data size < data length</screen>
<para>So, kernel does not send an ICMPv6 error unless the erroneous
packet is an actual Jumbo Payload, that is, its packet size is more
diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 85fb846fd7..a6021065d3 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -1550,7 +1550,7 @@ File: +DESC (ignored)</screen>
bad144. For example, the following drive has
<command>bad144</command> enabled.:</para>
- <screen>&prompt.root; disklabel -r wd0
+ <screen>&prompt.root; <userinput>disklabel -r wd0</userinput>
# /dev/rwd0c:
type: ESDI
disk: wd0s1
@@ -4051,7 +4051,7 @@ IO range check 0x00 activate 0x01</screen>
the output from <command>pciconf -vl</command> for an onboard
sound chip:</para>
- <screen>&prompt.root; pciconf -vl
+ <screen>&prompt.root; <userinput>pciconf -vl</userinput>
chip1@pci0:31:5: class=0x040100 card=0x00931028 chip=0x24158086 rev=0x02 hdr=0x00
vendor = 'Intel Corporation'
device = '82801AA 8xx Chipset AC'97 Audio Controller'