openstack/openstack-manuals
Code Issues Proposed changes

Change some IDs to fix the build

Browse Source 
The doc tools 0.20 bring a new way of handling the IDs, so we need to
update some references names.

Change-Id: I169ab871534f504744482e562db3ab13194a6699
This commit is contained in:
Gauvain Pocentek 2014-10-11 07:30:48 +02:00
parent 10ac26c938
commit f2ab425c26
5 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/hot-guide/Makefile
View File

@ -171,11 +171,6 @@ doctest:
@echo "Testing of doctests in the sources finished, look at the " \ @echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt." "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: pseudoxml:
$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
@echo @echo

2
doc/hot-guide/source/composition.rst
View File

@ -101,7 +101,7 @@ OS::Nova::Server with my_nova to get the defaults you want.
resource_registry: resource_registry:
"OS::Nova::Server": my_nova.yaml "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). Now you can use "OS::Nova::Server" in our top level template (main.yaml).

2
doc/hot-guide/source/functions.rst
View File

@ -1,5 +1,3 @@
.. _hot_functions:
############# #############
HOT functions HOT functions
############# #############

2
doc/hot-guide/source/hello_world.rst
View File

@ -11,7 +11,7 @@
License for the specific language governing permissions and limitations License for the specific language governing permissions and limitations
under the License. under the License.
.. _hot_guide: .. _hello_world:
================================== ==================================
Writing a hello world HOT template Writing a hello world HOT template

4
doc/hot-guide/source/hot_spec.rst
View File

@ -21,7 +21,7 @@ HOT is a new template format meant to replace the Heat
CloudFormation-compatible format (CFN) as the native format supported CloudFormation-compatible format (CFN) as the native format supported
by the Heat over time. This specification explains in detail all by the Heat over time. This specification explains in detail all
elements of the HOT template format. An example driven guide to 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 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 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 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 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: .. _hot_spec_resources: