Index: /trunk/doc/manual/en_US/user_Frontends.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Frontends.xml	(revision 51239)
+++ /trunk/doc/manual/en_US/user_Frontends.xml	(revision 51240)
@@ -450,5 +450,5 @@
                       <listitem>
                         <para>To enable the library for a particular VM, you
-                        must then switch authentication to external:<screen>VBoxManage modifyvm &lt;vm&gt; --vrdeauthtype external</screen></para>
+                        must then switch authentication to external:<screen>VBoxManage modifyvm "VM name" --vrdeauthtype external</screen></para>
 
                         <para>Replace
@@ -464,5 +464,5 @@
                         written, is a plain text file, VirtualBox uses hashes
                         to encrypt passwords. The following command must be
-                        used:<screen>VBoxManage setextradata &lt;vm&gt; "VBoxAuthSimple/users/&lt;user&gt;" &lt;hash&gt;</screen></para>
+                        used:<screen>VBoxManage setextradata "VM name" "VBoxAuthSimple/users/&lt;user&gt;" &lt;hash&gt;</screen></para>
 
                         <para>Replace
Index: /trunk/doc/manual/en_US/user_GuestAdditions.xml
===================================================================
--- /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 51239)
+++ /trunk/doc/manual/en_US/user_GuestAdditions.xml	(revision 51240)
@@ -1550,6 +1550,5 @@
 
     <para>To query the value of a single property, use the "get" subcommand
-    like this:<screen>$ VBoxManage guestproperty get "Windows Vista III"
-         "/VirtualBox/GuestInfo/OS/Product"
+    like this:<screen>$ VBoxManage guestproperty get "Windows Vista III" "/VirtualBox/GuestInfo/OS/Product"
 VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
 (C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
Index: /trunk/doc/manual/en_US/user_Storage.xml
===================================================================
--- /trunk/doc/manual/en_US/user_Storage.xml	(revision 51239)
+++ /trunk/doc/manual/en_US/user_Storage.xml	(revision 51240)
@@ -775,5 +775,5 @@
     "Use host I/O cache" box in the "Storage" settings for a given virtual
     storage controller, or use the following VBoxManage command to disable the
-    host I/O cache for a virtual storage controller:<screen>VBoxManage storagectl &lt;vm&gt; --name &lt;controllername&gt; --hostiocache off</screen></para>
+    host I/O cache for a virtual storage controller:<screen>VBoxManage storagectl "VM name" --name &lt;controllername&gt; --hostiocache off</screen></para>
 
     <para>See <xref linkend="vboxmanage-storagectl" /> for details.</para>
@@ -795,7 +795,7 @@
     bandwidth group named "Limit", sets the limit to 20 MB/s and assigns the
     group to the attached disks of the VM:<screen>VBoxManage bandwidthctl "VM name" add Limit --type disk --limit 20M
-VBoxManage storageattach "VM name" --controller "SATA" --port 0 --device 0 --type hdd
+VBoxManage storageattach "VM name" --storagectl "SATA" --port 0 --device 0 --type hdd
                                    --medium disk1.vdi --bandwidthgroup Limit
-VBoxManage storageattach "VM name" --controller "SATA" --port 1 --device 0 --type hdd
+VBoxManage storageattach "VM name" --storagectl "SATA" --port 1 --device 0 --type hdd
                                    --medium disk2.vdi --bandwidthgroup Limit</screen></para>