openstack
/
openstack-manuals
Code Issues Proposed changes

Merge "Fix HOT glossary entry, add CFN entry"

This commit is contained in:
Jenkins 2014-08-25 07:35:06 +00:00 committed by Gerrit Code Review
parent ef6ee6cd56 a51e954c46
commit f9c66f993a
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doc/glossary/glossary-terms.xml
View File

@ -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
Template (HOT))</glossterm>.</para>
AWS CloudFormation template or a Heat Orchestration
Template (HOT)).</para>
</glossdef>
</glossentry>