diff --git a/doc/hot-guide/Makefile b/doc/hot-guide/Makefile
index 98daf30162..a049fd8b40 100644
--- a/doc/hot-guide/Makefile
+++ b/doc/hot-guide/Makefile
@@ -171,11 +171,6 @@ doctest:
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
 
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
 pseudoxml:
 	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
 	@echo
diff --git a/doc/hot-guide/source/composition.rst b/doc/hot-guide/source/composition.rst
index c928fc8b5b..3327ec6f6f 100644
--- a/doc/hot-guide/source/composition.rst
+++ b/doc/hot-guide/source/composition.rst
@@ -101,7 +101,7 @@ OS::Nova::Server with my_nova to get the defaults you want.
   resource_registry:
     "OS::Nova::Server": my_nova.yaml
 
-A more detailed discussion on this can be found here :ref:`environments`
+A more detailed discussion on this can be found :ref:`environments`.
 
 Now you can use "OS::Nova::Server" in our top level template (main.yaml).
 
diff --git a/doc/hot-guide/source/functions.rst b/doc/hot-guide/source/functions.rst
index 3a6820c53d..1ee06dd745 100644
--- a/doc/hot-guide/source/functions.rst
+++ b/doc/hot-guide/source/functions.rst
@@ -1,5 +1,3 @@
-.. _hot_functions:
-
 #############
 HOT functions
 #############
diff --git a/doc/hot-guide/source/hello_world.rst b/doc/hot-guide/source/hello_world.rst
index 9e49d78b06..4ba9ded26f 100644
--- a/doc/hot-guide/source/hello_world.rst
+++ b/doc/hot-guide/source/hello_world.rst
@@ -11,7 +11,7 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-.. _hot_guide:
+.. _hello_world:
 
 ==================================
 Writing a hello world HOT template
diff --git a/doc/hot-guide/source/hot_spec.rst b/doc/hot-guide/source/hot_spec.rst
index 128d6a54ba..2db9c224f1 100644
--- a/doc/hot-guide/source/hot_spec.rst
+++ b/doc/hot-guide/source/hot_spec.rst
@@ -21,7 +21,7 @@ HOT is a new template format meant to replace the Heat
 CloudFormation-compatible format (CFN) as the native format supported
 by the Heat over time. This specification explains in detail all
 elements of the HOT template format. An example driven guide to
-writing HOT templates can be found at :ref:`hot_guide`.
+writing HOT templates can be found at :ref:`hello_world`.
 
 ------
 Status
@@ -392,7 +392,7 @@ In addition to parameters defined by a template author, Heat also creates two
 parameters for every stack that allow referential access to the stack's name
 and identifier. These parameters are named ``OS::stack_name`` for the stack
 name and ``OS::stack_id`` for the stack identifier. These values are accessible
-via the `get_param`_ intrinsic function just like user-defined parameters.
+via the ``get_param`` intrinsic function just like user-defined parameters.
 
 .. _hot_spec_resources: