diff --git a/doc/user-guide/section_cli_heat.xml b/doc/user-guide/section_cli_heat.xml
index 37b96c1f38..003dc35a91 100644
--- a/doc/user-guide/section_cli_heat.xml
+++ b/doc/user-guide/section_cli_heat.xml
@@ -121,7 +121,7 @@
     </section>
     <section xml:id="update_stack">
         <title>Update a stack</title>
-                <para xml:id="heat-stack-update">To update an existing stack from a modified
+                <para>To update an existing stack from a modified
                     template file, run a command like the following
                     command:</para>
                 <screen><prompt>$</prompt> <userinput>heat stack-update mystack --template-file /path/to/heat/templates/WordPress_Single_Instance_v2.template</userinput>
diff --git a/doc/user-guide/section_cli_nova_configure_instances.xml b/doc/user-guide/section_cli_nova_configure_instances.xml
index b169e8e345..66f66be895 100644
--- a/doc/user-guide/section_cli_nova_configure_instances.xml
+++ b/doc/user-guide/section_cli_nova_configure_instances.xml
@@ -151,13 +151,13 @@
                 <para>To allow SSH access to the instances, choose one of the
                     following options:</para>
                 <itemizedlist>
-                    <listitem xml:id="sec_group_rule_add">
+                    <listitem>
                         <para>Allow access from all IP addresses, specified as
                             IP subnet <filename>0.0.0.0/0</filename> in CIDR
                             notation:</para>
                         <screen><prompt>$</prompt> <userinput>nova secgroup-add-rule <replaceable>SECURITY_GROUP_NAME</replaceable> tcp 22 22 0.0.0.0/0</userinput></screen>
                     </listitem>
-                    <listitem xml:id="sec_group_rule_add_alt">
+                    <listitem>
                         <para>Allow access only from IP addresses from other
                             security groups (source groups) to access the
                             specified port:</para>
diff --git a/doc/user-guide/section_sdk_nova.xml b/doc/user-guide/section_sdk_nova.xml
index 35cf1afb08..e72b7dd160 100644
--- a/doc/user-guide/section_sdk_nova.xml
+++ b/doc/user-guide/section_sdk_nova.xml
@@ -193,10 +193,8 @@ from novaclient.client import Client</programlisting>
                         <para>If true, set the variable name
                                 <literal>server_exists</literal> to
                                 <literal>True</literal> and break from
-                            the for loop:</para>
-                    </step>
-                </substeps>
-                <programlisting language="python">servers_list = nova_client.servers.list()
+                                the for loop:</para>
+                         <programlisting language="python">servers_list = nova_client.servers.list()
 server_del = "vm1"
 server_exists = False
 
@@ -205,6 +203,8 @@ for s in servers_list:
         print("This server %s exists" % server_del)
         server_exists = True
         break</programlisting>
+                    </step>
+                </substeps>
             </step>
             <step>
                 <para>If the server exists, run the