From b94d0b58d4767f9ebdc0b42ebd8a0dc71c04c8f0 Mon Sep 17 00:00:00 2001
From: Maria Zlatkova <mzlatkova@mirantis.com>
Date: Wed, 10 Aug 2016 13:22:47 +0300
Subject: [PATCH] [user-guide] Changes underscore to hyphen in RST files

Adds the following changes:

- Renames all the RST files in the user-guide folder to use
  hyphens instead of underscores;
- Adds redirects to the renamed files to .htaccess.

Change-Id: Ic5f1a90421add35d001363cd39bada0b56a04d7f
Implements: blueprint consistency-file-rename
---
 ...remental.rst => backup-db-incremental.rst} |  0
 .../source/{backup_db.rst => backup-db.rst}   |  0
 ...cli-access-instance-through-a-console.rst} |  0
 ...{cli_ceilometer.rst => cli-ceilometer.rst} |  0
 ...=> cli-change-the-size-of-your-server.rst} |  0
 ...li_cheat_sheet.rst => cli-cheat-sheet.rst} |  0
 ..._config_drive.rst => cli-config-drive.rst} |  0
 ...rst => cli-create-and-manage-networks.rst} |  0
 ...s.rst => cli-create-and-manage-stacks.rst} |  0
 ...nstance.rst => cli-delete-an-instance.rst} |  0
 ...instances.rst => cli-launch-instances.rst} | 12 ++--
 ...es.rst => cli-manage-bare-metal-nodes.rst} |  0
 ...es_curl.rst => cli-manage-images-curl.rst} |  0
 ...sts.rst => cli-manage-instances-hosts.rst} | 16 ++---
 ...resses.rst => cli-manage-ip-addresses.rst} |  0
 ...anage_shares.rst => cli-manage-shares.rst} |  0
 ...nfigure-access-security-for-instances.rst} |  2 +-
 ...> cli-nova-launch-instance-from-image.rst} |  0
 ... cli-nova-launch-instance-from-volume.rst} |  0
 ...-nova-launch-instance-using-ISO-image.rst} |  0
 ...=> cli-provide-user-data-to-instances.rst} |  0
 ...nstance.rst => cli-reboot-an-instance.rst} |  0
 ...> cli-search-instance-with-ip-address.rst} |  0
 ...rst => cli-stop-and-start-an-instance.rst} |  0
 ...rst => cli-swift-archive-auto-extract.rst} |  0
 ...k_delete.rst => cli-swift-bulk-delete.rst} |  0
 ...rs.rst => cli-swift-create-containers.rst} |  0
 ...lity.rst => cli-swift-discoverability.rst} |  0
 ...ft_env_vars.rst => cli-swift-env-vars.rst} |  0
 ...ge_lists.rst => cli-swift-large-lists.rst} |  0
 ...st => cli-swift-large-object-creation.rst} |  0
 ....rst => cli-swift-manage-access-swift.rst} |  0
 ...jects.rst => cli-swift-manage-objects.rst} |  0
 ...eudo-hierarchical-folders-directories.rst} |  0
 ...cli-swift-serialized-response-formats.rst} |  0
 ....rst => cli-swift-set-object-versions.rst} |  0
 ...bsite.rst => cli-swift-static-website.rst} |  0
 ...li-use-snapshots-to-migrate-instances.rst} |  0
 doc/user-guide/source/cli.rst                 | 22 +++----
 ...ure-access-and-security-for-instances.rst} |  0
 .../source/{create_db.rst => create-db.rst}   |  0
 ...orks.rst => dashboard-create-networks.rst} |  0
 ..._databases.rst => dashboard-databases.rst} |  0
 ...ces.rst => dashboard-launch-instances.rst} |  0
 ...hboard_log_in.rst => dashboard-log-in.rst} |  0
 ...rs.rst => dashboard-manage-containers.rst} |  0
 ...images.rst => dashboard-manage-images.rst} |  0
 ...aasv2.rst => dashboard-manage-lbaasv2.rst} |  0
 ...shares.rst => dashboard-manage-shares.rst} |  0
 ...lumes.rst => dashboard-manage-volumes.rst} |  0
 ...hboard_stacks.rst => dashboard-stacks.rst} |  0
 doc/user-guide/source/dashboard.rst           | 22 +++----
 doc/user-guide/source/index.rst               |  2 +-
 ...age_db_config.rst => manage-db-config.rst} |  0
 ...penstack-object-storage-with-swift-cli.rst | 26 ++++----
 ...eaders.rst => sdk-assign-cors-headers.rst} |  0
 ..._authenticate.rst => sdk-authenticate.rst} |  0
 ..._compute_apis.rst => sdk-compute-apis.rst} |  0
 ...k-configure-access-security-instances.rst} |  0
 ...t.rst => sdk-create-legacy-novaclient.rst} |  0
 .../{sdk_install.rst => sdk-install.rst}      |  0
 ...anage_images.rst => sdk-manage-images.rst} |  0
 ..._neutron_apis.rst => sdk-neutron-apis.rst} |  0
 .../{sdk_overview.rst => sdk-overview.rst}    |  0
 ... => sdk-schedule-objects-for-deletion.rst} |  0
 doc/user-guide/source/sdk.rst                 | 20 +++---
 ...p_clustering.rst => set-up-clustering.rst} |  0
 ...replication.rst => set-up-replication.rst} |  0
 doc/user-guide/source/trove-manage-db.rst     | 12 ++--
 www/static/.htaccess                          | 66 +++++++++++++++++++
 70 files changed, 133 insertions(+), 67 deletions(-)
 rename doc/user-guide/source/{backup_db_incremental.rst => backup-db-incremental.rst} (100%)
 rename doc/user-guide/source/{backup_db.rst => backup-db.rst} (100%)
 rename doc/user-guide/source/{cli_access_instance_through_a_console.rst => cli-access-instance-through-a-console.rst} (100%)
 rename doc/user-guide/source/{cli_ceilometer.rst => cli-ceilometer.rst} (100%)
 rename doc/user-guide/source/{cli_change_the_size_of_your_server.rst => cli-change-the-size-of-your-server.rst} (100%)
 rename doc/user-guide/source/{cli_cheat_sheet.rst => cli-cheat-sheet.rst} (100%)
 rename doc/user-guide/source/{cli_config_drive.rst => cli-config-drive.rst} (100%)
 rename doc/user-guide/source/{cli_create_and_manage_networks.rst => cli-create-and-manage-networks.rst} (100%)
 rename doc/user-guide/source/{cli_create_and_manage_stacks.rst => cli-create-and-manage-stacks.rst} (100%)
 rename doc/user-guide/source/{cli_delete_an_instance.rst => cli-delete-an-instance.rst} (100%)
 rename doc/user-guide/source/{cli_launch_instances.rst => cli-launch-instances.rst} (95%)
 rename doc/user-guide/source/{cli_manage_bare_metal_nodes.rst => cli-manage-bare-metal-nodes.rst} (100%)
 rename doc/user-guide/source/{cli_manage_images_curl.rst => cli-manage-images-curl.rst} (100%)
 rename doc/user-guide/source/{cli_manage_instances_hosts.rst => cli-manage-instances-hosts.rst} (64%)
 rename doc/user-guide/source/{cli_manage_ip_addresses.rst => cli-manage-ip-addresses.rst} (100%)
 rename doc/user-guide/source/{cli_manage_shares.rst => cli-manage-shares.rst} (100%)
 rename doc/user-guide/source/{cli_nova_configure_access_security_for_instances.rst => cli-nova-configure-access-security-for-instances.rst} (99%)
 rename doc/user-guide/source/{cli_nova_launch_instance_from_image.rst => cli-nova-launch-instance-from-image.rst} (100%)
 rename doc/user-guide/source/{cli_nova_launch_instance_from_volume.rst => cli-nova-launch-instance-from-volume.rst} (100%)
 rename doc/user-guide/source/{cli_nova_launch_instance_using_ISO_image.rst => cli-nova-launch-instance-using-ISO-image.rst} (100%)
 rename doc/user-guide/source/{cli_provide_user_data_to_instances.rst => cli-provide-user-data-to-instances.rst} (100%)
 rename doc/user-guide/source/{cli_reboot_an_instance.rst => cli-reboot-an-instance.rst} (100%)
 rename doc/user-guide/source/{cli_search_instance_with_ip_address.rst => cli-search-instance-with-ip-address.rst} (100%)
 rename doc/user-guide/source/{cli_stop_and_start_an_instance.rst => cli-stop-and-start-an-instance.rst} (100%)
 rename doc/user-guide/source/{cli_swift_archive_auto_extract.rst => cli-swift-archive-auto-extract.rst} (100%)
 rename doc/user-guide/source/{cli_swift_bulk_delete.rst => cli-swift-bulk-delete.rst} (100%)
 rename doc/user-guide/source/{cli_swift_create_containers.rst => cli-swift-create-containers.rst} (100%)
 rename doc/user-guide/source/{cli_swift_discoverability.rst => cli-swift-discoverability.rst} (100%)
 rename doc/user-guide/source/{cli_swift_env_vars.rst => cli-swift-env-vars.rst} (100%)
 rename doc/user-guide/source/{cli_swift_large_lists.rst => cli-swift-large-lists.rst} (100%)
 rename doc/user-guide/source/{cli_swift_large_object_creation.rst => cli-swift-large-object-creation.rst} (100%)
 rename doc/user-guide/source/{cli_swift_manage_access_swift.rst => cli-swift-manage-access-swift.rst} (100%)
 rename doc/user-guide/source/{cli_swift_manage_objects.rst => cli-swift-manage-objects.rst} (100%)
 rename doc/user-guide/source/{cli_swift_pseudo_hierarchical_folders_directories.rst => cli-swift-pseudo-hierarchical-folders-directories.rst} (100%)
 rename doc/user-guide/source/{cli_swift_serialized_response_formats.rst => cli-swift-serialized-response-formats.rst} (100%)
 rename doc/user-guide/source/{cli_swift_set_object_versions.rst => cli-swift-set-object-versions.rst} (100%)
 rename doc/user-guide/source/{cli_swift_static_website.rst => cli-swift-static-website.rst} (100%)
 rename doc/user-guide/source/{cli_use_snapshots_to_migrate_instances.rst => cli-use-snapshots-to-migrate-instances.rst} (100%)
 rename doc/user-guide/source/{configure_access_and_security_for_instances.rst => configure-access-and-security-for-instances.rst} (100%)
 rename doc/user-guide/source/{create_db.rst => create-db.rst} (100%)
 rename doc/user-guide/source/{dashboard_create_networks.rst => dashboard-create-networks.rst} (100%)
 rename doc/user-guide/source/{dashboard_databases.rst => dashboard-databases.rst} (100%)
 rename doc/user-guide/source/{dashboard_launch_instances.rst => dashboard-launch-instances.rst} (100%)
 rename doc/user-guide/source/{dashboard_log_in.rst => dashboard-log-in.rst} (100%)
 rename doc/user-guide/source/{dashboard_manage_containers.rst => dashboard-manage-containers.rst} (100%)
 rename doc/user-guide/source/{dashboard_manage_images.rst => dashboard-manage-images.rst} (100%)
 rename doc/user-guide/source/{dashboard_manage_lbaasv2.rst => dashboard-manage-lbaasv2.rst} (100%)
 rename doc/user-guide/source/{dashboard_manage_shares.rst => dashboard-manage-shares.rst} (100%)
 rename doc/user-guide/source/{dashboard_manage_volumes.rst => dashboard-manage-volumes.rst} (100%)
 rename doc/user-guide/source/{dashboard_stacks.rst => dashboard-stacks.rst} (100%)
 rename doc/user-guide/source/{manage_db_config.rst => manage-db-config.rst} (100%)
 rename doc/user-guide/source/{sdk_assign_cors_headers.rst => sdk-assign-cors-headers.rst} (100%)
 rename doc/user-guide/source/{sdk_authenticate.rst => sdk-authenticate.rst} (100%)
 rename doc/user-guide/source/{sdk_compute_apis.rst => sdk-compute-apis.rst} (100%)
 rename doc/user-guide/source/{sdk_configure_access_security_instances.rst => sdk-configure-access-security-instances.rst} (100%)
 rename doc/user-guide/source/{sdk_create_legacy_novaclient.rst => sdk-create-legacy-novaclient.rst} (100%)
 rename doc/user-guide/source/{sdk_install.rst => sdk-install.rst} (100%)
 rename doc/user-guide/source/{sdk_manage_images.rst => sdk-manage-images.rst} (100%)
 rename doc/user-guide/source/{sdk_neutron_apis.rst => sdk-neutron-apis.rst} (100%)
 rename doc/user-guide/source/{sdk_overview.rst => sdk-overview.rst} (100%)
 rename doc/user-guide/source/{sdk_schedule_objects_for_deletion.rst => sdk-schedule-objects-for-deletion.rst} (100%)
 rename doc/user-guide/source/{set_up_clustering.rst => set-up-clustering.rst} (100%)
 rename doc/user-guide/source/{set_up_replication.rst => set-up-replication.rst} (100%)

diff --git a/doc/user-guide/source/backup_db_incremental.rst b/doc/user-guide/source/backup-db-incremental.rst
similarity index 100%
rename from doc/user-guide/source/backup_db_incremental.rst
rename to doc/user-guide/source/backup-db-incremental.rst
diff --git a/doc/user-guide/source/backup_db.rst b/doc/user-guide/source/backup-db.rst
similarity index 100%
rename from doc/user-guide/source/backup_db.rst
rename to doc/user-guide/source/backup-db.rst
diff --git a/doc/user-guide/source/cli_access_instance_through_a_console.rst b/doc/user-guide/source/cli-access-instance-through-a-console.rst
similarity index 100%
rename from doc/user-guide/source/cli_access_instance_through_a_console.rst
rename to doc/user-guide/source/cli-access-instance-through-a-console.rst
diff --git a/doc/user-guide/source/cli_ceilometer.rst b/doc/user-guide/source/cli-ceilometer.rst
similarity index 100%
rename from doc/user-guide/source/cli_ceilometer.rst
rename to doc/user-guide/source/cli-ceilometer.rst
diff --git a/doc/user-guide/source/cli_change_the_size_of_your_server.rst b/doc/user-guide/source/cli-change-the-size-of-your-server.rst
similarity index 100%
rename from doc/user-guide/source/cli_change_the_size_of_your_server.rst
rename to doc/user-guide/source/cli-change-the-size-of-your-server.rst
diff --git a/doc/user-guide/source/cli_cheat_sheet.rst b/doc/user-guide/source/cli-cheat-sheet.rst
similarity index 100%
rename from doc/user-guide/source/cli_cheat_sheet.rst
rename to doc/user-guide/source/cli-cheat-sheet.rst
diff --git a/doc/user-guide/source/cli_config_drive.rst b/doc/user-guide/source/cli-config-drive.rst
similarity index 100%
rename from doc/user-guide/source/cli_config_drive.rst
rename to doc/user-guide/source/cli-config-drive.rst
diff --git a/doc/user-guide/source/cli_create_and_manage_networks.rst b/doc/user-guide/source/cli-create-and-manage-networks.rst
similarity index 100%
rename from doc/user-guide/source/cli_create_and_manage_networks.rst
rename to doc/user-guide/source/cli-create-and-manage-networks.rst
diff --git a/doc/user-guide/source/cli_create_and_manage_stacks.rst b/doc/user-guide/source/cli-create-and-manage-stacks.rst
similarity index 100%
rename from doc/user-guide/source/cli_create_and_manage_stacks.rst
rename to doc/user-guide/source/cli-create-and-manage-stacks.rst
diff --git a/doc/user-guide/source/cli_delete_an_instance.rst b/doc/user-guide/source/cli-delete-an-instance.rst
similarity index 100%
rename from doc/user-guide/source/cli_delete_an_instance.rst
rename to doc/user-guide/source/cli-delete-an-instance.rst
diff --git a/doc/user-guide/source/cli_launch_instances.rst b/doc/user-guide/source/cli-launch-instances.rst
similarity index 95%
rename from doc/user-guide/source/cli_launch_instances.rst
rename to doc/user-guide/source/cli-launch-instances.rst
index 1676877e24..afa17bb21f 100644
--- a/doc/user-guide/source/cli_launch_instances.rst
+++ b/doc/user-guide/source/cli-launch-instances.rst
@@ -55,11 +55,11 @@ Before you can launch an instance, gather the following parameters:
 
    You can also assign a floating IP address to a running instance to
    make it accessible from outside the cloud. See
-   :doc:`cli_manage_ip_addresses`.
+   :doc:`cli-manage-ip-addresses`.
 
 After you gather the parameters that you need to launch an instance,
-you can launch it from an :doc:`image<cli_nova_launch_instance_from_image>`
-or a :doc:`volume<cli_nova_launch_instance_from_volume>`. You can launch an
+you can launch it from an :doc:`image<cli-nova-launch-instance-from-image>`
+or a :doc:`volume<cli-nova-launch-instance-from-volume>`. You can launch an
 instance directly from one of the available OpenStack images or from
 an image that you have copied to a persistent volume. The OpenStack
 Image service provides a pool of images that are accessible to members
@@ -160,7 +160,7 @@ You can launch an instance from various sources.
 .. toctree::
    :maxdepth: 2
 
-   cli_nova_launch_instance_from_image.rst
-   cli_nova_launch_instance_from_volume.rst
-   cli_nova_launch_instance_using_ISO_image.rst
+   cli-nova-launch-instance-from-image.rst
+   cli-nova-launch-instance-from-volume.rst
+   cli-nova-launch-instance-using-ISO-image.rst
 
diff --git a/doc/user-guide/source/cli_manage_bare_metal_nodes.rst b/doc/user-guide/source/cli-manage-bare-metal-nodes.rst
similarity index 100%
rename from doc/user-guide/source/cli_manage_bare_metal_nodes.rst
rename to doc/user-guide/source/cli-manage-bare-metal-nodes.rst
diff --git a/doc/user-guide/source/cli_manage_images_curl.rst b/doc/user-guide/source/cli-manage-images-curl.rst
similarity index 100%
rename from doc/user-guide/source/cli_manage_images_curl.rst
rename to doc/user-guide/source/cli-manage-images-curl.rst
diff --git a/doc/user-guide/source/cli_manage_instances_hosts.rst b/doc/user-guide/source/cli-manage-instances-hosts.rst
similarity index 64%
rename from doc/user-guide/source/cli_manage_instances_hosts.rst
rename to doc/user-guide/source/cli-manage-instances-hosts.rst
index 9985566005..4ad38a51ec 100644
--- a/doc/user-guide/source/cli_manage_instances_hosts.rst
+++ b/doc/user-guide/source/cli-manage-instances-hosts.rst
@@ -14,12 +14,12 @@ discusses node management tasks.
 .. toctree::
    :maxdepth: 2
 
-   cli_manage_ip_addresses.rst
-   cli_change_the_size_of_your_server.rst
-   cli_stop_and_start_an_instance.rst
-   cli_search_instance_with_ip_address.rst
-   cli_reboot_an_instance.rst
-   cli_delete_an_instance.rst
-   cli_access_instance_through_a_console.rst
-   cli_manage_bare_metal_nodes.rst
+   cli-manage-ip-addresses.rst
+   cli-change-the-size-of-your-server.rst
+   cli-stop-and-start-an-instance.rst
+   cli-search-instance-with-ip-address.rst
+   cli-reboot-an-instance.rst
+   cli-delete-an-instance.rst
+   cli-access-instance-through-a-console.rst
+   cli-manage-bare-metal-nodes.rst
 
diff --git a/doc/user-guide/source/cli_manage_ip_addresses.rst b/doc/user-guide/source/cli-manage-ip-addresses.rst
similarity index 100%
rename from doc/user-guide/source/cli_manage_ip_addresses.rst
rename to doc/user-guide/source/cli-manage-ip-addresses.rst
diff --git a/doc/user-guide/source/cli_manage_shares.rst b/doc/user-guide/source/cli-manage-shares.rst
similarity index 100%
rename from doc/user-guide/source/cli_manage_shares.rst
rename to doc/user-guide/source/cli-manage-shares.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
similarity index 99%
rename from doc/user-guide/source/cli_nova_configure_access_security_for_instances.rst
rename to doc/user-guide/source/cli-nova-configure-access-security-for-instances.rst
index d8613bd853..e4523dcf69 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
@@ -61,7 +61,7 @@ Rules are automatically enforced as soon as you create or modify them.
 
   You can also assign a floating IP address to a running instance to
   make it accessible from outside the cloud. See
-  :doc:`cli_manage_ip_addresses`.
+  :doc:`cli-manage-ip-addresses`.
 
 Add a key pair
 ~~~~~~~~~~~~~~
diff --git a/doc/user-guide/source/cli_nova_launch_instance_from_image.rst b/doc/user-guide/source/cli-nova-launch-instance-from-image.rst
similarity index 100%
rename from doc/user-guide/source/cli_nova_launch_instance_from_image.rst
rename to doc/user-guide/source/cli-nova-launch-instance-from-image.rst
diff --git a/doc/user-guide/source/cli_nova_launch_instance_from_volume.rst b/doc/user-guide/source/cli-nova-launch-instance-from-volume.rst
similarity index 100%
rename from doc/user-guide/source/cli_nova_launch_instance_from_volume.rst
rename to doc/user-guide/source/cli-nova-launch-instance-from-volume.rst
diff --git a/doc/user-guide/source/cli_nova_launch_instance_using_ISO_image.rst b/doc/user-guide/source/cli-nova-launch-instance-using-ISO-image.rst
similarity index 100%
rename from doc/user-guide/source/cli_nova_launch_instance_using_ISO_image.rst
rename to doc/user-guide/source/cli-nova-launch-instance-using-ISO-image.rst
diff --git a/doc/user-guide/source/cli_provide_user_data_to_instances.rst b/doc/user-guide/source/cli-provide-user-data-to-instances.rst
similarity index 100%
rename from doc/user-guide/source/cli_provide_user_data_to_instances.rst
rename to doc/user-guide/source/cli-provide-user-data-to-instances.rst
diff --git a/doc/user-guide/source/cli_reboot_an_instance.rst b/doc/user-guide/source/cli-reboot-an-instance.rst
similarity index 100%
rename from doc/user-guide/source/cli_reboot_an_instance.rst
rename to doc/user-guide/source/cli-reboot-an-instance.rst
diff --git a/doc/user-guide/source/cli_search_instance_with_ip_address.rst b/doc/user-guide/source/cli-search-instance-with-ip-address.rst
similarity index 100%
rename from doc/user-guide/source/cli_search_instance_with_ip_address.rst
rename to doc/user-guide/source/cli-search-instance-with-ip-address.rst
diff --git a/doc/user-guide/source/cli_stop_and_start_an_instance.rst b/doc/user-guide/source/cli-stop-and-start-an-instance.rst
similarity index 100%
rename from doc/user-guide/source/cli_stop_and_start_an_instance.rst
rename to doc/user-guide/source/cli-stop-and-start-an-instance.rst
diff --git a/doc/user-guide/source/cli_swift_archive_auto_extract.rst b/doc/user-guide/source/cli-swift-archive-auto-extract.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_archive_auto_extract.rst
rename to doc/user-guide/source/cli-swift-archive-auto-extract.rst
diff --git a/doc/user-guide/source/cli_swift_bulk_delete.rst b/doc/user-guide/source/cli-swift-bulk-delete.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_bulk_delete.rst
rename to doc/user-guide/source/cli-swift-bulk-delete.rst
diff --git a/doc/user-guide/source/cli_swift_create_containers.rst b/doc/user-guide/source/cli-swift-create-containers.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_create_containers.rst
rename to doc/user-guide/source/cli-swift-create-containers.rst
diff --git a/doc/user-guide/source/cli_swift_discoverability.rst b/doc/user-guide/source/cli-swift-discoverability.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_discoverability.rst
rename to doc/user-guide/source/cli-swift-discoverability.rst
diff --git a/doc/user-guide/source/cli_swift_env_vars.rst b/doc/user-guide/source/cli-swift-env-vars.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_env_vars.rst
rename to doc/user-guide/source/cli-swift-env-vars.rst
diff --git a/doc/user-guide/source/cli_swift_large_lists.rst b/doc/user-guide/source/cli-swift-large-lists.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_large_lists.rst
rename to doc/user-guide/source/cli-swift-large-lists.rst
diff --git a/doc/user-guide/source/cli_swift_large_object_creation.rst b/doc/user-guide/source/cli-swift-large-object-creation.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_large_object_creation.rst
rename to doc/user-guide/source/cli-swift-large-object-creation.rst
diff --git a/doc/user-guide/source/cli_swift_manage_access_swift.rst b/doc/user-guide/source/cli-swift-manage-access-swift.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_manage_access_swift.rst
rename to doc/user-guide/source/cli-swift-manage-access-swift.rst
diff --git a/doc/user-guide/source/cli_swift_manage_objects.rst b/doc/user-guide/source/cli-swift-manage-objects.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_manage_objects.rst
rename to doc/user-guide/source/cli-swift-manage-objects.rst
diff --git a/doc/user-guide/source/cli_swift_pseudo_hierarchical_folders_directories.rst b/doc/user-guide/source/cli-swift-pseudo-hierarchical-folders-directories.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_pseudo_hierarchical_folders_directories.rst
rename to doc/user-guide/source/cli-swift-pseudo-hierarchical-folders-directories.rst
diff --git a/doc/user-guide/source/cli_swift_serialized_response_formats.rst b/doc/user-guide/source/cli-swift-serialized-response-formats.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_serialized_response_formats.rst
rename to doc/user-guide/source/cli-swift-serialized-response-formats.rst
diff --git a/doc/user-guide/source/cli_swift_set_object_versions.rst b/doc/user-guide/source/cli-swift-set-object-versions.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_set_object_versions.rst
rename to doc/user-guide/source/cli-swift-set-object-versions.rst
diff --git a/doc/user-guide/source/cli_swift_static_website.rst b/doc/user-guide/source/cli-swift-static-website.rst
similarity index 100%
rename from doc/user-guide/source/cli_swift_static_website.rst
rename to doc/user-guide/source/cli-swift-static-website.rst
diff --git a/doc/user-guide/source/cli_use_snapshots_to_migrate_instances.rst b/doc/user-guide/source/cli-use-snapshots-to-migrate-instances.rst
similarity index 100%
rename from doc/user-guide/source/cli_use_snapshots_to_migrate_instances.rst
rename to doc/user-guide/source/cli-use-snapshots-to-migrate-instances.rst
diff --git a/doc/user-guide/source/cli.rst b/doc/user-guide/source/cli.rst
index 7bb0d61fd0..d2bdd1d85b 100644
--- a/doc/user-guide/source/cli.rst
+++ b/doc/user-guide/source/cli.rst
@@ -10,17 +10,17 @@ OpenStack command-line clients
    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
+   cli-manage-images-curl.rst
    common/cli-manage-volumes.rst
-   cli_manage_shares.rst
-   cli_nova_configure_access_security_for_instances.rst
-   cli_launch_instances.rst
-   cli_manage_instances_hosts.rst
-   cli_provide_user_data_to_instances.rst
-   cli_use_snapshots_to_migrate_instances.rst
-   cli_config_drive.rst
-   cli_create_and_manage_networks.rst
+   cli-manage-shares.rst
+   cli-nova-configure-access-security-for-instances.rst
+   cli-launch-instances.rst
+   cli-manage-instances-hosts.rst
+   cli-provide-user-data-to-instances.rst
+   cli-use-snapshots-to-migrate-instances.rst
+   cli-config-drive.rst
+   cli-create-and-manage-networks.rst
    managing-openstack-object-storage-with-swift-cli.rst
-   cli_create_and_manage_stacks.rst
-   cli_ceilometer.rst
+   cli-create-and-manage-stacks.rst
+   cli-ceilometer.rst
    trove-manage-db.rst
diff --git a/doc/user-guide/source/configure_access_and_security_for_instances.rst b/doc/user-guide/source/configure-access-and-security-for-instances.rst
similarity index 100%
rename from doc/user-guide/source/configure_access_and_security_for_instances.rst
rename to doc/user-guide/source/configure-access-and-security-for-instances.rst
diff --git a/doc/user-guide/source/create_db.rst b/doc/user-guide/source/create-db.rst
similarity index 100%
rename from doc/user-guide/source/create_db.rst
rename to doc/user-guide/source/create-db.rst
diff --git a/doc/user-guide/source/dashboard_create_networks.rst b/doc/user-guide/source/dashboard-create-networks.rst
similarity index 100%
rename from doc/user-guide/source/dashboard_create_networks.rst
rename to doc/user-guide/source/dashboard-create-networks.rst
diff --git a/doc/user-guide/source/dashboard_databases.rst b/doc/user-guide/source/dashboard-databases.rst
similarity index 100%
rename from doc/user-guide/source/dashboard_databases.rst
rename to doc/user-guide/source/dashboard-databases.rst
diff --git a/doc/user-guide/source/dashboard_launch_instances.rst b/doc/user-guide/source/dashboard-launch-instances.rst
similarity index 100%
rename from doc/user-guide/source/dashboard_launch_instances.rst
rename to doc/user-guide/source/dashboard-launch-instances.rst
diff --git a/doc/user-guide/source/dashboard_log_in.rst b/doc/user-guide/source/dashboard-log-in.rst
similarity index 100%
rename from doc/user-guide/source/dashboard_log_in.rst
rename to doc/user-guide/source/dashboard-log-in.rst
diff --git a/doc/user-guide/source/dashboard_manage_containers.rst b/doc/user-guide/source/dashboard-manage-containers.rst
similarity index 100%
rename from doc/user-guide/source/dashboard_manage_containers.rst
rename to doc/user-guide/source/dashboard-manage-containers.rst
diff --git a/doc/user-guide/source/dashboard_manage_images.rst b/doc/user-guide/source/dashboard-manage-images.rst
similarity index 100%
rename from doc/user-guide/source/dashboard_manage_images.rst
rename to doc/user-guide/source/dashboard-manage-images.rst
diff --git a/doc/user-guide/source/dashboard_manage_lbaasv2.rst b/doc/user-guide/source/dashboard-manage-lbaasv2.rst
similarity index 100%
rename from doc/user-guide/source/dashboard_manage_lbaasv2.rst
rename to doc/user-guide/source/dashboard-manage-lbaasv2.rst
diff --git a/doc/user-guide/source/dashboard_manage_shares.rst b/doc/user-guide/source/dashboard-manage-shares.rst
similarity index 100%
rename from doc/user-guide/source/dashboard_manage_shares.rst
rename to doc/user-guide/source/dashboard-manage-shares.rst
diff --git a/doc/user-guide/source/dashboard_manage_volumes.rst b/doc/user-guide/source/dashboard-manage-volumes.rst
similarity index 100%
rename from doc/user-guide/source/dashboard_manage_volumes.rst
rename to doc/user-guide/source/dashboard-manage-volumes.rst
diff --git a/doc/user-guide/source/dashboard_stacks.rst b/doc/user-guide/source/dashboard-stacks.rst
similarity index 100%
rename from doc/user-guide/source/dashboard_stacks.rst
rename to doc/user-guide/source/dashboard-stacks.rst
diff --git a/doc/user-guide/source/dashboard.rst b/doc/user-guide/source/dashboard.rst
index d789850400..e6d7c51e8a 100644
--- a/doc/user-guide/source/dashboard.rst
+++ b/doc/user-guide/source/dashboard.rst
@@ -11,15 +11,15 @@ sizes of server instances.
 .. toctree::
    :maxdepth: 2
 
-   dashboard_log_in.rst
-   dashboard_manage_images.rst
-   configure_access_and_security_for_instances.rst
-   dashboard_launch_instances.rst
-   dashboard_create_networks.rst
-   dashboard_manage_containers.rst
-   dashboard_manage_volumes.rst
-   dashboard_manage_shares.rst
-   dashboard_stacks.rst
-   dashboard_databases.rst
-   dashboard_manage_lbaasv2.rst
+   dashboard-log-in.rst
+   dashboard-manage-images.rst
+   configure-access-and-security-for-instances.rst
+   dashboard-launch-instances.rst
+   dashboard-create-networks.rst
+   dashboard-manage-containers.rst
+   dashboard-manage-volumes.rst
+   dashboard-manage-shares.rst
+   dashboard-stacks.rst
+   dashboard-databases.rst
+   dashboard-manage-lbaasv2.rst
 
diff --git a/doc/user-guide/source/index.rst b/doc/user-guide/source/index.rst
index 64190d4b86..e356b76c60 100644
--- a/doc/user-guide/source/index.rst
+++ b/doc/user-guide/source/index.rst
@@ -25,7 +25,7 @@ Contents
    cli.rst
    sdk.rst
    hot.rst
-   cli_cheat_sheet.rst
+   cli-cheat-sheet.rst
 
 Appendix
 ~~~~~~~~
diff --git a/doc/user-guide/source/manage_db_config.rst b/doc/user-guide/source/manage-db-config.rst
similarity index 100%
rename from doc/user-guide/source/manage_db_config.rst
rename to doc/user-guide/source/manage-db-config.rst
diff --git a/doc/user-guide/source/managing-openstack-object-storage-with-swift-cli.rst b/doc/user-guide/source/managing-openstack-object-storage-with-swift-cli.rst
index 84eaf820cd..27d02a63ae 100644
--- a/doc/user-guide/source/managing-openstack-object-storage-with-swift-cli.rst
+++ b/doc/user-guide/source/managing-openstack-object-storage-with-swift-cli.rst
@@ -16,16 +16,16 @@ concurrency of 10.
 .. toctree::
    :maxdepth: 2
 
-   cli_swift_create_containers.rst
-   cli_swift_manage_access_swift.rst
-   cli_swift_manage_objects.rst
-   cli_swift_env_vars.rst
-   cli_swift_set_object_versions.rst
-   cli_swift_serialized_response_formats.rst
-   cli_swift_large_lists.rst
-   cli_swift_pseudo_hierarchical_folders_directories.rst
-   cli_swift_discoverability.rst
-   cli_swift_large_object_creation.rst
-   cli_swift_archive_auto_extract.rst
-   cli_swift_bulk_delete.rst
-   cli_swift_static_website.rst
+   cli-swift-create-containers.rst
+   cli-swift-manage-access-swift.rst
+   cli-swift-manage-objects.rst
+   cli-swift-env-vars.rst
+   cli-swift-set-object-versions.rst
+   cli-swift-serialized-response-formats.rst
+   cli-swift-large-lists.rst
+   cli-swift-pseudo-hierarchical-folders-directories.rst
+   cli-swift-discoverability.rst
+   cli-swift-large-object-creation.rst
+   cli-swift-archive-auto-extract.rst
+   cli-swift-bulk-delete.rst
+   cli-swift-static-website.rst
diff --git a/doc/user-guide/source/sdk_assign_cors_headers.rst b/doc/user-guide/source/sdk-assign-cors-headers.rst
similarity index 100%
rename from doc/user-guide/source/sdk_assign_cors_headers.rst
rename to doc/user-guide/source/sdk-assign-cors-headers.rst
diff --git a/doc/user-guide/source/sdk_authenticate.rst b/doc/user-guide/source/sdk-authenticate.rst
similarity index 100%
rename from doc/user-guide/source/sdk_authenticate.rst
rename to doc/user-guide/source/sdk-authenticate.rst
diff --git a/doc/user-guide/source/sdk_compute_apis.rst b/doc/user-guide/source/sdk-compute-apis.rst
similarity index 100%
rename from doc/user-guide/source/sdk_compute_apis.rst
rename to doc/user-guide/source/sdk-compute-apis.rst
diff --git a/doc/user-guide/source/sdk_configure_access_security_instances.rst b/doc/user-guide/source/sdk-configure-access-security-instances.rst
similarity index 100%
rename from doc/user-guide/source/sdk_configure_access_security_instances.rst
rename to doc/user-guide/source/sdk-configure-access-security-instances.rst
diff --git a/doc/user-guide/source/sdk_create_legacy_novaclient.rst b/doc/user-guide/source/sdk-create-legacy-novaclient.rst
similarity index 100%
rename from doc/user-guide/source/sdk_create_legacy_novaclient.rst
rename to doc/user-guide/source/sdk-create-legacy-novaclient.rst
diff --git a/doc/user-guide/source/sdk_install.rst b/doc/user-guide/source/sdk-install.rst
similarity index 100%
rename from doc/user-guide/source/sdk_install.rst
rename to doc/user-guide/source/sdk-install.rst
diff --git a/doc/user-guide/source/sdk_manage_images.rst b/doc/user-guide/source/sdk-manage-images.rst
similarity index 100%
rename from doc/user-guide/source/sdk_manage_images.rst
rename to doc/user-guide/source/sdk-manage-images.rst
diff --git a/doc/user-guide/source/sdk_neutron_apis.rst b/doc/user-guide/source/sdk-neutron-apis.rst
similarity index 100%
rename from doc/user-guide/source/sdk_neutron_apis.rst
rename to doc/user-guide/source/sdk-neutron-apis.rst
diff --git a/doc/user-guide/source/sdk_overview.rst b/doc/user-guide/source/sdk-overview.rst
similarity index 100%
rename from doc/user-guide/source/sdk_overview.rst
rename to doc/user-guide/source/sdk-overview.rst
diff --git a/doc/user-guide/source/sdk_schedule_objects_for_deletion.rst b/doc/user-guide/source/sdk-schedule-objects-for-deletion.rst
similarity index 100%
rename from doc/user-guide/source/sdk_schedule_objects_for_deletion.rst
rename to doc/user-guide/source/sdk-schedule-objects-for-deletion.rst
diff --git a/doc/user-guide/source/sdk.rst b/doc/user-guide/source/sdk.rst
index 3de4bb13e9..9c5bd6f2c1 100644
--- a/doc/user-guide/source/sdk.rst
+++ b/doc/user-guide/source/sdk.rst
@@ -5,13 +5,13 @@ OpenStack Python SDK
 .. toctree::
    :maxdepth: 2
 
-   sdk_overview.rst
-   sdk_install.rst
-   sdk_authenticate.rst
-   sdk_create_legacy_novaclient.rst
-   sdk_manage_images.rst
-   sdk_assign_cors_headers.rst
-   sdk_schedule_objects_for_deletion.rst
-   sdk_configure_access_security_instances.rst
-   sdk_neutron_apis.rst
-   sdk_compute_apis.rst
+   sdk-overview.rst
+   sdk-install.rst
+   sdk-authenticate.rst
+   sdk-create-legacy-novaclient.rst
+   sdk-manage-images.rst
+   sdk-assign-cors-headers.rst
+   sdk-schedule-objects-for-deletion.rst
+   sdk-configure-access-security-instances.rst
+   sdk-neutron-apis.rst
+   sdk-compute-apis.rst
diff --git a/doc/user-guide/source/set_up_clustering.rst b/doc/user-guide/source/set-up-clustering.rst
similarity index 100%
rename from doc/user-guide/source/set_up_clustering.rst
rename to doc/user-guide/source/set-up-clustering.rst
diff --git a/doc/user-guide/source/set_up_replication.rst b/doc/user-guide/source/set-up-replication.rst
similarity index 100%
rename from doc/user-guide/source/set_up_replication.rst
rename to doc/user-guide/source/set-up-replication.rst
diff --git a/doc/user-guide/source/trove-manage-db.rst b/doc/user-guide/source/trove-manage-db.rst
index ba852fec1c..c9b2b2030a 100644
--- a/doc/user-guide/source/trove-manage-db.rst
+++ b/doc/user-guide/source/trove-manage-db.rst
@@ -10,9 +10,9 @@ handling complex administrative tasks.
 .. toctree::
    :maxdepth: 1
 
-   create_db.rst
-   backup_db.rst
-   backup_db_incremental.rst
-   manage_db_config.rst
-   set_up_replication.rst
-   set_up_clustering.rst
+   create-db.rst
+   backup-db.rst
+   backup-db-incremental.rst
+   manage-db-config.rst
+   set-up-replication.rst
+   set-up-clustering.rst
diff --git a/www/static/.htaccess b/www/static/.htaccess
index 13d1f65133..1f85156d6c 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -293,6 +293,72 @@ redirectmatch 301 ^/([a-z-]+)/ts_non_existent_host.html /$1/ts-non-existent-host
 redirectmatch 301 ^/([a-z-]+)/ts_non_existent_vlun.html /$1/ts-non-existent-vlun.html
 redirectmatch 301 ^/([a-z-]+)/ts_vol_attach_miss_sg_scan.html /$1/ts-vol-attach-miss-sg-scan.html
 
+# Redirect renamed User Guide pages
+
+redirect 301 /user-guide/cli_swift_pseudo_hierarchical_folders_directories.html /user-guide/cli-swift-pseudo-hierarchical-folders-directories.html
+redirect 301 /user-guide/sdk_configure_access_security_instances.html /user-guide/sdk-configure-access-security-instances.html
+redirect 301 /user-guide/cli_create_and_manage_networks.html /user-guide/cli-create-and-manage-networks.html
+redirect 301 /user-guide/cli_stop_and_start_an_instance.html /user-guide/cli-stop-and-start-an-instance.html
+redirect 301 /user-guide/configure_access_and_security_for_instances.html /user-guide/configure-access-and-security-for-instances.html
+redirect 301 /user-guide/dashboard_create_networks.html /user-guide/dashboard-create-networks.html
+redirect 301 /user-guide/sdk_install.html /user-guide/sdk-install.html
+redirect 301 /user-guide/create_db.html /user-guide/create-db.html
+redirect 301 /user-guide/cli_manage_shares.html /user-guide/cli-manage-shares.html
+redirect 301 /user-guide/cli_swift_discoverability.html /user-guide/cli-swift-discoverability.html
+redirect 301 /user-guide/cli_access_instance_through_a_console.html /user-guide/cli-access-instance-through-a-console.html
+redirect 301 /user-guide/cli_search_instance_with_ip_address.html /user-guide/cli-search-instance-with-ip-address.html
+redirect 301 /user-guide/manage_db_config.html /user-guide/manage-db-config.html
+redirect 301 /user-guide/cli_reboot_an_instance.html /user-guide/cli-reboot-an-instance.html
+redirect 301 /user-guide/set_up_replication.html /user-guide/set-up-replication.html
+redirect 301 /user-guide/cli_manage_bare_metal_nodes.html /user-guide/cli-manage-bare-metal-nodes.html
+redirect 301 /user-guide/cli_ceilometer.html /user-guide/cli-ceilometer.html
+redirect 301 /user-guide/cli_nova_launch_instance_from_volume.html /user-guide/cli-nova-launch-instance-from-volume.html
+redirect 301 /user-guide/cli_nova_launch_instance_using_ISO_image.html /user-guide/cli-nova-launch-instance-using-ISO-image.html
+redirect 301 /user-guide/backup_db.html /user-guide/backup-db.html
+redirect 301 /user-guide/cli_nova_launch_instance_from_image.html /user-guide/cli-nova-launch-instance-from-image.html
+redirect 301 /user-guide/dashboard_log_in.html /user-guide/dashboard-log-in.html
+redirect 301 /user-guide/cli_provide_user_data_to_instances.html /user-guide/cli-provide-user-data-to-instances.html
+redirect 301 /user-guide/cli_swift_static_website.html /user-guide/cli-swift-static-website.html
+redirect 301 /user-guide/dashboard_manage_shares.html /user-guide/dashboard-manage-shares.html
+redirect 301 /user-guide/cli_swift_manage_access_swift.html /user-guide/cli-swift-manage-access-swift.html
+redirect 301 /user-guide/cli_swift_large_object_creation.html /user-guide/cli-swift-large-object-creation.html
+redirect 301 /user-guide/cli_cheat_sheet.html /user-guide/cli-cheat-sheet.html
+redirect 301 /user-guide/dashboard_manage_lbaasv2.html /user-guide/dashboard-manage-lbaasv2.html
+redirect 301 /user-guide/sdk_assign_cors_headers.html /user-guide/sdk-assign-cors-headers.html
+redirect 301 /user-guide/cli_swift_bulk_delete.html /user-guide/cli-swift-bulk-delete.html
+redirect 301 /user-guide/cli_nova_configure_access_security_for_instances.html /user-guide/cli-nova-configure-access-security-for-instances.html
+redirect 301 /user-guide/backup_db_incremental.html /user-guide/backup-db-incremental.html
+redirect 301 /user-guide/cli_manage_instances_hosts.html /user-guide/cli-manage-instances-hosts.html
+redirect 301 /user-guide/cli_delete_an_instance.html /user-guide/cli-delete-an-instance.html
+redirect 301 /user-guide/cli_swift_env_vars.html /user-guide/cli-swift-env-vars.html
+redirect 301 /user-guide/cli_swift_create_containers.html /user-guide/cli-swift-create-containers.html
+redirect 301 /user-guide/sdk_neutron_apis.html /user-guide/sdk-neutron-apis.html
+redirect 301 /user-guide/dashboard_manage_images.html /user-guide/dashboard-manage-images.html
+redirect 301 /user-guide/dashboard_stacks.html /user-guide/dashboard-stacks.html
+redirect 301 /user-guide/cli_swift_large_lists.html /user-guide/cli-swift-large-lists.html
+redirect 301 /user-guide/dashboard_databases.html /user-guide/dashboard-databases.html
+redirect 301 /user-guide/cli_swift_archive_auto_extract.html /user-guide/cli-swift-archive-auto-extract.html
+redirect 301 /user-guide/cli_swift_set_object_versions.html /user-guide/cli-swift-set-object-versions.html
+redirect 301 /user-guide/sdk_compute_apis.html /user-guide/sdk-compute-apis.html
+redirect 301 /user-guide/cli_create_and_manage_stacks.html /user-guide/cli-create-and-manage-stacks.html
+redirect 301 /user-guide/cli_change_the_size_of_your_server.html /user-guide/cli-change-the-size-of-your-server.html
+redirect 301 /user-guide/cli_swift_serialized_response_formats.html /user-guide/cli-swift-serialized-response-formats.rhtml
+redirect 301 /user-guide/sdk_authenticate.html /user-guide/sdk-authenticate.html
+redirect 301 /user-guide/cli_use_snapshots_to_migrate_instances.html /user-guide/cli-use-snapshots-to-migrate-instances.html
+redirect 301 /user-guide/sdk_manage_images.html /user-guide/sdk-manage-images.html
+redirect 301 /user-guide/sdk_overview.html /user-guide/sdk-overview.html
+redirect 301 /user-guide/cli_manage_images_curl.html /user-guide/cli-manage-images-curl.html
+redirect 301 /user-guide/cli_config_drive.html /user-guide/cli-config-drive.html
+redirect 301 /user-guide/cli_launch_instances.html /user-guide/cli-launch-instances.html
+redirect 301 /user-guide/cli_manage_ip_addresses.html /user-guide/cli-manage-ip-addresses.html
+redirect 301 /user-guide/set_up_clustering.html /user-guide/set-up-clustering.html
+redirect 301 /user-guide/sdk_create_legacy_novaclient.html /user-guide/sdk-create-legacy-novaclient.html
+redirect 301 /user-guide/sdk_schedule_objects_for_deletion.html /user-guide/sdk-schedule-objects-for-deletion.html
+redirect 301 /user-guide/dashboard_launch_instances.html /user-guide/dashboard-launch-instances.html
+redirect 301 /user-guide/dashboard_manage_containers.html /user-guide/dashboard-manage-containers.html
+redirect 301 /user-guide/cli_swift_manage_objects.html /user-guide/cli-swift-manage-objects.html
+redirect 301 /user-guide/dashboard_manage_volumes.html /user-guide/dashboard-manage-volumes.html
+
 # Since we don't have a direct match for all file, redirect to the index page.
 
 redirectmatch 301 "^/user-guide/content/.*$" /user-guide/index.html