diff --git a/doc/source/admin/introduction.rst b/doc/source/admin/introduction.rst index d66498499d..61187b9c59 100644 --- a/doc/source/admin/introduction.rst +++ b/doc/source/admin/introduction.rst @@ -28,5 +28,5 @@ integrated with the OpenStack dashboard to perform stack functions through a web interface. For more information about using the Orchestration service through the -command line, see the `OpenStack Command-Line Interface Reference -`_. +command line, see the `Heat Command-Line Interface reference +`_. diff --git a/doc/source/developing_guides/pluginguide.rst b/doc/source/developing_guides/pluginguide.rst index 75aa2985f7..d368a4ae9c 100644 --- a/doc/source/developing_guides/pluginguide.rst +++ b/doc/source/developing_guides/pluginguide.rst @@ -669,8 +669,8 @@ directories on the local file system where the engine will search for plug-ins. Simply place the file containing your resource in one of these directories and the engine will make them available next time the service starts. -See one of the Installation Guides at http://docs.OpenStack.org/ for -more information on configuring the orchestration service. +See :doc:`<../configuration/index>` for more information on configuring the +orchestration service. Testing ------- diff --git a/doc/source/getting_started/create_a_stack.rst b/doc/source/getting_started/create_a_stack.rst index 86d5f79ff0..daebb093dd 100644 --- a/doc/source/getting_started/create_a_stack.rst +++ b/doc/source/getting_started/create_a_stack.rst @@ -105,9 +105,8 @@ Note: The list operation will show no running stack.:: $ openstack stack delete teststack $ openstack stack list -You can explore other heat commands by referring to the -`Heat chapter -`_ -of the `OpenStack Command-Line Interface Reference -`_ then read -the :ref:`template-guide` and start authoring your own templates. +You can explore other heat commands by referring to the `Heat command reference +`_ for the +`OpenStack Command-Line Interface +`_; then read the +:ref:`template-guide` and start authoring your own templates. diff --git a/doc/source/getting_started/on_fedora.rst b/doc/source/getting_started/on_fedora.rst index bc0abcb304..316f02acd5 100644 --- a/doc/source/getting_started/on_fedora.rst +++ b/doc/source/getting_started/on_fedora.rst @@ -20,7 +20,7 @@ Linux, CentOS and Fedora which includes a chapter on installing the Orchestration module (Heat). There are instructions for `installing the RDO OpenStack -`_ on Fedora and CentOS. +`_ on Fedora and CentOS. If installing with packstack, you can install heat by specifying ``--os-heat-install=y`` in your packstack invocation, or setting diff --git a/doc/source/getting_started/on_other.rst b/doc/source/getting_started/on_other.rst index 4a8662563c..b9aeea3478 100644 --- a/doc/source/getting_started/on_other.rst +++ b/doc/source/getting_started/on_other.rst @@ -15,8 +15,6 @@ Installing OpenStack on other distributions =========================================== - There is a `Debian packaging team for OpenStack`_. -- There are instructions for `installing OpenStack on Ubuntu`_. - Various other distributions may have packaging teams or getting started guides available. .. _Debian packaging team for OpenStack: http://wiki.openstack.org/Packaging/Debian -.. _installing OpenStack on Ubuntu: http://docs.openstack.org/bexar/openstack-compute/admin/content/ch03s02.html diff --git a/doc/source/glossary.rst b/doc/source/glossary.rst index 6d05405a25..6556f1da82 100644 --- a/doc/source/glossary.rst +++ b/doc/source/glossary.rst @@ -60,7 +60,7 @@ retrieve instance-specific data. See `Metadata service (OpenStack Administrator Guide)`_. - .. _Metadata service (OpenStack Administrator Guide): http://docs.openstack.org/admin-guide/compute-networking-nova.html#metadata-service + .. _Metadata service (OpenStack Administrator Guide): https://docs.openstack.org/nova/latest/admin/networking-nova.html#metadata-service Multi-region A feature of Heat that supports deployment to multiple regions. @@ -76,9 +76,9 @@ Nova Instance metadata User-provided *key:value* pairs associated with a Compute - Instance. See `Instance specific data (OpenStack Operations Guide)`_. + Instance. See `Instance-specific data (OpenStack Operations Guide)`_. - .. _Instance specific data (OpenStack Operations Guide): http://docs.openstack.org/openstack-ops/content/instances.html#instance_specific_data + .. _Instance-specific data (OpenStack Operations Guide): https://wiki.openstack.org/wiki/OpsGuide/User-Facing_Operations#using-instance-specific-data OpenStack Open source software for building private and public clouds. diff --git a/doc/source/operating_guides/scale_deployment.rst b/doc/source/operating_guides/scale_deployment.rst index efb025dae3..30a6865aba 100644 --- a/doc/source/operating_guides/scale_deployment.rst +++ b/doc/source/operating_guides/scale_deployment.rst @@ -32,7 +32,7 @@ Assumptions This guide, using a devstack installation of OpenStack, assumes that: 1. You have configured devstack from `Single Machine Installation Guide - `_; + `_; 2. You have set up heat on devstack, as defined at :doc:`heat and DevStack <../getting_started/on_devstack>`; 3. You have installed `HAProxy `_ on the devstack diff --git a/doc/source/template_guide/basic_resources.rst b/doc/source/template_guide/basic_resources.rst index c968bb6fe2..6bbbf393e1 100644 --- a/doc/source/template_guide/basic_resources.rst +++ b/doc/source/template_guide/basic_resources.rst @@ -250,8 +250,9 @@ the key pair to use to enable SSH remote access: key_name: my_key .. note:: - For more information about key pairs, see - `Configure access and security for instances `_. + For more information about key pairs, see `Configure access and security for + instances + `_. Create a key pair ----------------- diff --git a/doc/source/template_guide/software_deployment.rst b/doc/source/template_guide/software_deployment.rst index e0264a317c..26826dd477 100644 --- a/doc/source/template_guide/software_deployment.rst +++ b/doc/source/template_guide/software_deployment.rst @@ -781,7 +781,7 @@ contents of the file ``example-puppet-manifest.pp``, containing: .. _`AWS::CloudFormation::Init`: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-init.html .. _diskimage-builder: https://git.openstack.org/cgit/openstack/diskimage-builder .. _imagefactory: http://imgfac.org/ -.. _`Metadata service`: http://docs.openstack.org/admin-guide/compute-networking-nova.html#metadata-service +.. _`Metadata service`: https://docs.openstack.org/nova/latest/admin/networking-nova.html#metadata-service .. _Cloud-init: http://cloudinit.readthedocs.org/en/latest/ .. _curl: http://curl.haxx.se/ .. _`Orchestration API`: http://developer.openstack.org/api-ref/orchestration/v1/