diff --git a/doc/admin-guide-cloud/ch_blockstorage.xml b/doc/admin-guide-cloud/ch_blockstorage.xml index 10eec6fe05..f8798e8531 100644 --- a/doc/admin-guide-cloud/ch_blockstorage.xml +++ b/doc/admin-guide-cloud/ch_blockstorage.xml @@ -117,7 +117,7 @@ Boot from volume In some cases, you can store and run instances from inside volumes. For information, see the Launch an instance from a volume section in the Block live migration. No shared storage is required. Incompatible with read-only devices such as CD-ROMs and Configuration Drive (config_drive). @@ -307,7 +307,7 @@ HostA: 921515008 101921792 772783104 12% /var/lib/nova/instances Block migration is incompatible with read-only devices such as CD-ROMs and Configuration Drive (config_drive). diff --git a/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml b/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml index 3432b72614..85e0c53c84 100644 --- a/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml +++ b/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml @@ -535,7 +535,7 @@ echo 'Extra user data here' For more information about how administrators can associate floating IPs with instances, see - + Manage IP addresses in the OpenStack Admin User Guide. diff --git a/doc/common/section_keystone-concepts-service-management.xml b/doc/common/section_keystone-concepts-service-management.xml index f14f3a8d0b..d3513779de 100644 --- a/doc/common/section_keystone-concepts-service-management.xml +++ b/doc/common/section_keystone-concepts-service-management.xml @@ -38,7 +38,7 @@ service. For information about how to create services and endpoints, see the OpenStack Admin User Guide. diff --git a/doc/config-reference/ch_computeconfigure.xml b/doc/config-reference/ch_computeconfigure.xml index 33626b6fcb..45f06fce94 100644 --- a/doc/config-reference/ch_computeconfigure.xml +++ b/doc/config-reference/ch_computeconfigure.xml @@ -70,7 +70,7 @@ host to another is needed to copy the VM file across. Cloud end users can find out how to resize a server by reading the OpenStack End User Guide.
diff --git a/doc/install-guide/ch_launch-instance.xml b/doc/install-guide/ch_launch-instance.xml index 3c0961b661..4b4a9666a5 100644 --- a/doc/install-guide/ch_launch-instance.xml +++ b/doc/install-guide/ch_launch-instance.xml @@ -21,7 +21,7 @@ . For more information, see the + xlink:href="http://docs.openstack.org/user-guide/cli_launch_instances.html"> OpenStack User Guide. These steps reference example components created in previous diff --git a/doc/user-guide-admin/source/cli_admin_manage_ip_addresses.rst b/doc/user-guide-admin/source/cli_admin_manage_ip_addresses.rst index e7076680ad..98f33240db 100644 --- a/doc/user-guide-admin/source/cli_admin_manage_ip_addresses.rst +++ b/doc/user-guide-admin/source/cli_admin_manage_ip_addresses.rst @@ -11,7 +11,7 @@ including the Internet. addresses with projects and instances. You can change user permissions for managing IP addresses by updating the ``/etc/nova/policy.json`` file. For basic floating-IP procedures, refer to the *Manage IP - Addresses* section in the `OpenStack End User Guide `_. + Addresses* section in the `OpenStack End User Guide `_. - For details on creating public networks using OpenStack Networking (``neutron``), refer to the `OpenStack Cloud Administrator Guide diff --git a/doc/user-guide-admin/source/cli_admin_manage_stacks.rst b/doc/user-guide-admin/source/cli_admin_manage_stacks.rst index 0c0384737f..814cfa818a 100644 --- a/doc/user-guide-admin/source/cli_admin_manage_stacks.rst +++ b/doc/user-guide-admin/source/cli_admin_manage_stacks.rst @@ -19,7 +19,7 @@ high availability. For information about the: - Basic creation and deletion of Orchestration stacks, refer - to the `End User Guide `_ + to the `End User Guide `_ - **heat** CLI commands, see the `OpenStack Command Line Interface Reference `_ diff --git a/doc/user-guide-admin/source/dashboard_admin_manage_stacks.rst b/doc/user-guide-admin/source/dashboard_admin_manage_stacks.rst index b932ed5761..c91db00960 100644 --- a/doc/user-guide-admin/source/dashboard_admin_manage_stacks.rst +++ b/doc/user-guide-admin/source/dashboard_admin_manage_stacks.rst @@ -16,17 +16,14 @@ high availability. For information about: -* administrative tasks on the command line, see the section called - “Launch and manage stacks”; +* administrative tasks on the command line, see + :doc:`cli_admin_manage_stacks`. .. note:: There are no administration-specific tasks that can be done through the dashboard. -* the basic creation and deletion of Orchestration stacks, refer to the - `End User Guide`. +* the basic creation and deletion of Orchestration stacks, refer to + the `End User Guide + `__. -.. TODO: add link to the new End User Guide on line 30 (old link: `_), and reference - to Launch and manage stacks on the line 23 (old link: `_) (OL) diff --git a/doc/user-guide-admin/source/dashboard_set_quotas.rst b/doc/user-guide-admin/source/dashboard_set_quotas.rst index db20ba73c3..17fcb80f74 100644 --- a/doc/user-guide-admin/source/dashboard_set_quotas.rst +++ b/doc/user-guide-admin/source/dashboard_set_quotas.rst @@ -22,8 +22,7 @@ quotas for new tenants, as well as update quotas for existing tenants. .. note:: Using the command-line interface, you can manage quotas for the OpenStack Compute service, the OpenStack Block Storage service, and - the OpenStack Networking service (see `the section called "Manage quotas" - `_). + the OpenStack Networking service (see :doc:`cli_set_quotas`). Additionally, you can update Compute service quotas for tenant users. @@ -108,5 +107,4 @@ Update project quotas .. note:: The dashboard does not show all possible project quotas. To view and update the quotas for a service, use its - command-line client. See `the section called "Manage quotas" - `_. + command-line client. See :doc:`cli_set_quotas`. diff --git a/doc/user-guide-admin/source/dashboard_view_cloud_resources.rst b/doc/user-guide-admin/source/dashboard_view_cloud_resources.rst index 9934b645d9..f4b63b0f96 100644 --- a/doc/user-guide-admin/source/dashboard_view_cloud_resources.rst +++ b/doc/user-guide-admin/source/dashboard_view_cloud_resources.rst @@ -14,7 +14,7 @@ libvirt). :command:`ceilometer` command-line interface (CLI). For basic administration information, refer to the "Measure Cloud Resources" - chapter in the `OpenStack End User Guide `_. + chapter in the `OpenStack End User Guide `_. .. _dashboard-view-resource-stats: diff --git a/doc/user-guide-admin/source/manage_projects_users_and_roles.rst b/doc/user-guide-admin/source/manage_projects_users_and_roles.rst index 7c59760881..e28ef06d43 100644 --- a/doc/user-guide-admin/source/manage_projects_users_and_roles.rst +++ b/doc/user-guide-admin/source/manage_projects_users_and_roles.rst @@ -27,7 +27,8 @@ from its primary project. Before you can run keystone client commands, you must download and source an OpenStack RC file. See `Download and source the OpenStack RC -file `__. +file +`__. Services ~~~~~~~~ diff --git a/doc/user-guide-admin/source/nova_cli_manage_projects_security.rst b/doc/user-guide-admin/source/nova_cli_manage_projects_security.rst index c755de6686..702a2144a3 100644 --- a/doc/user-guide-admin/source/nova_cli_manage_projects_security.rst +++ b/doc/user-guide-admin/source/nova_cli_manage_projects_security.rst @@ -30,7 +30,7 @@ If set to: Additionally, the number of maximum rules per security group is controlled by the ``security_group_rules`` and the number of allowed security groups per project is controlled by the ``security_groups`` -quota (see the `Manage quotas `_ +quota (see the `Manage quotas `_ section). List and view current security groups diff --git a/doc/user-guide/source/hot-guide/hot_basic_resources.rst b/doc/user-guide/source/hot-guide/hot_basic_resources.rst index f0ec97b2f2..165b3afc2f 100644 --- a/doc/user-guide/source/hot-guide/hot_basic_resources.rst +++ b/doc/user-guide/source/hot-guide/hot_basic_resources.rst @@ -257,10 +257,7 @@ the key pair to use to enable SSH remote access: key_name: my_key .. note:: - For more information about key pairs, see the `Configure access and - security for instances`_ section of the OpenStack user guide. - -.. _`Configure access and security for instances`: http://docs.openstack.org/user-guide/content/cli_configure_instances.html + For more information about key pairs, see the :doc:`../cli_nova_configure_access_security_for_instances`. Create a key pair -----------------