diff --git a/doc/common/section_cli_install.xml b/doc/common/section_cli_install.xml
index 428a3a5ff5..6145fa68f7 100644
--- a/doc/common/section_cli_install.xml
+++ b/doc/common/section_cli_install.xml
@@ -83,7 +83,7 @@
                     <formalpara>
                         <title>Mac OS X</title>
                         <para>
-                            <screen><prompt>$</prompt> <userinput>sudo easy_install pip</userinput></screen></para>
+                            <screen><prompt>#</prompt> <userinput>easy_install pip</userinput></screen></para>
                     </formalpara>
                     <formalpara>
                         <title>Microsoft Windows</title>
@@ -168,7 +168,7 @@
                 <para>Install each client separately using:</para>
                 <itemizedlist>
                     <listitem><para>For Mac OS X or Linux:</para>
-                        <screen><prompt>$</prompt> <userinput>sudo pip install python-<replaceable>PROJECT</replaceable>client</userinput></screen></listitem>
+                        <screen><prompt>#</prompt> <userinput>pip install python-<replaceable>PROJECT</replaceable>client</userinput></screen></listitem>
                     <listitem><para>For Microsoft Windows:</para>
                         <screen><prompt>C:\></prompt><userinput>pip install python-<replaceable>PROJECT</replaceable>client</userinput></screen></listitem>
                 </itemizedlist>
@@ -210,16 +210,16 @@
                 </itemizedlist>
                 <para>For example, to install the nova client, run
                     this command:</para>
-                <screen><prompt>$</prompt> <userinput>sudo pip install python-novaclient</userinput></screen>
+                <screen><prompt>#</prompt> <userinput>pip install python-novaclient</userinput></screen>
                 <para>To remove the nova client, run this
                     command:</para>
-                <screen><prompt>$</prompt> <userinput>sudo pip uninstall python-novaclient</userinput></screen>
+                <screen><prompt>#</prompt> <userinput>pip uninstall python-novaclient</userinput></screen>
                <note> <para>To upgrade a package, add the
                 <literal>--upgrade</literal> option to the
                 <command>pip</command> command.</para>
                 <para>For example, to update the <systemitem>nova</systemitem> client, run this
                         command:</para>
-                <screen><prompt>$</prompt> <userinput>sudo pip install --upgrade python-novaclient</userinput></screen></note>
+                <screen><prompt>#</prompt> <userinput>pip install --upgrade python-novaclient</userinput></screen></note>
             </step>
             <step audience="enduser">
                 <para>Before you can run client commands, you must
diff --git a/doc/common/section_dashboard_customizing.xml b/doc/common/section_dashboard_customizing.xml
index 004daaeaa2..11d988e61a 100644
--- a/doc/common/section_dashboard_customizing.xml
+++ b/doc/common/section_dashboard_customizing.xml
@@ -126,13 +126,13 @@ text-decoration: none;
         <step>
             <para>Restart apache:</para>
             <para>On Ubuntu:
-            <screen><prompt>$</prompt> <userinput>sudo service apache2 restart</userinput></screen>
+            <screen><prompt>#</prompt> <userinput>service apache2 restart</userinput></screen>
            </para>
             <para>On Fedora, RHEL, CentOS:
-            <screen><prompt>$</prompt> <userinput>sudo service httpd restart</userinput></screen>
+            <screen><prompt>#</prompt> <userinput>service httpd restart</userinput></screen>
            </para>
             <para>On openSUSE:
-            <screen><prompt>$</prompt> <userinput>sudo service apache2 restart</userinput></screen>
+            <screen><prompt>#</prompt> <userinput>service apache2 restart</userinput></screen>
            </para>
         </step>
         <step>
diff --git a/doc/common/section_dashboard_sessions.xml b/doc/common/section_dashboard_sessions.xml
index cff4d7abc2..99e858f5ff 100644
--- a/doc/common/section_dashboard_sessions.xml
+++ b/doc/common/section_dashboard_sessions.xml
@@ -169,7 +169,7 @@ No fixtures found.</computeroutput></screen>
                 <para>On Ubuntu: If you want to avoid a warning when you restart
                     apache2, create a blackhole directory in the
                     dashboard directory, as follows:</para>
-                <screen><prompt>#</prompt> <userinput>sudo mkdir -p /var/lib/dash/.blackhole</userinput></screen>
+                <screen><prompt>#</prompt> <userinput>mkdir -p /var/lib/dash/.blackhole</userinput></screen>
             </step>
             <step>
                 <para>Restart Apache to pick up the default site and
@@ -189,7 +189,7 @@ No fixtures found.</computeroutput></screen>
                 <para>On Ubuntu, restart the <systemitem class="service">nova-api</systemitem> service to ensure that the
                     API server can connect to the dashboard without
                     error:</para>
-                <screen><prompt>#</prompt> <userinput>sudo service nova-api restart</userinput></screen>
+                <screen><prompt>#</prompt> <userinput>service nova-api restart</userinput></screen>
             </step>
         </procedure>
     </section>
diff --git a/doc/common/section_fibrechannel.xml b/doc/common/section_fibrechannel.xml
index bcd7e4cd30..bf08a2c5be 100644
--- a/doc/common/section_fibrechannel.xml
+++ b/doc/common/section_fibrechannel.xml
@@ -38,15 +38,15 @@
             <listitem>
                 <para>For systems running openSUSE or SUSE Linux Enterprise
                     Server:</para>
-                <screen><prompt>$</prompt> <userinput>sudo zypper install sysfsutils sg3_utils multipath-tools</userinput></screen>
+                <screen><prompt>#</prompt> <userinput>zypper install sysfsutils sg3_utils multipath-tools</userinput></screen>
             </listitem>
             <listitem>
                 <para>For systems running Red Hat:</para>
-                <screen><prompt>$</prompt> <userinput>sudo yum install sysfsutils sg3_utils multipath-tools</userinput></screen>
+                <screen><prompt>#</prompt> <userinput>yum install sysfsutils sg3_utils multipath-tools</userinput></screen>
             </listitem>
             <listitem>
                 <para>For systems running Ubuntu:</para>
-                <screen><prompt>$</prompt> <userinput>sudo apt-get install sysfsutils sg3-utils multipath-tools</userinput></screen>
+                <screen><prompt>#</prompt> <userinput>apt-get install sysfsutils sg3-utils multipath-tools</userinput></screen>
             </listitem>
         </itemizedlist>
     </section>
diff --git a/doc/common/section_identity-troubleshooting.xml b/doc/common/section_identity-troubleshooting.xml
index 89c533aeb7..065c472eed 100644
--- a/doc/common/section_identity-troubleshooting.xml
+++ b/doc/common/section_identity-troubleshooting.xml
@@ -128,7 +128,7 @@ arg_dict: {}
             using a sub-directory of the
                 <filename>/var/cache/</filename> directory, run the
             following command:</para>
-        <screen><prompt>$</prompt> <userinput>sudo restorecon /var/cache/</userinput></screen>
+        <screen><prompt>#</prompt> <userinput>restorecon /var/cache/</userinput></screen>
         <para>If you are not using a <filename>/var/cache</filename>
             sub-directory, you should. Modify the
                 <literal>signing_dir</literal> configuration option