diff --git a/doc/admin-guide/source/cli.rst b/doc/admin-guide/source/cli.rst
index ef18162215..d797453190 100644
--- a/doc/admin-guide/source/cli.rst
+++ b/doc/admin-guide/source/cli.rst
@@ -5,15 +5,15 @@ OpenStack command-line clients
.. toctree::
:maxdepth: 2
- common/cli_overview.rst
- common/cli_install_openstack_command_line_clients.rst
- common/cli_discover_version_number_for_a_client.rst
- common/cli_set_environment_variables_using_openstack_rc.rst
+ common/cli-overview.rst
+ common/cli-install-openstack-command-line-clients.rst
+ common/cli-discover-version-number-for-a-client.rst
+ common/cli-set-environment-variables-using-openstack-rc.rst
cli_manage_projects_users_and_roles.rst
cli_nova_manage_projects_security.rst
cli_manage_services.rst
- common/cli_manage_images.rst
- common/cli_manage_volumes.rst
+ common/cli-manage-images.rst
+ common/cli-manage-volumes.rst
cli_manage_shares.rst
cli_manage_flavors.rst
cli_admin_manage_environment.rst
diff --git a/doc/admin-guide/source/cli_admin_manage_environment.rst b/doc/admin-guide/source/cli_admin_manage_environment.rst
index d1ce823c8c..047176b29a 100644
--- a/doc/admin-guide/source/cli_admin_manage_environment.rst
+++ b/doc/admin-guide/source/cli_admin_manage_environment.rst
@@ -14,4 +14,4 @@ This section includes tasks specific to the OpenStack environment.
cli_nova_migrate_cfg_ssh.rst
cli_admin_manage_ip_addresses.rst
cli_admin_manage_stacks.rst
- common/nova_show_usage_statistics_for_hosts_instances.rst
+ common/nova-show-usage-statistics-for-hosts-instances.rst
diff --git a/doc/admin-guide/source/cli_manage_projects_users_and_roles.rst b/doc/admin-guide/source/cli_manage_projects_users_and_roles.rst
index 8365b03f23..7bcc193311 100644
--- a/doc/admin-guide/source/cli_manage_projects_users_and_roles.rst
+++ b/doc/admin-guide/source/cli_manage_projects_users_and_roles.rst
@@ -28,7 +28,7 @@ from its primary project.
Before you can run client commands, you must download and
source an OpenStack RC file. See `Download and source the OpenStack RC file
-<http://docs.openstack.org/user-guide/common/cli_set_environment_variables_using_openstack_rc.html#download-and-source-the-openstack-rc-file>`_.
+<http://docs.openstack.org/user-guide/common/cli-set-environment-variables-using-openstack-rc.html#download-and-source-the-openstack-rc-file>`_.
Projects
~~~~~~~~
diff --git a/doc/admin-guide/source/compute-manage-the-cloud.rst b/doc/admin-guide/source/compute-manage-the-cloud.rst
index 3a02f7bc48..859b497544 100644
--- a/doc/admin-guide/source/compute-manage-the-cloud.rst
+++ b/doc/admin-guide/source/compute-manage-the-cloud.rst
@@ -7,7 +7,7 @@ Manage the cloud
.. toctree::
compute-euca2ools.rst
- common/nova_show_usage_statistics_for_hosts_instances.rst
+ common/nova-show-usage-statistics-for-hosts-instances.rst
System administrators can use the :command:`openstack` and
:command:`euca2ools` commands to manage their clouds.
@@ -25,7 +25,7 @@ specific commands might be restricted by the Identity service.
To install python-openstackclient, follow the instructions in the
`OpenStack User Guide
- <http://docs.openstack.org/user-guide/common/cli_install_openstack_command_line_clients.html>`_.
+ <http://docs.openstack.org/user-guide/common/cli-install-openstack-command-line-clients.html>`_.
#. Confirm the installation was successful:
diff --git a/doc/admin-guide/source/dashboard.rst b/doc/admin-guide/source/dashboard.rst
index 817570ff7c..280a1d7d23 100644
--- a/doc/admin-guide/source/dashboard.rst
+++ b/doc/admin-guide/source/dashboard.rst
@@ -13,7 +13,7 @@ for your operating system.
.. toctree::
:maxdepth: 2
- common/dashboard_customizing.rst
+ common/dashboard-customizing.rst
dashboard_sessions.rst
dashboard_manage_images.rst
dashboard_admin_manage_roles.rst
diff --git a/doc/admin-guide/source/dashboard_manage_images.rst b/doc/admin-guide/source/dashboard_manage_images.rst
index 616f2341c6..399ab250fc 100644
--- a/doc/admin-guide/source/dashboard_manage_images.rst
+++ b/doc/admin-guide/source/dashboard_manage_images.rst
@@ -12,7 +12,7 @@ user, see the `upload and manage images with Dashboard in
OpenStack End User Guide
<http://docs.openstack.org/user-guide/dashboard_manage_images.html>`_
and `manage images with CLI in OpenStack End User Guide
-<http://docs.openstack.org/user-guide/common/cli_manage_images.html>`_ .
+<http://docs.openstack.org/user-guide/common/cli-manage-images.html>`_ .
To create and manage images as an administrator for other
users, use the following procedures.
diff --git a/doc/admin-guide/source/index.rst b/doc/admin-guide/source/index.rst
index 6d6bba1077..e90d873164 100644
--- a/doc/admin-guide/source/index.rst
+++ b/doc/admin-guide/source/index.rst
@@ -17,7 +17,7 @@ Contents
:maxdepth: 2
common/conventions.rst
- common/get_started_with_openstack.rst
+ common/get-started-with-openstack.rst
identity_management.rst
dashboard.rst
compute.rst
@@ -38,7 +38,7 @@ Appendix
.. toctree::
:maxdepth: 1
- common/app_support.rst
+ common/app-support.rst
Glossary
~~~~~~~~
diff --git a/doc/arch-design-draft/source/conf.py b/doc/arch-design-draft/source/conf.py
index 809a04d5d3..80cd960231 100644
--- a/doc/arch-design-draft/source/conf.py
+++ b/doc/arch-design-draft/source/conf.py
@@ -89,8 +89,8 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
-exclude_patterns = ['common/cli*', 'common/nova*', 'common/get_started_*',
- 'common/dashboard_customizing.rst', 'arch-guide-draft-mitaka']
+exclude_patterns = ['common/cli*', 'common/nova*', 'common/get-started-*',
+ 'common/dashboard-customizing.rst', 'arch-guide-draft-mitaka']
# The reST default role (used for this markup: `text`) to use for all
# documents.
diff --git a/doc/arch-design-draft/source/index.rst b/doc/arch-design-draft/source/index.rst
index 7da8db6442..c00a4c41f9 100644
--- a/doc/arch-design-draft/source/index.rst
+++ b/doc/arch-design-draft/source/index.rst
@@ -35,7 +35,7 @@ Appendix
.. toctree::
:maxdepth: 1
- common/app_support.rst
+ common/app-support.rst
Glossary
~~~~~~~~
diff --git a/doc/arch-design/source/conf.py b/doc/arch-design/source/conf.py
index 0569bb1ef3..d777bc4e21 100644
--- a/doc/arch-design/source/conf.py
+++ b/doc/arch-design/source/conf.py
@@ -89,8 +89,8 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
-exclude_patterns = ['common/cli*', 'common/nova*', 'common/get_started_*',
- 'common/dashboard_customizing.rst']
+exclude_patterns = ['common/cli*', 'common/nova*', 'common/get-started-*',
+ 'common/dashboard-customizing.rst']
# The reST default role (used for this markup: `text`) to use for all
# documents.
diff --git a/doc/arch-design/source/index.rst b/doc/arch-design/source/index.rst
index 90d7fe73ab..c1dcb622bd 100644
--- a/doc/arch-design/source/index.rst
+++ b/doc/arch-design/source/index.rst
@@ -39,7 +39,7 @@ Appendix
.. toctree::
:maxdepth: 1
- common/app_support.rst
+ common/app-support.rst
Glossary
~~~~~~~~
diff --git a/doc/cli-reference/source/conf.py b/doc/cli-reference/source/conf.py
index 791c1d669b..f3c90f0f15 100644
--- a/doc/cli-reference/source/conf.py
+++ b/doc/cli-reference/source/conf.py
@@ -95,9 +95,9 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
-exclude_patterns = ['common/cli_manage*', 'common/nova*',
- 'common/get_started_*',
- 'common/dashboard_customizing.rst']
+exclude_patterns = ['common/cli-manage*', 'common/nova*',
+ 'common/get-started-*',
+ 'common/dashboard-customizing.rst']
# The reST default role (used for this markup: `text`) to use for all
# documents.
diff --git a/doc/cli-reference/source/index.rst b/doc/cli-reference/source/index.rst
index c62a6056df..dd9fb76448 100644
--- a/doc/cli-reference/source/index.rst
+++ b/doc/cli-reference/source/index.rst
@@ -48,7 +48,7 @@ Appendix
.. toctree::
:maxdepth: 1
- common/app_support
+ common/app-support
Glossary
~~~~~~~~
diff --git a/doc/cli-reference/source/overview.rst b/doc/cli-reference/source/overview.rst
index 67baec6d25..1d250a43ca 100644
--- a/doc/cli-reference/source/overview.rst
+++ b/doc/cli-reference/source/overview.rst
@@ -5,7 +5,7 @@ OpenStack command-line clients overview
.. toctree::
:maxdepth: 2
- common/cli_overview
- common/cli_install_openstack_command_line_clients
- common/cli_discover_version_number_for_a_client
- common/cli_set_environment_variables_using_openstack_rc
+ common/cli-overview
+ common/cli-install-openstack-command-line-clients
+ common/cli-discover-version-number-for-a-client
+ common/cli-set-environment-variables-using-openstack-rc
diff --git a/doc/common/app_support.rst b/doc/common/app-support.rst
similarity index 100%
rename from doc/common/app_support.rst
rename to doc/common/app-support.rst
diff --git a/doc/common/cli_discover_version_number_for_a_client.rst b/doc/common/cli-discover-version-number-for-a-client.rst
similarity index 100%
rename from doc/common/cli_discover_version_number_for_a_client.rst
rename to doc/common/cli-discover-version-number-for-a-client.rst
diff --git a/doc/common/cli_install_openstack_command_line_clients.rst b/doc/common/cli-install-openstack-command-line-clients.rst
similarity index 99%
rename from doc/common/cli_install_openstack_command_line_clients.rst
rename to doc/common/cli-install-openstack-command-line-clients.rst
index 54b144c747..f01a2fb72a 100644
--- a/doc/common/cli_install_openstack_command_line_clients.rst
+++ b/doc/common/cli-install-openstack-command-line-clients.rst
@@ -261,4 +261,4 @@ What's next
Before you can run client commands, you must create and source the
``PROJECT-openrc.sh`` file to set environment variables. See
-:doc:`../common/cli_set_environment_variables_using_openstack_rc`.
+:doc:`../common/cli-set-environment-variables-using-openstack-rc`.
diff --git a/doc/common/cli_manage_images.rst b/doc/common/cli-manage-images.rst
similarity index 100%
rename from doc/common/cli_manage_images.rst
rename to doc/common/cli-manage-images.rst
diff --git a/doc/common/cli_manage_volumes.rst b/doc/common/cli-manage-volumes.rst
similarity index 100%
rename from doc/common/cli_manage_volumes.rst
rename to doc/common/cli-manage-volumes.rst
diff --git a/doc/common/cli_overview.rst b/doc/common/cli-overview.rst
similarity index 100%
rename from doc/common/cli_overview.rst
rename to doc/common/cli-overview.rst
diff --git a/doc/common/cli_set_environment_variables_using_openstack_rc.rst b/doc/common/cli-set-environment-variables-using-openstack-rc.rst
similarity index 100%
rename from doc/common/cli_set_environment_variables_using_openstack_rc.rst
rename to doc/common/cli-set-environment-variables-using-openstack-rc.rst
diff --git a/doc/common/dashboard_customizing.rst b/doc/common/dashboard-customizing.rst
similarity index 100%
rename from doc/common/dashboard_customizing.rst
rename to doc/common/dashboard-customizing.rst
diff --git a/doc/common/get_started_block_storage.rst b/doc/common/get-started-block-storage.rst
similarity index 100%
rename from doc/common/get_started_block_storage.rst
rename to doc/common/get-started-block-storage.rst
diff --git a/doc/common/get_started_compute.rst b/doc/common/get-started-compute.rst
similarity index 100%
rename from doc/common/get_started_compute.rst
rename to doc/common/get-started-compute.rst
diff --git a/doc/common/get_started_conceptual_architecture.rst b/doc/common/get-started-conceptual-architecture.rst
similarity index 100%
rename from doc/common/get_started_conceptual_architecture.rst
rename to doc/common/get-started-conceptual-architecture.rst
diff --git a/doc/common/get_started_dashboard.rst b/doc/common/get-started-dashboard.rst
similarity index 100%
rename from doc/common/get_started_dashboard.rst
rename to doc/common/get-started-dashboard.rst
diff --git a/doc/common/get_started_data_processing.rst b/doc/common/get-started-data-processing.rst
similarity index 100%
rename from doc/common/get_started_data_processing.rst
rename to doc/common/get-started-data-processing.rst
diff --git a/doc/common/get_started_database_service.rst b/doc/common/get-started-database-service.rst
similarity index 100%
rename from doc/common/get_started_database_service.rst
rename to doc/common/get-started-database-service.rst
diff --git a/doc/common/get_started_feedback.rst b/doc/common/get-started-feedback.rst
similarity index 100%
rename from doc/common/get_started_feedback.rst
rename to doc/common/get-started-feedback.rst
diff --git a/doc/common/get_started_identity.rst b/doc/common/get-started-identity.rst
similarity index 100%
rename from doc/common/get_started_identity.rst
rename to doc/common/get-started-identity.rst
diff --git a/doc/common/get_started_image_service.rst b/doc/common/get-started-image-service.rst
similarity index 100%
rename from doc/common/get_started_image_service.rst
rename to doc/common/get-started-image-service.rst
diff --git a/doc/common/get_started_logical_architecture.rst b/doc/common/get-started-logical-architecture.rst
similarity index 96%
rename from doc/common/get_started_logical_architecture.rst
rename to doc/common/get-started-logical-architecture.rst
index cdb25f4e95..0f68f56eb4 100644
--- a/doc/common/get_started_logical_architecture.rst
+++ b/doc/common/get-started-logical-architecture.rst
@@ -24,7 +24,7 @@ several message broker and database solutions, such as RabbitMQ,
MySQL, MariaDB, and SQLite.
Users can access OpenStack via the web-based user interface implemented
-by :doc:`Dashboard <get_started_dashboard>`, via `command-line
+by :doc:`Dashboard <get-started-dashboard>`, via `command-line
clients <http://docs.openstack.org/cli-reference/>`__ and by
issuing API requests through tools like browser plug-ins or :command:`curl`.
For applications, `several SDKs <http://developer.openstack.org/#sdk>`__
diff --git a/doc/common/get_started_networking.rst b/doc/common/get-started-networking.rst
similarity index 100%
rename from doc/common/get_started_networking.rst
rename to doc/common/get-started-networking.rst
diff --git a/doc/common/get_started_object_storage.rst b/doc/common/get-started-object-storage.rst
similarity index 100%
rename from doc/common/get_started_object_storage.rst
rename to doc/common/get-started-object-storage.rst
diff --git a/doc/common/get-started-openstack-services.rst b/doc/common/get-started-openstack-services.rst
new file mode 100644
index 0000000000..013f29eb95
--- /dev/null
+++ b/doc/common/get-started-openstack-services.rst
@@ -0,0 +1,23 @@
+==================
+OpenStack services
+==================
+
+.. toctree::
+ :maxdepth: 2
+
+
+ get-started-compute.rst
+ get-started-storage-concepts.rst
+ get-started-object-storage.rst
+ get-started-block-storage.rst
+ get-started-shared-file-systems.rst
+ get-started-networking.rst
+ get-started-dashboard.rst
+ get-started-identity.rst
+ get-started-image-service.rst
+ get-started-telemetry.rst
+ get-started-orchestration.rst
+ get-started-database-service.rst
+ get-started-data-processing.rst
+
+This section describes OpenStack services in detail.
diff --git a/doc/common/get_started_orchestration.rst b/doc/common/get-started-orchestration.rst
similarity index 100%
rename from doc/common/get_started_orchestration.rst
rename to doc/common/get-started-orchestration.rst
diff --git a/doc/common/get_started_shared_file_systems.rst b/doc/common/get-started-shared-file-systems.rst
similarity index 100%
rename from doc/common/get_started_shared_file_systems.rst
rename to doc/common/get-started-shared-file-systems.rst
diff --git a/doc/common/get_started_storage_concepts.rst b/doc/common/get-started-storage-concepts.rst
similarity index 100%
rename from doc/common/get_started_storage_concepts.rst
rename to doc/common/get-started-storage-concepts.rst
diff --git a/doc/common/get_started_telemetry.rst b/doc/common/get-started-telemetry.rst
similarity index 100%
rename from doc/common/get_started_telemetry.rst
rename to doc/common/get-started-telemetry.rst
diff --git a/doc/common/get_started_with_openstack.rst b/doc/common/get-started-with-openstack.rst
similarity index 97%
rename from doc/common/get_started_with_openstack.rst
rename to doc/common/get-started-with-openstack.rst
index fa5da16c7a..688b2ca740 100644
--- a/doc/common/get_started_with_openstack.rst
+++ b/doc/common/get-started-with-openstack.rst
@@ -5,10 +5,10 @@ Get started with OpenStack
.. toctree::
:maxdepth: 2
- get_started_conceptual_architecture.rst
- get_started_logical_architecture.rst
- get_started_openstack_services.rst
- get_started_feedback.rst
+ get-started-conceptual-architecture.rst
+ get-started-logical-architecture.rst
+ get-started-openstack-services.rst
+ get-started-feedback.rst
The OpenStack project is an open source cloud computing platform for all
types of clouds, which aims to be simple to implement, massively
diff --git a/doc/common/get_started_openstack_services.rst b/doc/common/get_started_openstack_services.rst
deleted file mode 100644
index 6547fb9b0a..0000000000
--- a/doc/common/get_started_openstack_services.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-==================
-OpenStack services
-==================
-
-.. toctree::
- :maxdepth: 2
-
-
- get_started_compute.rst
- get_started_storage_concepts.rst
- get_started_object_storage.rst
- get_started_block_storage.rst
- get_started_shared_file_systems.rst
- get_started_networking.rst
- get_started_dashboard.rst
- get_started_identity.rst
- get_started_image_service.rst
- get_started_telemetry.rst
- get_started_orchestration.rst
- get_started_database_service.rst
- get_started_data_processing.rst
-
-This section describes OpenStack services in detail.
diff --git a/doc/common/nova_show_usage_statistics_for_hosts_instances.rst b/doc/common/nova-show-usage-statistics-for-hosts-instances.rst
similarity index 100%
rename from doc/common/nova_show_usage_statistics_for_hosts_instances.rst
rename to doc/common/nova-show-usage-statistics-for-hosts-instances.rst
diff --git a/doc/config-reference/source/conf.py b/doc/config-reference/source/conf.py
index 439884325c..815db31de9 100644
--- a/doc/config-reference/source/conf.py
+++ b/doc/config-reference/source/conf.py
@@ -95,7 +95,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
-exclude_patterns = ['common/cli*', 'common/nova*', 'common/get_started_*',
+exclude_patterns = ['common/cli*', 'common/nova*', 'common/get-started-*',
'tables/*.rst', 'tables/manual/*.rst']
# The reST default role (used for this markup: `text`) to use for all
diff --git a/doc/config-reference/source/dashboard.rst b/doc/config-reference/source/dashboard.rst
index 59c6dea4dd..24a7229d70 100644
--- a/doc/config-reference/source/dashboard.rst
+++ b/doc/config-reference/source/dashboard.rst
@@ -6,7 +6,7 @@ Dashboard
:maxdepth: 1
dashboard/configure.rst
- common/dashboard_customizing.rst
+ common/dashboard-customizing.rst
dashboard/config-options.rst
dashboard/samples/index.rst
dashboard/logs.rst
diff --git a/doc/config-reference/source/index.rst b/doc/config-reference/source/index.rst
index cdbe58d1b3..1af19b4110 100644
--- a/doc/config-reference/source/index.rst
+++ b/doc/config-reference/source/index.rst
@@ -44,7 +44,7 @@ Appendix
policy-json-file.rst
firewalls-default-ports.rst
- common/app_support.rst
+ common/app-support.rst
Glossary
~~~~~~~~
diff --git a/doc/contributor-guide/source/conf.py b/doc/contributor-guide/source/conf.py
index ce196c6531..ab45a49673 100644
--- a/doc/contributor-guide/source/conf.py
+++ b/doc/contributor-guide/source/conf.py
@@ -94,8 +94,8 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
-exclude_patterns = ['common/app_support.rst', 'common/cli*', 'common/nova*',
- 'common/get_started*', 'common/dashboard*',
+exclude_patterns = ['common/app-support.rst', 'common/cli*', 'common/nova*',
+ 'common/get-started*', 'common/dashboard*',
'common/conventions.rst']
diff --git a/doc/ha-guide/source/conf.py b/doc/ha-guide/source/conf.py
index c6fb183288..d4fd00c099 100644
--- a/doc/ha-guide/source/conf.py
+++ b/doc/ha-guide/source/conf.py
@@ -90,7 +90,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['common/cli*', 'common/nova*',
- 'common/get_started*', 'common/dashboard*']
+ 'common/get-started*', 'common/dashboard*']
# The reST default role (used for this markup: `text`) to use for all
# documents.
diff --git a/doc/ha-guide/source/controller-ha-identity.rst b/doc/ha-guide/source/controller-ha-identity.rst
index 03781b8a03..4bbdbc9401 100644
--- a/doc/ha-guide/source/controller-ha-identity.rst
+++ b/doc/ha-guide/source/controller-ha-identity.rst
@@ -4,7 +4,7 @@ Highly available Identity API
You should be familiar with
`OpenStack Identity service
-<http://docs.openstack.org/admin-guide/common/get_started_identity.html>`_
+<http://docs.openstack.org/admin-guide/common/get-started-identity.html>`_
before proceeding, which is used by many services.
Making the OpenStack Identity service highly available
diff --git a/doc/ha-guide/source/controller-ha-telemetry.rst b/doc/ha-guide/source/controller-ha-telemetry.rst
index ab047cedda..d045cfef4a 100644
--- a/doc/ha-guide/source/controller-ha-telemetry.rst
+++ b/doc/ha-guide/source/controller-ha-telemetry.rst
@@ -3,7 +3,7 @@ Highly available Telemetry API
==============================
`Telemetry service
-<http://docs.openstack.org/admin-guide/common/get_started_telemetry.html`>_
+<http://docs.openstack.org/admin-guide/common/get-started-telemetry.html`>_
provides data collection service and alarming service.
Telemetry central agent
diff --git a/doc/ha-guide/source/index.rst b/doc/ha-guide/source/index.rst
index 3f30fc2cb9..57bdc309d8 100644
--- a/doc/ha-guide/source/index.rst
+++ b/doc/ha-guide/source/index.rst
@@ -37,7 +37,7 @@ Appendix
.. toctree::
:maxdepth: 1
- common/app_support.rst
+ common/app-support.rst
Glossary
~~~~~~~~
diff --git a/doc/image-guide/source/conf.py b/doc/image-guide/source/conf.py
index 41fb803d22..a46f7aeef0 100644
--- a/doc/image-guide/source/conf.py
+++ b/doc/image-guide/source/conf.py
@@ -89,7 +89,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
-exclude_patterns = ['common/get_start*', 'common/cli*', 'common/dashboard*',
+exclude_patterns = ['common/get-start*', 'common/cli*', 'common/dashboard*',
'common/nova*']
# The reST default role (used for this markup: `text`) to use for all
diff --git a/doc/image-guide/source/index.rst b/doc/image-guide/source/index.rst
index 403cc7d063..d1acb058c3 100644
--- a/doc/image-guide/source/index.rst
+++ b/doc/image-guide/source/index.rst
@@ -30,7 +30,7 @@ Appendix
.. toctree::
:maxdepth: 1
- common/app_support.rst
+ common/app-support.rst
Glossary
~~~~~~~~
diff --git a/doc/install-guide-debconf/source/conf.py b/doc/install-guide-debconf/source/conf.py
index cf31b2bb2d..61b3f138f1 100644
--- a/doc/install-guide-debconf/source/conf.py
+++ b/doc/install-guide-debconf/source/conf.py
@@ -92,18 +92,18 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['common/cli*', 'common/nova*',
- 'common/get_started_with_openstack.rst',
- 'common/get_started_openstack_services.rst',
- 'common/get_started_feedback.rst',
- 'common/get_started_logical_architecture.rst',
- 'common/get_started_dashboard.rst',
- 'common/get_started_storage_concepts.rst',
- 'common/get_started_database_service.rst',
- 'common/get_started_data_processing.rst',
- 'common/get_started_object_storage.rst',
- 'common/get_started_orchestration.rst',
- 'common/get_started_telemetry.rst',
- 'common/dashboard_customizing.rst',
+ 'common/get-started-with-openstack.rst',
+ 'common/get-started-openstack-services.rst',
+ 'common/get-started-feedback.rst',
+ 'common/get-started-logical-architecture.rst',
+ 'common/get-started-dashboard.rst',
+ 'common/get-started-storage-concepts.rst',
+ 'common/get-started-database-service.rst',
+ 'common/get-started-data-processing.rst',
+ 'common/get-started-object-storage.rst',
+ 'common/get-started-orchestration.rst',
+ 'common/get-started-telemetry.rst',
+ 'common/dashboard-customizing.rst',
'shared/note_configuration_vary_by_distribution.rst']
# The reST default role (used for this markup: `text`) to use for all
diff --git a/doc/install-guide-debconf/source/index.rst b/doc/install-guide-debconf/source/index.rst
index 7a5368e036..670abf8ced 100644
--- a/doc/install-guide-debconf/source/index.rst
+++ b/doc/install-guide-debconf/source/index.rst
@@ -53,7 +53,7 @@ Appendix
.. toctree::
:maxdepth: 1
- common/app_support.rst
+ common/app-support.rst
Glossary
~~~~~~~~
diff --git a/doc/install-guide/source/cinder.rst b/doc/install-guide/source/cinder.rst
index c3eb447184..2b37322cab 100644
--- a/doc/install-guide/source/cinder.rst
+++ b/doc/install-guide/source/cinder.rst
@@ -6,7 +6,7 @@ Block Storage service
.. toctree::
- common/get_started_block_storage.rst
+ common/get-started-block-storage.rst
cinder-controller-install.rst
cinder-storage-install.rst
cinder-backup-install.rst
diff --git a/doc/install-guide/source/conf.py b/doc/install-guide/source/conf.py
index 4201b98f38..7457d23078 100644
--- a/doc/install-guide/source/conf.py
+++ b/doc/install-guide/source/conf.py
@@ -92,18 +92,18 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['common/cli*', 'common/nova*',
- 'common/get_started_with_openstack.rst',
- 'common/get_started_openstack_services.rst',
- 'common/get_started_feedback.rst',
- 'common/get_started_logical_architecture.rst',
- 'common/get_started_dashboard.rst',
- 'common/get_started_storage_concepts.rst',
- 'common/get_started_database_service.rst',
- 'common/get_started_data_processing.rst',
- 'common/get_started_object_storage.rst',
- 'common/get_started_orchestration.rst',
- 'common/get_started_telemetry.rst',
- 'common/dashboard_customizing.rst',
+ 'common/get-started-with-openstack.rst',
+ 'common/get-started-openstack-services.rst',
+ 'common/get-started-feedback.rst',
+ 'common/get-started-logical-architecture.rst',
+ 'common/get-started-dashboard.rst',
+ 'common/get-started-storage-concepts.rst',
+ 'common/get-started-database-service.rst',
+ 'common/get-started-data-processing.rst',
+ 'common/get-started-object-storage.rst',
+ 'common/get-started-orchestration.rst',
+ 'common/get-started-telemetry.rst',
+ 'common/dashboard-customizing.rst',
'shared/note_configuration_vary_by_distribution.rst']
# The reST default role (used for this markup: `text`) to use for all
diff --git a/doc/install-guide/source/glance-verify.rst b/doc/install-guide/source/glance-verify.rst
index 57811bdd32..92ddf70897 100644
--- a/doc/install-guide/source/glance-verify.rst
+++ b/doc/install-guide/source/glance-verify.rst
@@ -10,7 +10,7 @@ For more information about how to download and build images, see
<http://docs.openstack.org/image-guide/>`__.
For information about how to manage images, see the
`OpenStack End User Guide
-<http://docs.openstack.org/user-guide/common/cli_manage_images.html>`__.
+<http://docs.openstack.org/user-guide/common/cli-manage-images.html>`__.
.. note::
diff --git a/doc/install-guide/source/glance.rst b/doc/install-guide/source/glance.rst
index dd53f5ba72..1e11c83afb 100644
--- a/doc/install-guide/source/glance.rst
+++ b/doc/install-guide/source/glance.rst
@@ -4,7 +4,7 @@ Image service
.. toctree::
- common/get_started_image_service.rst
+ common/get-started-image-service.rst
glance-install.rst
glance-verify.rst
diff --git a/doc/install-guide/source/horizon-next-steps.rst b/doc/install-guide/source/horizon-next-steps.rst
index c9e6e1957a..0e99c9aa7b 100644
--- a/doc/install-guide/source/horizon-next-steps.rst
+++ b/doc/install-guide/source/horizon-next-steps.rst
@@ -15,7 +15,7 @@ complete the following tasks:
* Customize your dashboard. See section
`Customize the dashboard
- <http://docs.openstack.org/admin-guide/common/dashboard_customizing.html>`__.
+ <http://docs.openstack.org/admin-guide/common/dashboard-customizing.html>`__.
* Set up session storage. See
`Set up session storage for the dashboard
diff --git a/doc/install-guide/source/index.rst b/doc/install-guide/source/index.rst
index db95fb3367..e020356019 100644
--- a/doc/install-guide/source/index.rst
+++ b/doc/install-guide/source/index.rst
@@ -120,7 +120,7 @@ Appendix
.. toctree::
:maxdepth: 1
- common/app_support.rst
+ common/app-support.rst
Glossary
~~~~~~~~
diff --git a/doc/install-guide/source/keystone.rst b/doc/install-guide/source/keystone.rst
index 9d0687c8eb..f926e2b485 100644
--- a/doc/install-guide/source/keystone.rst
+++ b/doc/install-guide/source/keystone.rst
@@ -4,7 +4,7 @@ Identity service
.. toctree::
- common/get_started_identity.rst
+ common/get-started-identity.rst
keystone-install.rst
keystone-services.rst
keystone-users.rst
diff --git a/doc/install-guide/source/launch-instance-cinder.rst b/doc/install-guide/source/launch-instance-cinder.rst
index 26b96248ff..3653d4d4b6 100644
--- a/doc/install-guide/source/launch-instance-cinder.rst
+++ b/doc/install-guide/source/launch-instance-cinder.rst
@@ -122,7 +122,7 @@ Attach the volume to an instance
For more information about how to manage volumes, see the
`Manage volumes
-<http://docs.openstack.org/user-guide/common/cli_manage_volumes.html>`__
+<http://docs.openstack.org/user-guide/common/cli-manage-volumes.html>`__
in OpenStack End User Guide.
Return to :ref:`launch-instance`.
diff --git a/doc/install-guide/source/launch-instance-provider.rst b/doc/install-guide/source/launch-instance-provider.rst
index dd5102854e..051bacbb6d 100644
--- a/doc/install-guide/source/launch-instance-provider.rst
+++ b/doc/install-guide/source/launch-instance-provider.rst
@@ -244,7 +244,7 @@ If your instance does not launch or seem to work as you expect, see the
`Instance Boot Failures
<http://docs.openstack.org/ops-guide/ops_maintenance_compute.html#instances>`__
section in OpenStack Operations Guide for more information or use one of
-the :doc:`many other options <common/app_support>`
+the :doc:`many other options <common/app-support>`
to seek assistance. We want your first installation to work!
Return to :ref:`Launch an instance <launch-instance-complete>`.
diff --git a/doc/install-guide/source/launch-instance-selfservice.rst b/doc/install-guide/source/launch-instance-selfservice.rst
index d7eae821f2..b5db8bdaf1 100644
--- a/doc/install-guide/source/launch-instance-selfservice.rst
+++ b/doc/install-guide/source/launch-instance-selfservice.rst
@@ -268,7 +268,7 @@ If your instance does not launch or seem to work as you expect, see the
`Instance Boot Failures
<http://docs.openstack.org/ops-guide/ops_maintenance_compute.html#instances>`__
section in OpenStack Operations Guide for more information or use one of
-the :doc:`many other options <common/app_support>`
+the :doc:`many other options <common/app-support>`
to seek assistance. We want your first installation to work!
Return to :ref:`Launch an instance <launch-instance-complete>`.
diff --git a/doc/install-guide/source/manila.rst b/doc/install-guide/source/manila.rst
index 769ced4bcb..1b16d188ca 100644
--- a/doc/install-guide/source/manila.rst
+++ b/doc/install-guide/source/manila.rst
@@ -6,7 +6,7 @@ Shared File Systems service
.. toctree::
- common/get_started_shared_file_systems.rst
+ common/get-started-shared-file-systems.rst
manila-controller-install.rst
manila-share-install.rst
manila-verify.rst
diff --git a/doc/install-guide/source/neutron.rst b/doc/install-guide/source/neutron.rst
index b06e77d301..22f4e46fc1 100644
--- a/doc/install-guide/source/neutron.rst
+++ b/doc/install-guide/source/neutron.rst
@@ -7,7 +7,7 @@ Networking service
.. toctree::
:maxdepth: 1
- common/get_started_networking.rst
+ common/get-started-networking.rst
neutron-concepts.rst
neutron-controller-install.rst
neutron-compute-install.rst
diff --git a/doc/install-guide/source/nova.rst b/doc/install-guide/source/nova.rst
index 03c5f05e81..60f3b48018 100644
--- a/doc/install-guide/source/nova.rst
+++ b/doc/install-guide/source/nova.rst
@@ -4,7 +4,7 @@ Compute service
.. toctree::
- common/get_started_compute.rst
+ common/get-started-compute.rst
nova-controller-install.rst
nova-compute-install.rst
nova-verify.rst
diff --git a/doc/networking-guide/source/conf.py b/doc/networking-guide/source/conf.py
index b7e4cbd6fa..62750a5af8 100644
--- a/doc/networking-guide/source/conf.py
+++ b/doc/networking-guide/source/conf.py
@@ -89,8 +89,8 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
-exclude_patterns = ['common/cli*', 'common/nova*', 'common/get_started_*',
- 'common/dashboard_customizing.rst']
+exclude_patterns = ['common/cli*', 'common/nova*', 'common/get-started-*',
+ 'common/dashboard-customizing.rst']
# The reST default role (used for this markup: `text`) to use for all
# documents.
diff --git a/doc/networking-guide/source/index.rst b/doc/networking-guide/source/index.rst
index 34c8f50d07..0ef52f9a5e 100644
--- a/doc/networking-guide/source/index.rst
+++ b/doc/networking-guide/source/index.rst
@@ -35,7 +35,7 @@ Appendix
.. toctree::
:maxdepth: 1
- common/app_support
+ common/app-support
Glossary
~~~~~~~~
diff --git a/doc/ops-guide/source/conf.py b/doc/ops-guide/source/conf.py
index cceac3d006..3444297f73 100644
--- a/doc/ops-guide/source/conf.py
+++ b/doc/ops-guide/source/conf.py
@@ -90,7 +90,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['common/cli*', 'common/nova*',
- 'common/get_started*', 'common/dashboard*']
+ 'common/get-started*', 'common/dashboard*']
# The reST default role (used for this markup: `text`) to use for all
# documents.
diff --git a/doc/ops-guide/source/index.rst b/doc/ops-guide/source/index.rst
index a8c0912cdc..03ec4288e8 100644
--- a/doc/ops-guide/source/index.rst
+++ b/doc/ops-guide/source/index.rst
@@ -29,7 +29,7 @@ Appendix
app_crypt.rst
app_roadmaps.rst
app_resources.rst
- common/app_support.rst
+ common/app-support.rst
Glossary
~~~~~~~~
diff --git a/doc/ops-guide/source/ops_lay_of_the_land.rst b/doc/ops-guide/source/ops_lay_of_the_land.rst
index f61a9e2b6d..839d125f63 100644
--- a/doc/ops-guide/source/ops_lay_of_the_land.rst
+++ b/doc/ops-guide/source/ops_lay_of_the_land.rst
@@ -41,7 +41,7 @@ Install OpenStack command-line clients
For instructions on installing, upgrading, or removing command-line clients,
see the `OpenStack Command-Line Interface Reference
-<http://docs.openstack.org/cli-reference/common/cli_install_openstack_command_line_clients.html>`_.
+<http://docs.openstack.org/cli-reference/common/cli-install-openstack-command-line-clients.html>`_.
.. note::
diff --git a/doc/ops-guide/source/ops_user_facing_operations.rst b/doc/ops-guide/source/ops_user_facing_operations.rst
index 715987652d..86bbd0c83e 100644
--- a/doc/ops-guide/source/ops_user_facing_operations.rst
+++ b/doc/ops-guide/source/ops_user_facing_operations.rst
@@ -910,7 +910,7 @@ or run this from the command line:
For more information about updating Block Storage volumes (for
example, resizing or transferring), see the `OpenStack End User
- Guide <http://docs.openstack.org/user-guide/common/cli_manage_volumes.html>`__.
+ Guide <http://docs.openstack.org/user-guide/common/cli-manage-volumes.html>`__.
Block Storage Creation Failures
-------------------------------
diff --git a/doc/user-guide/source/cli.rst b/doc/user-guide/source/cli.rst
index 26cea3b2a4..7bb0d61fd0 100644
--- a/doc/user-guide/source/cli.rst
+++ b/doc/user-guide/source/cli.rst
@@ -5,13 +5,13 @@ OpenStack command-line clients
.. toctree::
:maxdepth: 2
- common/cli_overview.rst
- common/cli_install_openstack_command_line_clients.rst
- common/cli_discover_version_number_for_a_client.rst
- common/cli_set_environment_variables_using_openstack_rc.rst
- common/cli_manage_images.rst
+ common/cli-overview.rst
+ common/cli-install-openstack-command-line-clients.rst
+ common/cli-discover-version-number-for-a-client.rst
+ common/cli-set-environment-variables-using-openstack-rc.rst
+ common/cli-manage-images.rst
cli_manage_images_curl.rst
- common/cli_manage_volumes.rst
+ common/cli-manage-volumes.rst
cli_manage_shares.rst
cli_nova_configure_access_security_for_instances.rst
cli_launch_instances.rst
diff --git a/doc/user-guide/source/cli_nova_configure_access_security_for_instances.rst b/doc/user-guide/source/cli_nova_configure_access_security_for_instances.rst
index aa703b2bc0..d8613bd853 100644
--- a/doc/user-guide/source/cli_nova_configure_access_security_for_instances.rst
+++ b/doc/user-guide/source/cli_nova_configure_access_security_for_instances.rst
@@ -140,7 +140,7 @@ Create and manage security group rules
Modify security group rules with the :command:`nova secgroup-*-rule`
commands. Before you begin, source the OpenStack RC file. For details,
-see :doc:`../common/cli_set_environment_variables_using_openstack_rc`.
+see :doc:`../common/cli-set-environment-variables-using-openstack-rc`.
#. To list the rules for a security group, run the following command:
diff --git a/doc/user-guide/source/conf.py b/doc/user-guide/source/conf.py
index ccf99a7a85..d82dbc5faf 100644
--- a/doc/user-guide/source/conf.py
+++ b/doc/user-guide/source/conf.py
@@ -93,8 +93,8 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
exclude_patterns = ['common/nova*',
- 'common/get_started_*',
- 'common/dashboard_customizing.rst'
+ 'common/get-started-*',
+ 'common/dashboard-customizing.rst'
]
# The reST default role (used for this markup: `text`) to use for all
diff --git a/doc/user-guide/source/dashboard_manage_images.rst b/doc/user-guide/source/dashboard_manage_images.rst
index 3188c476e4..55b1565bf4 100644
--- a/doc/user-guide/source/dashboard_manage_images.rst
+++ b/doc/user-guide/source/dashboard_manage_images.rst
@@ -20,7 +20,7 @@ manage images in the admin project.
You can also use the :command:`openstack`, :command:`glance` and
:command:`nova` command-line clients or the Image service and Compute
APIs to manage images. For more information see
- :doc:`../common/cli_manage_images`.
+ :doc:`../common/cli-manage-images`.
Upload an image
~~~~~~~~~~~~~~~
diff --git a/doc/user-guide/source/index.rst b/doc/user-guide/source/index.rst
index 137d82fa73..64190d4b86 100644
--- a/doc/user-guide/source/index.rst
+++ b/doc/user-guide/source/index.rst
@@ -33,7 +33,7 @@ Appendix
.. toctree::
:maxdepth: 1
- common/app_support.rst
+ common/app-support.rst
Glossary
~~~~~~~~
diff --git a/doc/user-guide/source/sdk_install.rst b/doc/user-guide/source/sdk_install.rst
index 7986c4413f..28ffe01226 100644
--- a/doc/user-guide/source/sdk_install.rst
+++ b/doc/user-guide/source/sdk_install.rst
@@ -6,5 +6,5 @@ bundled with the command-line clients. For example, the Python bindings
for the Compute API are bundled with the python-novaclient package.
For details about how to install the clients, see
-:doc:`../common/cli_install_openstack_command_line_clients`.
+:doc:`../common/cli-install-openstack-command-line-clients`.
diff --git a/www/static/.htaccess b/www/static/.htaccess
index e40374b7a7..335d3daec7 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -127,10 +127,39 @@ redirectmatch 301 "^/kilo/install-guide/install/.*/sahara.*$" /
# Redirect old networking content to root for now
redirectmatch 301 /openstack-network/.*$ /index.html
+# Redirect renamed common files
+redirectmatch 301 ^/([a-z-]+)/common/app_support.html /$1/common/app-support.html
+redirectmatch 301 ^/([a-z-]+)/common/cli_discover_version_number_for_a_client.html /$1/common/cli-discover-version-number-for-a-client.html
+redirectmatch 301 ^/([a-z-]+)/common/cli_install_openstack_command_line_clients.html /$1/common/cli-install-openstack-command-line-clients.html
+redirectmatch 301 ^/([a-z-]+)/common/cli_manage_images.html /$1/common/cli-manage-images.html
+redirectmatch 301 ^/([a-z-]+)/common/cli_manage_volumes.html /$1/common/cli-manage-volumes.html
+redirectmatch 301 ^/([a-z-]+)/common/cli_overview.html /$1/common/cli-overview.html
+redirectmatch 301 ^/([a-z-]+)/common/cli_set_environment_variables_using_openstack_rc.html /$1/common/cli-set-environment-variables-using-openstack-rc.html
+redirectmatch 301 ^/([a-z-]+)/common/dashboard_customizing.html /$1/common/dashboard-customizing.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_block_storage.html /$1/common/get-started-block-storage.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_compute.html /$1/common/get-started-compute.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_conceptual_architecture.html /$1/common/get-started-conceptual-architecture.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_dashboard.html /$1/common/get-started-dashboard.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_data_processing.html /$1/common/get-started-data-processing.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_database_service.html /$1/common/get-started-database-service.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_feedback.html /$1/common/get-started-feedback.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_identity.html /$1/common/get-started-identity.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_image_service.html /$1/common/get-started-image-service.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_logical_architecture.html /$1/common/get-started-logical-architecture.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_networking.html /$1/common/get-started-networking.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_object_storage.html /$1/common/get-started-object-storage.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_openstack_services.html /$1/common/get-started-openstack-services.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_orchestration.html /$1/common/get-started-orchestration.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_shared_file_systems.html /$1/common/get-started-shared-file-systems.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_storage_concepts.html /$1/common/get-started-storage-concepts.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_telemetry.html /$1/common/get-started-telemetry.html
+redirectmatch 301 ^/([a-z-]+)/common/get_started_with_openstack.html /$1/common/get-started-with-openstack.html
+redirectmatch 301 ^/([a-z-]+)/common/nova_show_usage_statistics_for_hosts_instances.html /$1/common/nova-show-usage-statistics-for-hosts-instances.html
+
# Redirect top ten (or so) User Guide pages post-migration
-redirect 301 /user-guide/content/app_community_support.html /user-guide/common/app_support.html
-redirect 301 /user-guide/content/checking_version_cli.html /user-guide/common/cli_discover_version_number_for_a_client.html
-redirect 301 /user-guide/content/install_clients.html /user-guide/common/cli_install_openstack_command_line_clients.html
+redirect 301 /user-guide/content/app_community_support.html /user-guide/common/app-support.html
+redirect 301 /user-guide/content/checking_version_cli.html /user-guide/common/cli-discover-version-number-for-a-client.html
+redirect 301 /user-guide/content/install_clients.html /user-guide/common/cli-install-openstack-command-line-clients.html
redirect 301 /user-guide/content/ssh-into-instance.html /user-guide/dashboard_launch_instances.html#connect-to-your-instance-by-using-ssh
redirect 301 /user-guide/content/app_cheat_sheet.html /user-guide/cli_cheat_sheet.html
redirect 301 /user-guide/content/Launching_Instances_using_Dashboard.html /user-guide/dashboard_launch_instances.html