Fix HOT glossary entry, add CFN entry

Do not use glossentry inside the glossary. Instead cross-reference via
the index.
Add entry for AWS CloudFormation template.

Change-Id: I43956404f800587ea55a6562b31adf4e600dbce8

doc/glossary/glossary-terms.xml

@@ -846,6 +846,21 @@
         <para>Amazon Web Services.</para>
       </glossdef>
     </glossentry>
+
+    <glossentry>
+      <glossterm>AWS CloudFormation template</glossterm>
+      <indexterm class="singular">
+          <primary>AWS CloudFormation template</primary>
+        </indexterm>
+
+      <glossdef>
+        <para>
+          AWS CloudFormation allows AWS users to create and manage a
+          collection of related resources. The Orchestration module
+          supports a CloudFormation-compatible format (CFN).
+        </para>
+      </glossdef>
+    </glossentry>
   </glossdiv>
 
   <!-- .B. -->
@@ -7598,13 +7613,14 @@
       <glossterm>stack</glossterm>
       <indexterm class="singular">
           <primary>stack</primary>
+          <see>Heat Orchestration Template (HOT)</see>
         </indexterm>
 
       <glossdef>
         <para>A set of OpenStack resources created and managed by the
         Orchestration service according to a given template (either an
-        AWS CloudFormation template or a <glossterm>Heat Orchestration
+        AWS CloudFormation template or a Heat Orchestration
-        Template (HOT))</glossterm>.</para>
+        Template (HOT)).</para>
       </glossdef>
     </glossentry>