Index: zfs/chapter.xml
===================================================================
--- zfs/chapter.xml
+++ zfs/chapter.xml
@@ -1893,14 +1893,12 @@
       current status of a share, enter:</para>
 
       <screen>&prompt.root; <userinput>zfs get sharenfs <replaceable>mypool/usr/home</replaceable></userinput>
-	NAME             PROPERTY  VALUE    SOURCE
-	mypool/usr/home  sharenfs  on       local
+NAME             PROPERTY  VALUE    SOURCE
+mypool/usr/home  sharenfs  on       local
+&prompt.root; <userinput>zfs get sharesmb <replaceable>mypool/usr/home</replaceable></userinput>
+NAME             PROPERTY  VALUE    SOURCE
+mypool/usr/home  sharesmb  off      local</screen>
 
-	&prompt.root; <userinput>zfs get sharesmb <replaceable>mypool/usr/home</replaceable></userinput>
-
-	NAME             PROPERTY  VALUE    SOURCE
-	mypool/usr/home  sharesmb  off      local</screen>
-
       <para>To enable sharing of a dataset, enter:</para>
 
       <screen>&prompt.root; <userinput> zfs set sharenfs=on <replaceable>mypool/usr/home</replaceable></userinput></screen>
@@ -1911,7 +1909,7 @@
       <option>-network</option>.  To set additional options to a
       dataset shared through NFS, enter:</para>
 
-      <screen>&prompt.root; <userinput> zfs set sharenfs="-alldirs,-maproot=<replaceable>root</replaceable>,-network=<replaceable>192.168.1.0/24</replaceable> <replaceable>mypool/usr/home</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput> zfs set sharenfs="-alldirs,-maproot=<replaceable>root</replaceable>,-network=<replaceable>192.168.1.0/24</replaceable>" <replaceable>mypool/usr/home</replaceable></userinput></screen>
       </sect3>
     </sect2>
 
@@ -2178,12 +2176,11 @@
 mypool/var/tmp@my_recursive_snapshot    88K      -   152K  -
 mypool/var/tmp@after_cp               53.5K      -   118K  -
 mypool/var/tmp@diff_snapshot              0      -   120K  -
-&prompt.user; <userinput>ls /var/tmp</userinput>
+&prompt.root; <userinput>ls /var/tmp</userinput>
 passwd          passwd.copy
-&prompt.user; <userinput>rm /var/tmp/passwd*</userinput>
-&prompt.user; <userinput>ls /var/tmp</userinput>
-vi.recover
-&prompt.user;</screen>
+&prompt.root; <userinput>rm /var/tmp/passwd*</userinput>
+&prompt.root; <userinput>ls /var/tmp</userinput>
+vi.recover</screen>
 
 	<para>At this point, the user realized that too many files
 	  were deleted and wants them back.  <acronym>ZFS</acronym>
@@ -2193,7 +2190,7 @@
 	  the last snapshot, issue the command:</para>
 
 	<screen>&prompt.root; <userinput>zfs rollback <replaceable>mypool/var/tmp@diff_snapshot</replaceable></userinput>
-&prompt.user; <userinput>ls /var/tmp</userinput>
+&prompt.root; <userinput>ls /var/tmp</userinput>
 passwd          passwd.copy     vi.recover</screen>
 
 	<para>The rollback operation restored the dataset to the state
@@ -2229,7 +2226,7 @@
 &prompt.root; <userinput>zfs list -rt snapshot <replaceable>mypool/var/tmp</replaceable></userinput>
 NAME                                   USED  AVAIL  REFER  MOUNTPOINT
 mypool/var/tmp@my_recursive_snapshot     8K      -   152K  -
-&prompt.user; <userinput>ls /var/tmp</userinput>
+&prompt.root; <userinput>ls /var/tmp</userinput>
 vi.recover</screen>
 
 	<para>The output from <command>zfs list -t snapshot</command>
@@ -2257,10 +2254,10 @@
 	<screen>&prompt.root; <userinput>zfs get snapdir <replaceable>mypool/var/tmp</replaceable></userinput>
 NAME            PROPERTY  VALUE    SOURCE
 mypool/var/tmp  snapdir   hidden   default
-&prompt.user; <userinput>ls -a /var/tmp</userinput>
+&prompt.root; <userinput>ls -a /var/tmp</userinput>
 .               ..              passwd          vi.recover
 &prompt.root; <userinput>zfs set snapdir=visible <replaceable>mypool/var/tmp</replaceable></userinput>
-&prompt.user; <userinput>ls -a /var/tmp</userinput>
+&prompt.root; <userinput>ls -a /var/tmp</userinput>
 .               ..              .zfs            passwd          vi.recover</screen>
 
 	<para>Individual files can easily be restored to a previous
@@ -2275,7 +2272,7 @@
 	  file:</para>
 
 	<screen>&prompt.root; <userinput>rm /var/tmp/passwd</userinput>
-&prompt.user; <userinput>ls -a /var/tmp</userinput>
+&prompt.root; <userinput>ls -a /var/tmp</userinput>
 .               ..              .zfs            vi.recover
 &prompt.root; <userinput>ls /var/tmp/.zfs/snapshot</userinput>
 after_cp                my_recursive_snapshot
@@ -2640,7 +2637,7 @@
 	  <listitem>
 	    <para>On the sending system:</para>
 
-	    <screen>&prompt.root; <command>zfs allow -u someuser send,snapshot <replaceable>mypool</replaceable></command></screen>
+	    <screen>&prompt.root; <userinput>zfs allow -u someuser send,snapshot <replaceable>mypool</replaceable></userinput></screen>
 	  </listitem>
 
 	  <listitem>
@@ -2648,12 +2645,12 @@
 	      the directory, and regular users must be allowed to
 	      mount file systems.  On the receiving system:</para>
 
-	    <screen>&prompt.root; sysctl vfs.usermount=1
+	    <screen>&prompt.root; <userinput>sysctl vfs.usermount=1</userinput>
 vfs.usermount: 0 -> 1
-&prompt.root; echo vfs.usermount=1 >> /etc/sysctl.conf
+&prompt.root; <userinput>echo vfs.usermount=1 >> /etc/sysctl.conf</userinput>
 &prompt.root; <userinput>zfs create <replaceable>recvpool/backup</replaceable></userinput>
 &prompt.root; <userinput>zfs allow -u <replaceable>someuser</replaceable> create,mount,receive <replaceable>recvpool/backup</replaceable></userinput>
-&prompt.root; chown <replaceable>someuser</replaceable> <replaceable>/recvpool/backup</replaceable></screen>
+&prompt.root; <userinput>chown <replaceable>someuser</replaceable> <replaceable>/recvpool/backup</replaceable></userinput></screen>
 	  </listitem>
 	</itemizedlist>
 
@@ -2941,10 +2938,9 @@
 	copied three times into different directories on the
 	deduplicated pool created above.</para>
 
-      <screen>&prompt.root; <userinput>zpool list</userinput>
-for d in dir1 dir2 dir3; do
-for> mkdir $d &amp;&amp; cp -R /usr/ports $d &amp;
-for> done</screen>
+      <screen>&prompt.root; <userinput>for d in dir1 dir2 dir3; do</userinput>
+> <userinput>mkdir $d &amp;&amp; cp -R /usr/ports $d &amp;</userinput>
+> <userinput>done</userinput></screen>
 
       <para>Redundant data is detected and deduplicated:</para>