From 9843767b21591571cd505e4c9c7e4a90825b5388 Mon Sep 17 00:00:00 2001
From: Anne Gentle <annegentle@justwriteclick.com>
Date: Fri, 5 Aug 2016 19:52:45 -0500
Subject: [PATCH] [admin-guide] Rename RST files to use hyphen instead of
 underbar

Change-Id: I40999b1eb923fc3796cbb6d982e03d39cdf8c720
Implements: blueprint consistency-file-rename
---
 ...isks.rst => blockstorage-backup-disks.rst} |   0
 ....rst => blockstorage-get-capabilities.rst} |   0
 ...rst => blockstorage-glusterfs-backend.rst} |   0
 ...rst => blockstorage-glusterfs-removal.rst} |   0
 ...st => blockstorage-image-volume-cache.rst} |   0
 .../source/blockstorage-manage-volumes.rst    |  28 ++--
 ...end.rst => blockstorage-multi-backend.rst} |   0
 ...ckend.rst => blockstorage-nfs-backend.rst} |   0
 ...rst => blockstorage-over-subscription.rst} |   0
 ...orage-ratelimit-volume-copy-bandwidth.rst} |   0
 .../source/blockstorage-troubleshoot.rst      |  12 +-
 ...t => blockstorage-volume-backed-image.rst} |   0
 ...kstorage-volume-backups-export-import.rst} |   0
 ...ps.rst => blockstorage-volume-backups.rst} |   0
 ....rst => blockstorage-volume-migration.rst} |   0
 ...=> blockstorage-volume-number-weigher.rst} |   0
 ...t.rst => cli-admin-manage-environment.rst} |  14 +-
 ....rst => cli-admin-manage-ip-addresses.rst} |   0
 ...stacks.rst => cli-admin-manage-stacks.rst} |   0
 ...=> cli-analyzing-log-files-with-swift.rst} |   0
 ...inder_quotas.rst => cli-cinder-quotas.rst} |   0
 ...heduling.rst => cli-cinder-scheduling.rst} |   0
 ...s.rst => cli-keystone-manage-services.rst} |   0
 ...age_flavors.rst => cli-manage-flavors.rst} |   0
 ...> cli-manage-projects-users-and-roles.rst} |   0
 ...e_services.rst => cli-manage-services.rst} |   4 +-
 ...anage_shares.rst => cli-manage-shares.rst} |   0
 ...rst => cli-networking-advanced-quotas.rst} |   0
 ...ova_evacuate.rst => cli-nova-evacuate.rst} |   0
 ... => cli-nova-manage-projects-security.rst} |   0
 ...vices.rst => cli-nova-manage-services.rst} |   0
 ...g_ssh.rst => cli-nova-migrate-cfg-ssh.rst} |   0
 ..._nova_migrate.rst => cli-nova-migrate.rst} |   0
 ..._libvirt.rst => cli-nova-numa-libvirt.rst} |   0
 ...ify_host.rst => cli-nova-specify-host.rst} |   0
 ..._quotas.rst => cli-set-compute-quotas.rst} |   0
 ...{cli_set_quotas.rst => cli-set-quotas.rst} |   6 +-
 doc/admin-guide/source/cli.rst                |  18 +--
 .../{compute_arch.rst => compute-arch.rst}    |   0
 .../source/compute-networking-nova.rst        |   2 +-
 doc/admin-guide/source/compute-node-down.rst  |   2 +-
 doc/admin-guide/source/compute.rst            |   4 +-
 ...roject_cors.rst => cross-project-cors.rst} |   2 +-
 .../{cross_project.rst => cross-project.rst}  |   2 +-
 ...s.rst => dashboard-admin-manage-roles.rst} |   0
 ....rst => dashboard-admin-manage-stacks.rst} |   2 +-
 ...avors.rst => dashboard-manage-flavors.rst} |   0
 ...t => dashboard-manage-host-aggregates.rst} |   0
 ...images.rst => dashboard-manage-images.rst} |   0
 ...ces.rst => dashboard-manage-instances.rst} |   0
 ...ces.rst => dashboard-manage-resources.rst} |   4 +-
 ...ices.rst => dashboard-manage-services.rst} |   0
 ...shares.rst => dashboard-manage-shares.rst} |   0
 ...lumes.rst => dashboard-manage-volumes.rst} |   0
 ...rd_sessions.rst => dashboard-sessions.rst} |   0
 ...et_quotas.rst => dashboard-set-quotas.rst} |   4 +-
 ...rst => dashboard-view-cloud-resources.rst} |   0
 doc/admin-guide/source/dashboard.rst          |  22 +--
 ...rst => identity-auth-token-middleware.rst} |   0
 ...ity_concepts.rst => identity-concepts.rst} |   2 +-
 ... identity-keystone-usage-and-features.rst} |   0
 .../source/identity-management.rst            |  32 +++++
 ...st => identity-service-api-protection.rst} |   0
 ...{identity_start.rst => identity-start.rst} |   0
 ...bleshoot.rst => identity-troubleshoot.rst} |   0
 .../source/identity_management.rst            |  32 -----
 doc/admin-guide/source/index.rst              |   6 +-
 ...g_layer.rst => keystone-caching-layer.rst} |   0
 ....rst => keystone-certificates-for-pki.rst} |   0
 ...SL.rst => keystone-configure-with-SSL.rst} |   0
 ...st => keystone-domain-specific-config.rst} |   0
 ...t => keystone-external-authentication.rst} |   0
 ..._faq.rst => keystone-fernet-token-faq.rst} |   0
 ...one-integrate-assignment-backend-ldap.rst} |   0
 ...stone-integrate-identity-backend-ldap.rst} |   0
 ...p.rst => keystone-integrate-with-ldap.rst} |   6 +-
 ...stone-secure-identity-to-ldap-backend.rst} |   0
 ...binding.rst => keystone-token-binding.rst} |   0
 ...eystone_tokens.rst => keystone-tokens.rst} |   4 +-
 ...use_trusts.rst => keystone-use-trusts.rst} |   0
 ...v-config.rst => networking-adv-config.rst} |   0
 ...atures.rst => networking-adv-features.rst} |   0
 ...> networking-adv-operational-features.rst} |   0
 ...etworking_arch.rst => networking-arch.rst} |   0
 ...etworking_auth.rst => networking-auth.rst} |   0
 ...gents.rst => networking-config-agents.rst} |   0
 ...ity.rst => networking-config-identity.rst} |   0
 ...gins.rst => networking-config-plugins.rst} |   0
 ...uction.rst => networking-introduction.rst} |   0
 ...s.rst => networking-multi-dhcp-agents.rst} |   0
 ...{networking_use.rst => networking-use.rst} |   0
 doc/admin-guide/source/networking.rst         |  22 +--
 ...ectstorage_EC.rst => objectstorage-EC.rst} |   0
 ...r.rst => objectstorage-account-reaper.rst} |   0
 ...torage_arch.rst => objectstorage-arch.rst} |   0
 ...uditors.rst => objectstorage-auditors.rst} |   0
 ....rst => objectstorage-characteristics.rst} |   0
 ...nents.rst => objectstorage-components.rst} |   0
 ...eatures.rst => objectstorage-features.rst} |   0
 ...rage_intro.rst => objectstorage-intro.rst} |   0
 ...ts.rst => objectstorage-large-objects.rst} |   0
 ...tion.rst => objectstorage-replication.rst} |   0
 ...lder.rst => objectstorage-ringbuilder.rst} |   0
 ...storage-tenant-specific-image-storage.rst} |   0
 doc/admin-guide/source/objectstorage.rst      |  24 ++--
 .../source/orchestration-auth-model.rst       |   3 +-
 .../orchestration-stack-domain-users.rst      |   4 +-
 ...ps.rst => shared-file-systems-cgroups.rst} |   4 +-
 ...rst => shared-file-systems-crud-share.rst} |   0
 ...ntro.rst => shared-file-systems-intro.rst} |   0
 ...t => shared-file-systems-key-concepts.rst} |   0
 ...ile-systems-manage-and-unmanage-share.rst} |   0
 ...shared-file-systems-manage-shares-cli.rst} |   0
 ... => shared-file-systems-multi-backend.rst} |   4 +-
 ...> shared-file-systems-network-plugins.rst} |   0
 ...rst => shared-file-systems-networking.rst} |   4 +-
 ...tas.rst => shared-file-systems-quotas.rst} |   0
 ...rst => shared-file-systems-scheduling.rst} |   0
 ...shared-file-systems-security-services.rst} |   0
 ...> shared-file-systems-services-manage.rst} |   0
 ... shared-file-systems-share-management.rst} |   8 +-
 ...=> shared-file-systems-share-networks.rst} |   0
 ...shared-file-systems-share-replication.rst} |   0
 ...t => shared-file-systems-share-resize.rst} |   0
 ...st => shared-file-systems-share-types.rst} |   0
 ....rst => shared-file-systems-snapshots.rst} |   0
 ...t => shared-file-systems-troubleshoot.rst} |   0
 ...le_systems.rst => shared-file-systems.rst} |  26 ++--
 ...cinder_config.rst => ts-cinder-config.rst} |   0
 ...ltipath_warn.rst => ts-multipath-warn.rst} |   0
 ...r_x86_64.rst => ts-no-emulator-x86-64.rst} |   0
 ...tent_host.rst => ts-non-existent-host.rst} |   0
 ...tent_vlun.rst => ts-non-existent-vlun.rst} |   0
 ...can.rst => ts-vol-attach-miss-sg-scan.rst} |   0
 www/static/.htaccess                          | 125 +++++++++++++++++-
 135 files changed, 277 insertions(+), 155 deletions(-)
 rename doc/admin-guide/source/{blockstorage_backup_disks.rst => blockstorage-backup-disks.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_get_capabilities.rst => blockstorage-get-capabilities.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_glusterfs_backend.rst => blockstorage-glusterfs-backend.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_glusterfs_removal.rst => blockstorage-glusterfs-removal.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_image_volume_cache.rst => blockstorage-image-volume-cache.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_multi_backend.rst => blockstorage-multi-backend.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_nfs_backend.rst => blockstorage-nfs-backend.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_over_subscription.rst => blockstorage-over-subscription.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_ratelimit_volume_copy_bandwidth.rst => blockstorage-ratelimit-volume-copy-bandwidth.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_volume_backed_image.rst => blockstorage-volume-backed-image.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_volume_backups_export_import.rst => blockstorage-volume-backups-export-import.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_volume_backups.rst => blockstorage-volume-backups.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_volume_migration.rst => blockstorage-volume-migration.rst} (100%)
 rename doc/admin-guide/source/{blockstorage_volume_number_weigher.rst => blockstorage-volume-number-weigher.rst} (100%)
 rename doc/admin-guide/source/{cli_admin_manage_environment.rst => cli-admin-manage-environment.rst} (55%)
 rename doc/admin-guide/source/{cli_admin_manage_ip_addresses.rst => cli-admin-manage-ip-addresses.rst} (100%)
 rename doc/admin-guide/source/{cli_admin_manage_stacks.rst => cli-admin-manage-stacks.rst} (100%)
 rename doc/admin-guide/source/{cli_analyzing-log-files-with-swift.rst => cli-analyzing-log-files-with-swift.rst} (100%)
 rename doc/admin-guide/source/{cli_cinder_quotas.rst => cli-cinder-quotas.rst} (100%)
 rename doc/admin-guide/source/{cli_cinder_scheduling.rst => cli-cinder-scheduling.rst} (100%)
 rename doc/admin-guide/source/{cli_keystone_manage_services.rst => cli-keystone-manage-services.rst} (100%)
 rename doc/admin-guide/source/{cli_manage_flavors.rst => cli-manage-flavors.rst} (100%)
 rename doc/admin-guide/source/{cli_manage_projects_users_and_roles.rst => cli-manage-projects-users-and-roles.rst} (100%)
 rename doc/admin-guide/source/{cli_manage_services.rst => cli-manage-services.rst} (53%)
 rename doc/admin-guide/source/{cli_manage_shares.rst => cli-manage-shares.rst} (100%)
 rename doc/admin-guide/source/{cli_networking_advanced_quotas.rst => cli-networking-advanced-quotas.rst} (100%)
 rename doc/admin-guide/source/{cli_nova_evacuate.rst => cli-nova-evacuate.rst} (100%)
 rename doc/admin-guide/source/{cli_nova_manage_projects_security.rst => cli-nova-manage-projects-security.rst} (100%)
 rename doc/admin-guide/source/{cli_nova_manage_services.rst => cli-nova-manage-services.rst} (100%)
 rename doc/admin-guide/source/{cli_nova_migrate_cfg_ssh.rst => cli-nova-migrate-cfg-ssh.rst} (100%)
 rename doc/admin-guide/source/{cli_nova_migrate.rst => cli-nova-migrate.rst} (100%)
 rename doc/admin-guide/source/{cli_nova_numa_libvirt.rst => cli-nova-numa-libvirt.rst} (100%)
 rename doc/admin-guide/source/{cli_nova_specify_host.rst => cli-nova-specify-host.rst} (100%)
 rename doc/admin-guide/source/{cli_set_compute_quotas.rst => cli-set-compute-quotas.rst} (100%)
 rename doc/admin-guide/source/{cli_set_quotas.rst => cli-set-quotas.rst} (95%)
 rename doc/admin-guide/source/{compute_arch.rst => compute-arch.rst} (100%)
 rename doc/admin-guide/source/{cross_project_cors.rst => cross-project-cors.rst} (99%)
 rename doc/admin-guide/source/{cross_project.rst => cross-project.rst} (93%)
 rename doc/admin-guide/source/{dashboard_admin_manage_roles.rst => dashboard-admin-manage-roles.rst} (100%)
 rename doc/admin-guide/source/{dashboard_admin_manage_stacks.rst => dashboard-admin-manage-stacks.rst} (94%)
 rename doc/admin-guide/source/{dashboard_manage_flavors.rst => dashboard-manage-flavors.rst} (100%)
 rename doc/admin-guide/source/{dashboard_manage_host_aggregates.rst => dashboard-manage-host-aggregates.rst} (100%)
 rename doc/admin-guide/source/{dashboard_manage_images.rst => dashboard-manage-images.rst} (100%)
 rename doc/admin-guide/source/{dashboard_manage_instances.rst => dashboard-manage-instances.rst} (100%)
 rename doc/admin-guide/source/{dashboard_manage_resources.rst => dashboard-manage-resources.rst} (57%)
 rename doc/admin-guide/source/{dashboard_manage_services.rst => dashboard-manage-services.rst} (100%)
 rename doc/admin-guide/source/{dashboard_manage_shares.rst => dashboard-manage-shares.rst} (100%)
 rename doc/admin-guide/source/{dashboard_manage_volumes.rst => dashboard-manage-volumes.rst} (100%)
 rename doc/admin-guide/source/{dashboard_sessions.rst => dashboard-sessions.rst} (100%)
 rename doc/admin-guide/source/{dashboard_set_quotas.rst => dashboard-set-quotas.rst} (97%)
 rename doc/admin-guide/source/{dashboard_view_cloud_resources.rst => dashboard-view-cloud-resources.rst} (100%)
 rename doc/admin-guide/source/{identity_auth_token_middleware.rst => identity-auth-token-middleware.rst} (100%)
 rename doc/admin-guide/source/{identity_concepts.rst => identity-concepts.rst} (99%)
 rename doc/admin-guide/source/{identity_keystone_usage_and_features.rst => identity-keystone-usage-and-features.rst} (100%)
 create mode 100644 doc/admin-guide/source/identity-management.rst
 rename doc/admin-guide/source/{identity_service_api_protection.rst => identity-service-api-protection.rst} (100%)
 rename doc/admin-guide/source/{identity_start.rst => identity-start.rst} (100%)
 rename doc/admin-guide/source/{identity_troubleshoot.rst => identity-troubleshoot.rst} (100%)
 delete mode 100644 doc/admin-guide/source/identity_management.rst
 rename doc/admin-guide/source/{keystone_caching_layer.rst => keystone-caching-layer.rst} (100%)
 rename doc/admin-guide/source/{keystone_certificates_for_pki.rst => keystone-certificates-for-pki.rst} (100%)
 rename doc/admin-guide/source/{keystone_configure_with_SSL.rst => keystone-configure-with-SSL.rst} (100%)
 rename doc/admin-guide/source/{keystone_domain_specific_config.rst => keystone-domain-specific-config.rst} (100%)
 rename doc/admin-guide/source/{keystone_external_authentication.rst => keystone-external-authentication.rst} (100%)
 rename doc/admin-guide/source/{keystone_fernet_token_faq.rst => keystone-fernet-token-faq.rst} (100%)
 rename doc/admin-guide/source/{keystone_integrate_assignment_backend_ldap.rst => keystone-integrate-assignment-backend-ldap.rst} (100%)
 rename doc/admin-guide/source/{keystone_integrate_identity_backend_ldap.rst => keystone-integrate-identity-backend-ldap.rst} (100%)
 rename doc/admin-guide/source/{keystone_integrate_with_ldap.rst => keystone-integrate-with-ldap.rst} (97%)
 rename doc/admin-guide/source/{keystone_secure_identity_to_ldap_backend.rst => keystone-secure-identity-to-ldap-backend.rst} (100%)
 rename doc/admin-guide/source/{keystone_token-binding.rst => keystone-token-binding.rst} (100%)
 rename doc/admin-guide/source/{keystone_tokens.rst => keystone-tokens.rst} (97%)
 rename doc/admin-guide/source/{keystone_use_trusts.rst => keystone-use-trusts.rst} (100%)
 rename doc/admin-guide/source/{networking_adv-config.rst => networking-adv-config.rst} (100%)
 rename doc/admin-guide/source/{networking_adv-features.rst => networking-adv-features.rst} (100%)
 rename doc/admin-guide/source/{networking_adv-operational-features.rst => networking-adv-operational-features.rst} (100%)
 rename doc/admin-guide/source/{networking_arch.rst => networking-arch.rst} (100%)
 rename doc/admin-guide/source/{networking_auth.rst => networking-auth.rst} (100%)
 rename doc/admin-guide/source/{networking_config-agents.rst => networking-config-agents.rst} (100%)
 rename doc/admin-guide/source/{networking_config-identity.rst => networking-config-identity.rst} (100%)
 rename doc/admin-guide/source/{networking_config-plugins.rst => networking-config-plugins.rst} (100%)
 rename doc/admin-guide/source/{networking_introduction.rst => networking-introduction.rst} (100%)
 rename doc/admin-guide/source/{networking_multi-dhcp-agents.rst => networking-multi-dhcp-agents.rst} (100%)
 rename doc/admin-guide/source/{networking_use.rst => networking-use.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_EC.rst => objectstorage-EC.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_account_reaper.rst => objectstorage-account-reaper.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_arch.rst => objectstorage-arch.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_auditors.rst => objectstorage-auditors.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_characteristics.rst => objectstorage-characteristics.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_components.rst => objectstorage-components.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_features.rst => objectstorage-features.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_intro.rst => objectstorage-intro.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_large-objects.rst => objectstorage-large-objects.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_replication.rst => objectstorage-replication.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_ringbuilder.rst => objectstorage-ringbuilder.rst} (100%)
 rename doc/admin-guide/source/{objectstorage_tenant_specific_image_storage.rst => objectstorage-tenant-specific-image-storage.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_cgroups.rst => shared-file-systems-cgroups.rst} (99%)
 rename doc/admin-guide/source/{shared_file_systems_crud_share.rst => shared-file-systems-crud-share.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_intro.rst => shared-file-systems-intro.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_key_concepts.rst => shared-file-systems-key-concepts.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_manage_and_unmanage_share.rst => shared-file-systems-manage-and-unmanage-share.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_manage_shares_cli.rst => shared-file-systems-manage-shares-cli.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_multi_backend.rst => shared-file-systems-multi-backend.rst} (96%)
 rename doc/admin-guide/source/{shared_file_systems_network_plugins.rst => shared-file-systems-network-plugins.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_networking.rst => shared-file-systems-networking.rst} (85%)
 rename doc/admin-guide/source/{shared_file_systems_quotas.rst => shared-file-systems-quotas.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_scheduling.rst => shared-file-systems-scheduling.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_security_services.rst => shared-file-systems-security-services.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_services_manage.rst => shared-file-systems-services-manage.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_share_management.rst => shared-file-systems-share-management.rst} (86%)
 rename doc/admin-guide/source/{shared_file_systems_share_networks.rst => shared-file-systems-share-networks.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_share_replication.rst => shared-file-systems-share-replication.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_share_resize.rst => shared-file-systems-share-resize.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_share_types.rst => shared-file-systems-share-types.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_snapshots.rst => shared-file-systems-snapshots.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems_troubleshoot.rst => shared-file-systems-troubleshoot.rst} (100%)
 rename doc/admin-guide/source/{shared_file_systems.rst => shared-file-systems.rst} (55%)
 rename doc/admin-guide/source/{ts_cinder_config.rst => ts-cinder-config.rst} (100%)
 rename doc/admin-guide/source/{ts_multipath_warn.rst => ts-multipath-warn.rst} (100%)
 rename doc/admin-guide/source/{ts_no_emulator_x86_64.rst => ts-no-emulator-x86-64.rst} (100%)
 rename doc/admin-guide/source/{ts_non_existent_host.rst => ts-non-existent-host.rst} (100%)
 rename doc/admin-guide/source/{ts_non_existent_vlun.rst => ts-non-existent-vlun.rst} (100%)
 rename doc/admin-guide/source/{ts_vol_attach_miss_sg_scan.rst => ts-vol-attach-miss-sg-scan.rst} (100%)

diff --git a/doc/admin-guide/source/blockstorage_backup_disks.rst b/doc/admin-guide/source/blockstorage-backup-disks.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_backup_disks.rst
rename to doc/admin-guide/source/blockstorage-backup-disks.rst
diff --git a/doc/admin-guide/source/blockstorage_get_capabilities.rst b/doc/admin-guide/source/blockstorage-get-capabilities.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_get_capabilities.rst
rename to doc/admin-guide/source/blockstorage-get-capabilities.rst
diff --git a/doc/admin-guide/source/blockstorage_glusterfs_backend.rst b/doc/admin-guide/source/blockstorage-glusterfs-backend.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_glusterfs_backend.rst
rename to doc/admin-guide/source/blockstorage-glusterfs-backend.rst
diff --git a/doc/admin-guide/source/blockstorage_glusterfs_removal.rst b/doc/admin-guide/source/blockstorage-glusterfs-removal.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_glusterfs_removal.rst
rename to doc/admin-guide/source/blockstorage-glusterfs-removal.rst
diff --git a/doc/admin-guide/source/blockstorage_image_volume_cache.rst b/doc/admin-guide/source/blockstorage-image-volume-cache.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_image_volume_cache.rst
rename to doc/admin-guide/source/blockstorage-image-volume-cache.rst
diff --git a/doc/admin-guide/source/blockstorage-manage-volumes.rst b/doc/admin-guide/source/blockstorage-manage-volumes.rst
index ce016833ea..249a031599 100644
--- a/doc/admin-guide/source/blockstorage-manage-volumes.rst
+++ b/doc/admin-guide/source/blockstorage-manage-volumes.rst
@@ -56,20 +56,20 @@ troubleshoot your installation and back up your Compute volumes.
 .. toctree::
 
    blockstorage-boot-from-volume.rst
-   blockstorage_nfs_backend.rst
-   blockstorage_glusterfs_backend.rst
-   blockstorage_multi_backend.rst
-   blockstorage_backup_disks.rst
-   blockstorage_volume_migration.rst
-   blockstorage_glusterfs_removal.rst
-   blockstorage_volume_backups.rst
-   blockstorage_volume_backups_export_import.rst
+   blockstorage-nfs-backend.rst
+   blockstorage-glusterfs-backend.rst
+   blockstorage-multi-backend.rst
+   blockstorage-backup-disks.rst
+   blockstorage-volume-migration.rst
+   blockstorage-glusterfs-removal.rst
+   blockstorage-volume-backups.rst
+   blockstorage-volume-backups-export-import.rst
    blockstorage-lio-iscsi-support.rst
-   blockstorage_volume_number_weigher.rst
+   blockstorage-volume-number-weigher.rst
    blockstorage-consistency-groups.rst
    blockstorage-driver-filter-weighing.rst
-   blockstorage_ratelimit_volume_copy_bandwidth.rst
-   blockstorage_over_subscription.rst
-   blockstorage_image_volume_cache.rst
-   blockstorage_volume_backed_image.rst
-   blockstorage_get_capabilities.rst
+   blockstorage-ratelimit-volume-copy-bandwidth.rst
+   blockstorage-over-subscription.rst
+   blockstorage-image-volume-cache.rst
+   blockstorage-volume-backed-image.rst
+   blockstorage-get-capabilities.rst
diff --git a/doc/admin-guide/source/blockstorage_multi_backend.rst b/doc/admin-guide/source/blockstorage-multi-backend.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_multi_backend.rst
rename to doc/admin-guide/source/blockstorage-multi-backend.rst
diff --git a/doc/admin-guide/source/blockstorage_nfs_backend.rst b/doc/admin-guide/source/blockstorage-nfs-backend.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_nfs_backend.rst
rename to doc/admin-guide/source/blockstorage-nfs-backend.rst
diff --git a/doc/admin-guide/source/blockstorage_over_subscription.rst b/doc/admin-guide/source/blockstorage-over-subscription.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_over_subscription.rst
rename to doc/admin-guide/source/blockstorage-over-subscription.rst
diff --git a/doc/admin-guide/source/blockstorage_ratelimit_volume_copy_bandwidth.rst b/doc/admin-guide/source/blockstorage-ratelimit-volume-copy-bandwidth.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_ratelimit_volume_copy_bandwidth.rst
rename to doc/admin-guide/source/blockstorage-ratelimit-volume-copy-bandwidth.rst
diff --git a/doc/admin-guide/source/blockstorage-troubleshoot.rst b/doc/admin-guide/source/blockstorage-troubleshoot.rst
index da82de5edd..b16e055bb7 100644
--- a/doc/admin-guide/source/blockstorage-troubleshoot.rst
+++ b/doc/admin-guide/source/blockstorage-troubleshoot.rst
@@ -8,15 +8,15 @@ Storage installation.
 .. toctree::
    :maxdepth: 1
 
-   ts_cinder_config.rst
-   ts_multipath_warn.rst
+   ts-cinder-config.rst
+   ts-multipath-warn.rst
    ts-eql-volume-size.rst
-   ts_vol_attach_miss_sg_scan.rst
+   ts-vol-attach-miss-sg-scan.rst
    ts-HTTP-bad-req-in-cinder-vol-log.rst
    ts-duplicate-3par-host.rst
    ts-failed-attach-vol-after-detach.rst
    ts-failed-attach-vol-no-sysfsutils.rst
    ts-failed-connect-vol-FC-SAN.rst
-   ts_no_emulator_x86_64.rst
-   ts_non_existent_host.rst
-   ts_non_existent_vlun.rst
+   ts-no-emulator-x86-64.rst
+   ts-non-existent-host.rst
+   ts-non-existent-vlun.rst
diff --git a/doc/admin-guide/source/blockstorage_volume_backed_image.rst b/doc/admin-guide/source/blockstorage-volume-backed-image.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_volume_backed_image.rst
rename to doc/admin-guide/source/blockstorage-volume-backed-image.rst
diff --git a/doc/admin-guide/source/blockstorage_volume_backups_export_import.rst b/doc/admin-guide/source/blockstorage-volume-backups-export-import.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_volume_backups_export_import.rst
rename to doc/admin-guide/source/blockstorage-volume-backups-export-import.rst
diff --git a/doc/admin-guide/source/blockstorage_volume_backups.rst b/doc/admin-guide/source/blockstorage-volume-backups.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_volume_backups.rst
rename to doc/admin-guide/source/blockstorage-volume-backups.rst
diff --git a/doc/admin-guide/source/blockstorage_volume_migration.rst b/doc/admin-guide/source/blockstorage-volume-migration.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_volume_migration.rst
rename to doc/admin-guide/source/blockstorage-volume-migration.rst
diff --git a/doc/admin-guide/source/blockstorage_volume_number_weigher.rst b/doc/admin-guide/source/blockstorage-volume-number-weigher.rst
similarity index 100%
rename from doc/admin-guide/source/blockstorage_volume_number_weigher.rst
rename to doc/admin-guide/source/blockstorage-volume-number-weigher.rst
diff --git a/doc/admin-guide/source/cli_admin_manage_environment.rst b/doc/admin-guide/source/cli-admin-manage-environment.rst
similarity index 55%
rename from doc/admin-guide/source/cli_admin_manage_environment.rst
rename to doc/admin-guide/source/cli-admin-manage-environment.rst
index 047176b29a..83c75a2530 100644
--- a/doc/admin-guide/source/cli_admin_manage_environment.rst
+++ b/doc/admin-guide/source/cli-admin-manage-environment.rst
@@ -7,11 +7,11 @@ This section includes tasks specific to the OpenStack environment.
 .. toctree::
    :maxdepth: 2
 
-   cli_nova_specify_host.rst
-   cli_nova_numa_libvirt.rst
-   cli_nova_evacuate.rst
-   cli_nova_migrate.rst
-   cli_nova_migrate_cfg_ssh.rst
-   cli_admin_manage_ip_addresses.rst
-   cli_admin_manage_stacks.rst
+   cli-nova-specify-host.rst
+   cli-nova-numa-libvirt.rst
+   cli-nova-evacuate.rst
+   cli-nova-migrate.rst
+   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
diff --git a/doc/admin-guide/source/cli_admin_manage_ip_addresses.rst b/doc/admin-guide/source/cli-admin-manage-ip-addresses.rst
similarity index 100%
rename from doc/admin-guide/source/cli_admin_manage_ip_addresses.rst
rename to doc/admin-guide/source/cli-admin-manage-ip-addresses.rst
diff --git a/doc/admin-guide/source/cli_admin_manage_stacks.rst b/doc/admin-guide/source/cli-admin-manage-stacks.rst
similarity index 100%
rename from doc/admin-guide/source/cli_admin_manage_stacks.rst
rename to doc/admin-guide/source/cli-admin-manage-stacks.rst
diff --git a/doc/admin-guide/source/cli_analyzing-log-files-with-swift.rst b/doc/admin-guide/source/cli-analyzing-log-files-with-swift.rst
similarity index 100%
rename from doc/admin-guide/source/cli_analyzing-log-files-with-swift.rst
rename to doc/admin-guide/source/cli-analyzing-log-files-with-swift.rst
diff --git a/doc/admin-guide/source/cli_cinder_quotas.rst b/doc/admin-guide/source/cli-cinder-quotas.rst
similarity index 100%
rename from doc/admin-guide/source/cli_cinder_quotas.rst
rename to doc/admin-guide/source/cli-cinder-quotas.rst
diff --git a/doc/admin-guide/source/cli_cinder_scheduling.rst b/doc/admin-guide/source/cli-cinder-scheduling.rst
similarity index 100%
rename from doc/admin-guide/source/cli_cinder_scheduling.rst
rename to doc/admin-guide/source/cli-cinder-scheduling.rst
diff --git a/doc/admin-guide/source/cli_keystone_manage_services.rst b/doc/admin-guide/source/cli-keystone-manage-services.rst
similarity index 100%
rename from doc/admin-guide/source/cli_keystone_manage_services.rst
rename to doc/admin-guide/source/cli-keystone-manage-services.rst
diff --git a/doc/admin-guide/source/cli_manage_flavors.rst b/doc/admin-guide/source/cli-manage-flavors.rst
similarity index 100%
rename from doc/admin-guide/source/cli_manage_flavors.rst
rename to doc/admin-guide/source/cli-manage-flavors.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
similarity index 100%
rename from doc/admin-guide/source/cli_manage_projects_users_and_roles.rst
rename to doc/admin-guide/source/cli-manage-projects-users-and-roles.rst
diff --git a/doc/admin-guide/source/cli_manage_services.rst b/doc/admin-guide/source/cli-manage-services.rst
similarity index 53%
rename from doc/admin-guide/source/cli_manage_services.rst
rename to doc/admin-guide/source/cli-manage-services.rst
index fba5b48ea2..c2511fcc06 100644
--- a/doc/admin-guide/source/cli_manage_services.rst
+++ b/doc/admin-guide/source/cli-manage-services.rst
@@ -5,5 +5,5 @@ Manage services
 .. toctree::
    :maxdepth: 2
 
-   cli_keystone_manage_services.rst
-   cli_nova_manage_services.rst
+   cli-keystone-manage-services.rst
+   cli-nova-manage-services.rst
diff --git a/doc/admin-guide/source/cli_manage_shares.rst b/doc/admin-guide/source/cli-manage-shares.rst
similarity index 100%
rename from doc/admin-guide/source/cli_manage_shares.rst
rename to doc/admin-guide/source/cli-manage-shares.rst
diff --git a/doc/admin-guide/source/cli_networking_advanced_quotas.rst b/doc/admin-guide/source/cli-networking-advanced-quotas.rst
similarity index 100%
rename from doc/admin-guide/source/cli_networking_advanced_quotas.rst
rename to doc/admin-guide/source/cli-networking-advanced-quotas.rst
diff --git a/doc/admin-guide/source/cli_nova_evacuate.rst b/doc/admin-guide/source/cli-nova-evacuate.rst
similarity index 100%
rename from doc/admin-guide/source/cli_nova_evacuate.rst
rename to doc/admin-guide/source/cli-nova-evacuate.rst
diff --git a/doc/admin-guide/source/cli_nova_manage_projects_security.rst b/doc/admin-guide/source/cli-nova-manage-projects-security.rst
similarity index 100%
rename from doc/admin-guide/source/cli_nova_manage_projects_security.rst
rename to doc/admin-guide/source/cli-nova-manage-projects-security.rst
diff --git a/doc/admin-guide/source/cli_nova_manage_services.rst b/doc/admin-guide/source/cli-nova-manage-services.rst
similarity index 100%
rename from doc/admin-guide/source/cli_nova_manage_services.rst
rename to doc/admin-guide/source/cli-nova-manage-services.rst
diff --git a/doc/admin-guide/source/cli_nova_migrate_cfg_ssh.rst b/doc/admin-guide/source/cli-nova-migrate-cfg-ssh.rst
similarity index 100%
rename from doc/admin-guide/source/cli_nova_migrate_cfg_ssh.rst
rename to doc/admin-guide/source/cli-nova-migrate-cfg-ssh.rst
diff --git a/doc/admin-guide/source/cli_nova_migrate.rst b/doc/admin-guide/source/cli-nova-migrate.rst
similarity index 100%
rename from doc/admin-guide/source/cli_nova_migrate.rst
rename to doc/admin-guide/source/cli-nova-migrate.rst
diff --git a/doc/admin-guide/source/cli_nova_numa_libvirt.rst b/doc/admin-guide/source/cli-nova-numa-libvirt.rst
similarity index 100%
rename from doc/admin-guide/source/cli_nova_numa_libvirt.rst
rename to doc/admin-guide/source/cli-nova-numa-libvirt.rst
diff --git a/doc/admin-guide/source/cli_nova_specify_host.rst b/doc/admin-guide/source/cli-nova-specify-host.rst
similarity index 100%
rename from doc/admin-guide/source/cli_nova_specify_host.rst
rename to doc/admin-guide/source/cli-nova-specify-host.rst
diff --git a/doc/admin-guide/source/cli_set_compute_quotas.rst b/doc/admin-guide/source/cli-set-compute-quotas.rst
similarity index 100%
rename from doc/admin-guide/source/cli_set_compute_quotas.rst
rename to doc/admin-guide/source/cli-set-compute-quotas.rst
diff --git a/doc/admin-guide/source/cli_set_quotas.rst b/doc/admin-guide/source/cli-set-quotas.rst
similarity index 95%
rename from doc/admin-guide/source/cli_set_quotas.rst
rename to doc/admin-guide/source/cli-set-quotas.rst
index 9237214e53..3d3f4f9da0 100644
--- a/doc/admin-guide/source/cli_set_quotas.rst
+++ b/doc/admin-guide/source/cli-set-quotas.rst
@@ -56,6 +56,6 @@ values.
 .. toctree::
    :maxdepth: 2
 
-   cli_set_compute_quotas.rst
-   cli_cinder_quotas.rst
-   cli_networking_advanced_quotas.rst
+   cli-set-compute-quotas.rst
+   cli-cinder-quotas.rst
+   cli-networking-advanced-quotas.rst
diff --git a/doc/admin-guide/source/cli.rst b/doc/admin-guide/source/cli.rst
index d797453190..69f576ea93 100644
--- a/doc/admin-guide/source/cli.rst
+++ b/doc/admin-guide/source/cli.rst
@@ -9,14 +9,14 @@ OpenStack command-line clients
    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
+   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
-   cli_manage_shares.rst
-   cli_manage_flavors.rst
-   cli_admin_manage_environment.rst
-   cli_set_quotas.rst
-   cli_analyzing-log-files-with-swift.rst
-   cli_cinder_scheduling.rst
+   cli-manage-shares.rst
+   cli-manage-flavors.rst
+   cli-admin-manage-environment.rst
+   cli-set-quotas.rst
+   cli-analyzing-log-files-with-swift.rst
+   cli-cinder-scheduling.rst
diff --git a/doc/admin-guide/source/compute_arch.rst b/doc/admin-guide/source/compute-arch.rst
similarity index 100%
rename from doc/admin-guide/source/compute_arch.rst
rename to doc/admin-guide/source/compute-arch.rst
diff --git a/doc/admin-guide/source/compute-networking-nova.rst b/doc/admin-guide/source/compute-networking-nova.rst
index ad93fa98bf..c95cd26ddb 100644
--- a/doc/admin-guide/source/compute-networking-nova.rst
+++ b/doc/admin-guide/source/compute-networking-nova.rst
@@ -719,7 +719,7 @@ to perform floating IP operations:
 
 For more information about how administrators can associate floating IPs
 with instances, see `Manage IP
-addresses <http://docs.openstack.org/admin-guide/cli_admin_manage_ip_addresses.html>`__
+addresses <http://docs.openstack.org/admin-guide/cli-admin-manage-ip-addresses.html>`__
 in the OpenStack Administrator Guide.
 
 Automatically add floating IPs
diff --git a/doc/admin-guide/source/compute-node-down.rst b/doc/admin-guide/source/compute-node-down.rst
index 1a441c18aa..d58c50d33a 100644
--- a/doc/admin-guide/source/compute-node-down.rst
+++ b/doc/admin-guide/source/compute-node-down.rst
@@ -13,7 +13,7 @@ Evacuate instances
 
 If a hardware malfunction or other error causes the cloud compute node to
 fail, you can use the :command:`nova evacuate` command to evacuate instances.
-See the `OpenStack Administrator Guide <http://docs.openstack.org/admin-guide/cli_nova_evacuate.html>`__.
+See the `OpenStack Administrator Guide <http://docs.openstack.org/admin-guide/cli-nova-evacuate.html>`__.
 
 .. _nova-compute-node-down-manual-recovery:
 
diff --git a/doc/admin-guide/source/compute.rst b/doc/admin-guide/source/compute.rst
index ef2cf15323..34a66ef7e8 100644
--- a/doc/admin-guide/source/compute.rst
+++ b/doc/admin-guide/source/compute.rst
@@ -15,12 +15,12 @@ web-based API.
 .. toctree::
    :maxdepth: 2
 
-   compute_arch.rst
+   compute-arch.rst
    compute-images-instances.rst
    compute-networking-nova.rst
    compute-system-admin.rst
    support-compute.rst
 
 .. TODO (bmoss)
-   ../common/section_compute-configure-console.xml
+   ../common/section-compute-configure-console.xml
 
diff --git a/doc/admin-guide/source/cross_project_cors.rst b/doc/admin-guide/source/cross-project-cors.rst
similarity index 99%
rename from doc/admin-guide/source/cross_project_cors.rst
rename to doc/admin-guide/source/cross-project-cors.rst
index c84ec48d9b..daf3346e12 100644
--- a/doc/admin-guide/source/cross_project_cors.rst
+++ b/doc/admin-guide/source/cross-project-cors.rst
@@ -1,4 +1,4 @@
-.. _cross_project:
+.. _cross-project:
 
 =============================
 Cross-origin resource sharing
diff --git a/doc/admin-guide/source/cross_project.rst b/doc/admin-guide/source/cross-project.rst
similarity index 93%
rename from doc/admin-guide/source/cross_project.rst
rename to doc/admin-guide/source/cross-project.rst
index 6bc0bfc885..c90230c1cb 100644
--- a/doc/admin-guide/source/cross_project.rst
+++ b/doc/admin-guide/source/cross-project.rst
@@ -10,4 +10,4 @@ in a consistent manner.
 .. toctree::
    :maxdepth: 2
 
-   cross_project_cors.rst
+   cross-project-cors.rst
diff --git a/doc/admin-guide/source/dashboard_admin_manage_roles.rst b/doc/admin-guide/source/dashboard-admin-manage-roles.rst
similarity index 100%
rename from doc/admin-guide/source/dashboard_admin_manage_roles.rst
rename to doc/admin-guide/source/dashboard-admin-manage-roles.rst
diff --git a/doc/admin-guide/source/dashboard_admin_manage_stacks.rst b/doc/admin-guide/source/dashboard-admin-manage-stacks.rst
similarity index 94%
rename from doc/admin-guide/source/dashboard_admin_manage_stacks.rst
rename to doc/admin-guide/source/dashboard-admin-manage-stacks.rst
index c53de9c0fa..23673cac04 100644
--- a/doc/admin-guide/source/dashboard_admin_manage_stacks.rst
+++ b/doc/admin-guide/source/dashboard-admin-manage-stacks.rst
@@ -21,7 +21,7 @@ For information about:
 
 * administrative tasks on the command-line, see
   the `OpenStack Administrator Guide
-  <http://docs.openstack.org/admin-guide/cli_admin_manage_stacks.html>`__.
+  <http://docs.openstack.org/admin-guide/cli-admin-manage-stacks.html>`__.
 
   .. note::
 
diff --git a/doc/admin-guide/source/dashboard_manage_flavors.rst b/doc/admin-guide/source/dashboard-manage-flavors.rst
similarity index 100%
rename from doc/admin-guide/source/dashboard_manage_flavors.rst
rename to doc/admin-guide/source/dashboard-manage-flavors.rst
diff --git a/doc/admin-guide/source/dashboard_manage_host_aggregates.rst b/doc/admin-guide/source/dashboard-manage-host-aggregates.rst
similarity index 100%
rename from doc/admin-guide/source/dashboard_manage_host_aggregates.rst
rename to doc/admin-guide/source/dashboard-manage-host-aggregates.rst
diff --git a/doc/admin-guide/source/dashboard_manage_images.rst b/doc/admin-guide/source/dashboard-manage-images.rst
similarity index 100%
rename from doc/admin-guide/source/dashboard_manage_images.rst
rename to doc/admin-guide/source/dashboard-manage-images.rst
diff --git a/doc/admin-guide/source/dashboard_manage_instances.rst b/doc/admin-guide/source/dashboard-manage-instances.rst
similarity index 100%
rename from doc/admin-guide/source/dashboard_manage_instances.rst
rename to doc/admin-guide/source/dashboard-manage-instances.rst
diff --git a/doc/admin-guide/source/dashboard_manage_resources.rst b/doc/admin-guide/source/dashboard-manage-resources.rst
similarity index 57%
rename from doc/admin-guide/source/dashboard_manage_resources.rst
rename to doc/admin-guide/source/dashboard-manage-resources.rst
index 2ea16d3e1d..9382ab47b7 100644
--- a/doc/admin-guide/source/dashboard_manage_resources.rst
+++ b/doc/admin-guide/source/dashboard-manage-resources.rst
@@ -6,5 +6,5 @@ View cloud resources
 .. toctree::
    :maxdepth: 2
 
-   dashboard_manage_services.rst
-   dashboard_view_cloud_resources.rst
+   dashboard-manage-services.rst
+   dashboard-view-cloud-resources.rst
diff --git a/doc/admin-guide/source/dashboard_manage_services.rst b/doc/admin-guide/source/dashboard-manage-services.rst
similarity index 100%
rename from doc/admin-guide/source/dashboard_manage_services.rst
rename to doc/admin-guide/source/dashboard-manage-services.rst
diff --git a/doc/admin-guide/source/dashboard_manage_shares.rst b/doc/admin-guide/source/dashboard-manage-shares.rst
similarity index 100%
rename from doc/admin-guide/source/dashboard_manage_shares.rst
rename to doc/admin-guide/source/dashboard-manage-shares.rst
diff --git a/doc/admin-guide/source/dashboard_manage_volumes.rst b/doc/admin-guide/source/dashboard-manage-volumes.rst
similarity index 100%
rename from doc/admin-guide/source/dashboard_manage_volumes.rst
rename to doc/admin-guide/source/dashboard-manage-volumes.rst
diff --git a/doc/admin-guide/source/dashboard_sessions.rst b/doc/admin-guide/source/dashboard-sessions.rst
similarity index 100%
rename from doc/admin-guide/source/dashboard_sessions.rst
rename to doc/admin-guide/source/dashboard-sessions.rst
diff --git a/doc/admin-guide/source/dashboard_set_quotas.rst b/doc/admin-guide/source/dashboard-set-quotas.rst
similarity index 97%
rename from doc/admin-guide/source/dashboard_set_quotas.rst
rename to doc/admin-guide/source/dashboard-set-quotas.rst
index 4e5d1f57c9..9e923ed5b4 100644
--- a/doc/admin-guide/source/dashboard_set_quotas.rst
+++ b/doc/admin-guide/source/dashboard-set-quotas.rst
@@ -24,7 +24,7 @@ quotas for new tenants, as well as update quotas for existing tenants.
    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 `OpenStack Administrator Guide
-   <http://docs.openstack.org/admin-guide/cli_set_quotas.html>`_).
+   <http://docs.openstack.org/admin-guide/cli-set-quotas.html>`_).
    Additionally, you can update Compute service quotas for
    tenant users.
 
@@ -114,4 +114,4 @@ Update project quotas
    The dashboard does not show all possible project quotas.
    To view and update the quotas for a service, use its
    command-line client. See `OpenStack Administrator Guide
-   <http://docs.openstack.org/admin-guide/cli_set_quotas.html>`_.
+   <http://docs.openstack.org/admin-guide/cli-set-quotas.html>`_.
diff --git a/doc/admin-guide/source/dashboard_view_cloud_resources.rst b/doc/admin-guide/source/dashboard-view-cloud-resources.rst
similarity index 100%
rename from doc/admin-guide/source/dashboard_view_cloud_resources.rst
rename to doc/admin-guide/source/dashboard-view-cloud-resources.rst
diff --git a/doc/admin-guide/source/dashboard.rst b/doc/admin-guide/source/dashboard.rst
index 280a1d7d23..accf747338 100644
--- a/doc/admin-guide/source/dashboard.rst
+++ b/doc/admin-guide/source/dashboard.rst
@@ -14,17 +14,17 @@ for your operating system.
    :maxdepth: 2
 
    common/dashboard-customizing.rst
-   dashboard_sessions.rst
-   dashboard_manage_images.rst
-   dashboard_admin_manage_roles.rst
-   dashboard_manage_instances.rst
-   dashboard_manage_flavors.rst
-   dashboard_manage_volumes.rst
-   dashboard_manage_shares.rst
-   dashboard_set_quotas.rst
-   dashboard_manage_resources.rst
-   dashboard_manage_host_aggregates.rst
-   dashboard_admin_manage_stacks.rst
+   dashboard-sessions.rst
+   dashboard-manage-images.rst
+   dashboard-admin-manage-roles.rst
+   dashboard-manage-instances.rst
+   dashboard-manage-flavors.rst
+   dashboard-manage-volumes.rst
+   dashboard-manage-shares.rst
+   dashboard-set-quotas.rst
+   dashboard-manage-resources.rst
+   dashboard-manage-host-aggregates.rst
+   dashboard-admin-manage-stacks.rst
 
 - To deploy the dashboard, see the `OpenStack dashboard documentation
   <http://docs.openstack.org/developer/horizon/topics/deployment.html>`__.
diff --git a/doc/admin-guide/source/identity_auth_token_middleware.rst b/doc/admin-guide/source/identity-auth-token-middleware.rst
similarity index 100%
rename from doc/admin-guide/source/identity_auth_token_middleware.rst
rename to doc/admin-guide/source/identity-auth-token-middleware.rst
diff --git a/doc/admin-guide/source/identity_concepts.rst b/doc/admin-guide/source/identity-concepts.rst
similarity index 99%
rename from doc/admin-guide/source/identity_concepts.rst
rename to doc/admin-guide/source/identity-concepts.rst
index 76db521eac..177dedd8b0 100644
--- a/doc/admin-guide/source/identity_concepts.rst
+++ b/doc/admin-guide/source/identity-concepts.rst
@@ -304,7 +304,7 @@ special service tenant called ``service``.
 
 For information about how to create services and endpoints, see the
 `OpenStack Administrator Guide <http://docs.openstack.org/admin-guide/
-cli_manage_services.html>`__.
+cli-manage-services.html>`__.
 
 Groups
 ~~~~~~
diff --git a/doc/admin-guide/source/identity_keystone_usage_and_features.rst b/doc/admin-guide/source/identity-keystone-usage-and-features.rst
similarity index 100%
rename from doc/admin-guide/source/identity_keystone_usage_and_features.rst
rename to doc/admin-guide/source/identity-keystone-usage-and-features.rst
diff --git a/doc/admin-guide/source/identity-management.rst b/doc/admin-guide/source/identity-management.rst
new file mode 100644
index 0000000000..4ee820bdaf
--- /dev/null
+++ b/doc/admin-guide/source/identity-management.rst
@@ -0,0 +1,32 @@
+.. _identity_management:
+
+===================
+Identity management
+===================
+
+OpenStack Identity, code-named keystone, is the default Identity
+management system for OpenStack. After you install Identity, you
+configure it through the ``/etc/keystone/keystone.conf``
+configuration file and, possibly, a separate logging configuration
+file. You initialize data into Identity by using the ``keystone``
+command-line client.
+
+.. toctree::
+   :maxdepth: 1
+
+   identity-concepts.rst
+   keystone-certificates-for-pki.rst
+   keystone-configure-with-SSL.rst
+   keystone-domain-specific-config.rst
+   keystone-external-authentication.rst
+   keystone-integrate-with-ldap.rst
+   keystone-tokens.rst
+   keystone-token-binding.rst
+   keystone-fernet-token-faq.rst
+   keystone-use-trusts.rst
+   keystone-caching-layer.rst
+   identity-start.rst
+   identity-keystone-usage-and-features.rst
+   identity-auth-token-middleware.rst
+   identity-service-api-protection.rst
+   identity-troubleshoot.rst
diff --git a/doc/admin-guide/source/identity_service_api_protection.rst b/doc/admin-guide/source/identity-service-api-protection.rst
similarity index 100%
rename from doc/admin-guide/source/identity_service_api_protection.rst
rename to doc/admin-guide/source/identity-service-api-protection.rst
diff --git a/doc/admin-guide/source/identity_start.rst b/doc/admin-guide/source/identity-start.rst
similarity index 100%
rename from doc/admin-guide/source/identity_start.rst
rename to doc/admin-guide/source/identity-start.rst
diff --git a/doc/admin-guide/source/identity_troubleshoot.rst b/doc/admin-guide/source/identity-troubleshoot.rst
similarity index 100%
rename from doc/admin-guide/source/identity_troubleshoot.rst
rename to doc/admin-guide/source/identity-troubleshoot.rst
diff --git a/doc/admin-guide/source/identity_management.rst b/doc/admin-guide/source/identity_management.rst
deleted file mode 100644
index 8c98dd6c0c..0000000000
--- a/doc/admin-guide/source/identity_management.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-.. _identity_management:
-
-===================
-Identity management
-===================
-
-OpenStack Identity, code-named keystone, is the default Identity
-management system for OpenStack. After you install Identity, you
-configure it through the ``/etc/keystone/keystone.conf``
-configuration file and, possibly, a separate logging configuration
-file. You initialize data into Identity by using the ``keystone``
-command-line client.
-
-.. toctree::
-   :maxdepth: 1
-
-   identity_concepts.rst
-   keystone_certificates_for_pki.rst
-   keystone_configure_with_SSL.rst
-   keystone_domain_specific_config.rst
-   keystone_external_authentication.rst
-   keystone_integrate_with_ldap.rst
-   keystone_tokens.rst
-   keystone_token-binding.rst
-   keystone_fernet_token_faq.rst
-   keystone_use_trusts.rst
-   keystone_caching_layer.rst
-   identity_start.rst
-   identity_keystone_usage_and_features.rst
-   identity_auth_token_middleware.rst
-   identity_service_api_protection.rst
-   identity_troubleshoot.rst
diff --git a/doc/admin-guide/source/index.rst b/doc/admin-guide/source/index.rst
index e90d873164..287d4fb8f0 100644
--- a/doc/admin-guide/source/index.rst
+++ b/doc/admin-guide/source/index.rst
@@ -18,19 +18,19 @@ Contents
 
    common/conventions.rst
    common/get-started-with-openstack.rst
-   identity_management.rst
+   identity-management.rst
    dashboard.rst
    compute.rst
    objectstorage.rst
    blockstorage.rst
-   shared_file_systems.rst
+   shared-file-systems.rst
    networking.rst
    telemetry.rst
    database.rst
    baremetal.rst
    orchestration.rst
    cli.rst
-   cross_project.rst
+   cross-project.rst
 
 Appendix
 ~~~~~~~~
diff --git a/doc/admin-guide/source/keystone_caching_layer.rst b/doc/admin-guide/source/keystone-caching-layer.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_caching_layer.rst
rename to doc/admin-guide/source/keystone-caching-layer.rst
diff --git a/doc/admin-guide/source/keystone_certificates_for_pki.rst b/doc/admin-guide/source/keystone-certificates-for-pki.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_certificates_for_pki.rst
rename to doc/admin-guide/source/keystone-certificates-for-pki.rst
diff --git a/doc/admin-guide/source/keystone_configure_with_SSL.rst b/doc/admin-guide/source/keystone-configure-with-SSL.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_configure_with_SSL.rst
rename to doc/admin-guide/source/keystone-configure-with-SSL.rst
diff --git a/doc/admin-guide/source/keystone_domain_specific_config.rst b/doc/admin-guide/source/keystone-domain-specific-config.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_domain_specific_config.rst
rename to doc/admin-guide/source/keystone-domain-specific-config.rst
diff --git a/doc/admin-guide/source/keystone_external_authentication.rst b/doc/admin-guide/source/keystone-external-authentication.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_external_authentication.rst
rename to doc/admin-guide/source/keystone-external-authentication.rst
diff --git a/doc/admin-guide/source/keystone_fernet_token_faq.rst b/doc/admin-guide/source/keystone-fernet-token-faq.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_fernet_token_faq.rst
rename to doc/admin-guide/source/keystone-fernet-token-faq.rst
diff --git a/doc/admin-guide/source/keystone_integrate_assignment_backend_ldap.rst b/doc/admin-guide/source/keystone-integrate-assignment-backend-ldap.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_integrate_assignment_backend_ldap.rst
rename to doc/admin-guide/source/keystone-integrate-assignment-backend-ldap.rst
diff --git a/doc/admin-guide/source/keystone_integrate_identity_backend_ldap.rst b/doc/admin-guide/source/keystone-integrate-identity-backend-ldap.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_integrate_identity_backend_ldap.rst
rename to doc/admin-guide/source/keystone-integrate-identity-backend-ldap.rst
diff --git a/doc/admin-guide/source/keystone_integrate_with_ldap.rst b/doc/admin-guide/source/keystone-integrate-with-ldap.rst
similarity index 97%
rename from doc/admin-guide/source/keystone_integrate_with_ldap.rst
rename to doc/admin-guide/source/keystone-integrate-with-ldap.rst
index 07882f21ba..5db2cd58ca 100644
--- a/doc/admin-guide/source/keystone_integrate_with_ldap.rst
+++ b/doc/admin-guide/source/keystone-integrate-with-ldap.rst
@@ -7,9 +7,9 @@ Integrate Identity with LDAP
 .. toctree::
    :maxdepth: 2
 
-   keystone_integrate_identity_backend_ldap.rst
-   keystone_integrate_assignment_backend_ldap.rst
-   keystone_secure_identity_to_ldap_backend.rst
+   keystone-integrate-identity-backend-ldap.rst
+   keystone-integrate-assignment-backend-ldap.rst
+   keystone-secure-identity-to-ldap-backend.rst
 
 The OpenStack Identity service supports integration with existing LDAP
 directories for authentication and authorization services. LDAP back
diff --git a/doc/admin-guide/source/keystone_secure_identity_to_ldap_backend.rst b/doc/admin-guide/source/keystone-secure-identity-to-ldap-backend.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_secure_identity_to_ldap_backend.rst
rename to doc/admin-guide/source/keystone-secure-identity-to-ldap-backend.rst
diff --git a/doc/admin-guide/source/keystone_token-binding.rst b/doc/admin-guide/source/keystone-token-binding.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_token-binding.rst
rename to doc/admin-guide/source/keystone-token-binding.rst
diff --git a/doc/admin-guide/source/keystone_tokens.rst b/doc/admin-guide/source/keystone-tokens.rst
similarity index 97%
rename from doc/admin-guide/source/keystone_tokens.rst
rename to doc/admin-guide/source/keystone-tokens.rst
index 1a538c8bac..99fe776bb5 100644
--- a/doc/admin-guide/source/keystone_tokens.rst
+++ b/doc/admin-guide/source/keystone-tokens.rst
@@ -88,7 +88,7 @@ information stored in the token and integrity is verified with a ``SHA256
 HMAC`` signature. Only the Identity service should have access to the keys used
 to encrypt and decrypt fernet tokens. Like UUID tokens, fernet tokens must be
 passed back to the Identity service in order to validate them. For more
-information on the fernet token type, see the :doc:`keystone_fernet_token_faq`.
+information on the fernet token type, see the :doc:`keystone-fernet-token-faq`.
 
 PKI and PKIZ tokens
 ~~~~~~~~~~~~~~~~~~~
@@ -101,4 +101,4 @@ pairs and certificates in order to create and validate PKI tokens.
 The same concepts from PKI tokens apply to PKIZ tokens. The only difference
 between the two is PKIZ tokens are compressed to help mitigate the size issues
 of PKI. For more information on the certificate setup for PKI and PKIZ tokens,
-see the :doc:`keystone_certificates_for_pki`.
+see the :doc:`keystone-certificates-for-pki`.
diff --git a/doc/admin-guide/source/keystone_use_trusts.rst b/doc/admin-guide/source/keystone-use-trusts.rst
similarity index 100%
rename from doc/admin-guide/source/keystone_use_trusts.rst
rename to doc/admin-guide/source/keystone-use-trusts.rst
diff --git a/doc/admin-guide/source/networking_adv-config.rst b/doc/admin-guide/source/networking-adv-config.rst
similarity index 100%
rename from doc/admin-guide/source/networking_adv-config.rst
rename to doc/admin-guide/source/networking-adv-config.rst
diff --git a/doc/admin-guide/source/networking_adv-features.rst b/doc/admin-guide/source/networking-adv-features.rst
similarity index 100%
rename from doc/admin-guide/source/networking_adv-features.rst
rename to doc/admin-guide/source/networking-adv-features.rst
diff --git a/doc/admin-guide/source/networking_adv-operational-features.rst b/doc/admin-guide/source/networking-adv-operational-features.rst
similarity index 100%
rename from doc/admin-guide/source/networking_adv-operational-features.rst
rename to doc/admin-guide/source/networking-adv-operational-features.rst
diff --git a/doc/admin-guide/source/networking_arch.rst b/doc/admin-guide/source/networking-arch.rst
similarity index 100%
rename from doc/admin-guide/source/networking_arch.rst
rename to doc/admin-guide/source/networking-arch.rst
diff --git a/doc/admin-guide/source/networking_auth.rst b/doc/admin-guide/source/networking-auth.rst
similarity index 100%
rename from doc/admin-guide/source/networking_auth.rst
rename to doc/admin-guide/source/networking-auth.rst
diff --git a/doc/admin-guide/source/networking_config-agents.rst b/doc/admin-guide/source/networking-config-agents.rst
similarity index 100%
rename from doc/admin-guide/source/networking_config-agents.rst
rename to doc/admin-guide/source/networking-config-agents.rst
diff --git a/doc/admin-guide/source/networking_config-identity.rst b/doc/admin-guide/source/networking-config-identity.rst
similarity index 100%
rename from doc/admin-guide/source/networking_config-identity.rst
rename to doc/admin-guide/source/networking-config-identity.rst
diff --git a/doc/admin-guide/source/networking_config-plugins.rst b/doc/admin-guide/source/networking-config-plugins.rst
similarity index 100%
rename from doc/admin-guide/source/networking_config-plugins.rst
rename to doc/admin-guide/source/networking-config-plugins.rst
diff --git a/doc/admin-guide/source/networking_introduction.rst b/doc/admin-guide/source/networking-introduction.rst
similarity index 100%
rename from doc/admin-guide/source/networking_introduction.rst
rename to doc/admin-guide/source/networking-introduction.rst
diff --git a/doc/admin-guide/source/networking_multi-dhcp-agents.rst b/doc/admin-guide/source/networking-multi-dhcp-agents.rst
similarity index 100%
rename from doc/admin-guide/source/networking_multi-dhcp-agents.rst
rename to doc/admin-guide/source/networking-multi-dhcp-agents.rst
diff --git a/doc/admin-guide/source/networking_use.rst b/doc/admin-guide/source/networking-use.rst
similarity index 100%
rename from doc/admin-guide/source/networking_use.rst
rename to doc/admin-guide/source/networking-use.rst
diff --git a/doc/admin-guide/source/networking.rst b/doc/admin-guide/source/networking.rst
index e5b89d3a6a..227f417810 100644
--- a/doc/admin-guide/source/networking.rst
+++ b/doc/admin-guide/source/networking.rst
@@ -10,15 +10,15 @@ advanced ``neutron`` and ``nova`` command-line interface (CLI) commands.
 .. toctree::
    :maxdepth: 2
 
-   networking_introduction.rst
-   networking_arch.rst
-   networking_config-plugins.rst
-   networking_config-agents.rst
-   networking_config-identity.rst
-   networking_adv-config.rst
-   networking_multi-dhcp-agents.rst
-   networking_use.rst
-   networking_adv-features.rst
-   networking_adv-operational-features.rst
-   networking_auth.rst
+   networking-introduction.rst
+   networking-arch.rst
+   networking-config-plugins.rst
+   networking-config-agents.rst
+   networking-config-identity.rst
+   networking-adv-config.rst
+   networking-multi-dhcp-agents.rst
+   networking-use.rst
+   networking-adv-features.rst
+   networking-adv-operational-features.rst
+   networking-auth.rst
 
diff --git a/doc/admin-guide/source/objectstorage_EC.rst b/doc/admin-guide/source/objectstorage-EC.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_EC.rst
rename to doc/admin-guide/source/objectstorage-EC.rst
diff --git a/doc/admin-guide/source/objectstorage_account_reaper.rst b/doc/admin-guide/source/objectstorage-account-reaper.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_account_reaper.rst
rename to doc/admin-guide/source/objectstorage-account-reaper.rst
diff --git a/doc/admin-guide/source/objectstorage_arch.rst b/doc/admin-guide/source/objectstorage-arch.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_arch.rst
rename to doc/admin-guide/source/objectstorage-arch.rst
diff --git a/doc/admin-guide/source/objectstorage_auditors.rst b/doc/admin-guide/source/objectstorage-auditors.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_auditors.rst
rename to doc/admin-guide/source/objectstorage-auditors.rst
diff --git a/doc/admin-guide/source/objectstorage_characteristics.rst b/doc/admin-guide/source/objectstorage-characteristics.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_characteristics.rst
rename to doc/admin-guide/source/objectstorage-characteristics.rst
diff --git a/doc/admin-guide/source/objectstorage_components.rst b/doc/admin-guide/source/objectstorage-components.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_components.rst
rename to doc/admin-guide/source/objectstorage-components.rst
diff --git a/doc/admin-guide/source/objectstorage_features.rst b/doc/admin-guide/source/objectstorage-features.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_features.rst
rename to doc/admin-guide/source/objectstorage-features.rst
diff --git a/doc/admin-guide/source/objectstorage_intro.rst b/doc/admin-guide/source/objectstorage-intro.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_intro.rst
rename to doc/admin-guide/source/objectstorage-intro.rst
diff --git a/doc/admin-guide/source/objectstorage_large-objects.rst b/doc/admin-guide/source/objectstorage-large-objects.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_large-objects.rst
rename to doc/admin-guide/source/objectstorage-large-objects.rst
diff --git a/doc/admin-guide/source/objectstorage_replication.rst b/doc/admin-guide/source/objectstorage-replication.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_replication.rst
rename to doc/admin-guide/source/objectstorage-replication.rst
diff --git a/doc/admin-guide/source/objectstorage_ringbuilder.rst b/doc/admin-guide/source/objectstorage-ringbuilder.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_ringbuilder.rst
rename to doc/admin-guide/source/objectstorage-ringbuilder.rst
diff --git a/doc/admin-guide/source/objectstorage_tenant_specific_image_storage.rst b/doc/admin-guide/source/objectstorage-tenant-specific-image-storage.rst
similarity index 100%
rename from doc/admin-guide/source/objectstorage_tenant_specific_image_storage.rst
rename to doc/admin-guide/source/objectstorage-tenant-specific-image-storage.rst
diff --git a/doc/admin-guide/source/objectstorage.rst b/doc/admin-guide/source/objectstorage.rst
index d488b562f9..d36a7d614b 100644
--- a/doc/admin-guide/source/objectstorage.rst
+++ b/doc/admin-guide/source/objectstorage.rst
@@ -5,18 +5,18 @@ Object Storage
 .. toctree::
    :maxdepth: 2
 
-   objectstorage_intro.rst
-   objectstorage_features.rst
-   objectstorage_characteristics.rst
-   objectstorage_components.rst
-   objectstorage_ringbuilder.rst
-   objectstorage_arch.rst
-   objectstorage_replication.rst
-   objectstorage_large-objects.rst
-   objectstorage_auditors.rst
-   objectstorage_EC.rst
-   objectstorage_account_reaper.rst
-   objectstorage_tenant_specific_image_storage.rst
+   objectstorage-intro.rst
+   objectstorage-features.rst
+   objectstorage-characteristics.rst
+   objectstorage-components.rst
+   objectstorage-ringbuilder.rst
+   objectstorage-arch.rst
+   objectstorage-replication.rst
+   objectstorage-large-objects.rst
+   objectstorage-auditors.rst
+   objectstorage-EC.rst
+   objectstorage-account-reaper.rst
+   objectstorage-tenant-specific-image-storage.rst
    objectstorage-monitoring.rst
    objectstorage-admin.rst
    objectstorage-troubleshoot.rst
diff --git a/doc/admin-guide/source/orchestration-auth-model.rst b/doc/admin-guide/source/orchestration-auth-model.rst
index b24ee8bd51..a133ac36f7 100644
--- a/doc/admin-guide/source/orchestration-auth-model.rst
+++ b/doc/admin-guide/source/orchestration-auth-model.rst
@@ -77,8 +77,7 @@ which is consumed by *only* the trustee to obtain a
 such that the trustee has limited access to those
 roles delegated. In addition, the trustee has effective impersonation
 of the trustor user if it was selected when creating the trust.
-For more information, see the :ref:`Identity management <identity_management>`
-section.
+For more information, see :doc:`Identity management <identity-management>`.
 
 Trusts authorization involves the following steps:
 
diff --git a/doc/admin-guide/source/orchestration-stack-domain-users.rst b/doc/admin-guide/source/orchestration-stack-domain-users.rst
index 4f2b8530bb..c3f629c130 100644
--- a/doc/admin-guide/source/orchestration-stack-domain-users.rst
+++ b/doc/admin-guide/source/orchestration-stack-domain-users.rst
@@ -125,8 +125,8 @@ The following steps are run during stack creation:
    in the stack domain are still assigned the ``heat_stack_user`` role, so
    the API surface they can access is limited through
    the :file:`policy.json` file.
-   For more  information, see :ref:`OpenStack Identity
-   documentation <identity_management>`.
+   For more  information, see :doc:`OpenStack Identity
+   documentation <identity-management>`.
 
 #. When API requests are processed, the Orchestration service performs
    an internal lookup, and allows stack details for a given stack to be
diff --git a/doc/admin-guide/source/shared_file_systems_cgroups.rst b/doc/admin-guide/source/shared-file-systems-cgroups.rst
similarity index 99%
rename from doc/admin-guide/source/shared_file_systems_cgroups.rst
rename to doc/admin-guide/source/shared-file-systems-cgroups.rst
index 65ad9ad504..a23a99effa 100644
--- a/doc/admin-guide/source/shared_file_systems_cgroups.rst
+++ b/doc/admin-guide/source/shared-file-systems-cgroups.rst
@@ -145,7 +145,7 @@ to soft-delete one or more consistency groups.
 .. note::
 
    A consistency group can be deleted only if it has no dependent
-   :ref:`shared_file_systems_cgsnapshots`.
+   :ref:`shared-file-systems-cgsnapshots`.
 
 .. code-block:: console
 
@@ -159,7 +159,7 @@ to force-delete a specified consistency group in any state.
 
    $ manila cg-delete --force cgroup1
 
-.. _shared_file_systems_cgsnapshots:
+.. _shared-file-systems-cgsnapshots:
 
 Consistency group snapshots
 ---------------------------
diff --git a/doc/admin-guide/source/shared_file_systems_crud_share.rst b/doc/admin-guide/source/shared-file-systems-crud-share.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_crud_share.rst
rename to doc/admin-guide/source/shared-file-systems-crud-share.rst
diff --git a/doc/admin-guide/source/shared_file_systems_intro.rst b/doc/admin-guide/source/shared-file-systems-intro.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_intro.rst
rename to doc/admin-guide/source/shared-file-systems-intro.rst
diff --git a/doc/admin-guide/source/shared_file_systems_key_concepts.rst b/doc/admin-guide/source/shared-file-systems-key-concepts.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_key_concepts.rst
rename to doc/admin-guide/source/shared-file-systems-key-concepts.rst
diff --git a/doc/admin-guide/source/shared_file_systems_manage_and_unmanage_share.rst b/doc/admin-guide/source/shared-file-systems-manage-and-unmanage-share.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_manage_and_unmanage_share.rst
rename to doc/admin-guide/source/shared-file-systems-manage-and-unmanage-share.rst
diff --git a/doc/admin-guide/source/shared_file_systems_manage_shares_cli.rst b/doc/admin-guide/source/shared-file-systems-manage-shares-cli.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_manage_shares_cli.rst
rename to doc/admin-guide/source/shared-file-systems-manage-shares-cli.rst
diff --git a/doc/admin-guide/source/shared_file_systems_multi_backend.rst b/doc/admin-guide/source/shared-file-systems-multi-backend.rst
similarity index 96%
rename from doc/admin-guide/source/shared_file_systems_multi_backend.rst
rename to doc/admin-guide/source/shared-file-systems-multi-backend.rst
index 60bd4c6e12..9339389724 100644
--- a/doc/admin-guide/source/shared_file_systems_multi_backend.rst
+++ b/doc/admin-guide/source/shared-file-systems-multi-backend.rst
@@ -57,5 +57,5 @@ should provide a single configuration file per each back end.
 
 .. toctree::
 
-   shared_file_systems_scheduling.rst
-   shared_file_systems_services_manage.rst
+   shared-file-systems-scheduling.rst
+   shared-file-systems-services-manage.rst
diff --git a/doc/admin-guide/source/shared_file_systems_network_plugins.rst b/doc/admin-guide/source/shared-file-systems-network-plugins.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_network_plugins.rst
rename to doc/admin-guide/source/shared-file-systems-network-plugins.rst
diff --git a/doc/admin-guide/source/shared_file_systems_networking.rst b/doc/admin-guide/source/shared-file-systems-networking.rst
similarity index 85%
rename from doc/admin-guide/source/shared_file_systems_networking.rst
rename to doc/admin-guide/source/shared-file-systems-networking.rst
index 530cee50b4..93309be038 100644
--- a/doc/admin-guide/source/shared_file_systems_networking.rst
+++ b/doc/admin-guide/source/shared-file-systems-networking.rst
@@ -13,5 +13,5 @@ protocols, or Microsoft Active Directory.
 
 .. toctree::
 
-   shared_file_systems_share_networks.rst
-   shared_file_systems_network_plugins.rst
+   shared-file-systems-share-networks.rst
+   shared-file-systems-network-plugins.rst
diff --git a/doc/admin-guide/source/shared_file_systems_quotas.rst b/doc/admin-guide/source/shared-file-systems-quotas.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_quotas.rst
rename to doc/admin-guide/source/shared-file-systems-quotas.rst
diff --git a/doc/admin-guide/source/shared_file_systems_scheduling.rst b/doc/admin-guide/source/shared-file-systems-scheduling.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_scheduling.rst
rename to doc/admin-guide/source/shared-file-systems-scheduling.rst
diff --git a/doc/admin-guide/source/shared_file_systems_security_services.rst b/doc/admin-guide/source/shared-file-systems-security-services.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_security_services.rst
rename to doc/admin-guide/source/shared-file-systems-security-services.rst
diff --git a/doc/admin-guide/source/shared_file_systems_services_manage.rst b/doc/admin-guide/source/shared-file-systems-services-manage.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_services_manage.rst
rename to doc/admin-guide/source/shared-file-systems-services-manage.rst
diff --git a/doc/admin-guide/source/shared_file_systems_share_management.rst b/doc/admin-guide/source/shared-file-systems-share-management.rst
similarity index 86%
rename from doc/admin-guide/source/shared_file_systems_share_management.rst
rename to doc/admin-guide/source/shared-file-systems-share-management.rst
index 7c4fe9aa73..bc5d0d0814 100644
--- a/doc/admin-guide/source/shared_file_systems_share_management.rst
+++ b/doc/admin-guide/source/shared-file-systems-share-management.rst
@@ -26,7 +26,7 @@ is the real purpose of the Shared File Systems service in production.
 
 .. toctree::
 
-   shared_file_systems_crud_share.rst
-   shared_file_systems_manage_and_unmanage_share.rst
-   shared_file_systems_share_resize.rst
-   shared_file_systems_quotas.rst
+   shared-file-systems-crud-share.rst
+   shared-file-systems-manage-and-unmanage-share.rst
+   shared-file-systems-share-resize.rst
+   shared-file-systems-quotas.rst
diff --git a/doc/admin-guide/source/shared_file_systems_share_networks.rst b/doc/admin-guide/source/shared-file-systems-share-networks.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_share_networks.rst
rename to doc/admin-guide/source/shared-file-systems-share-networks.rst
diff --git a/doc/admin-guide/source/shared_file_systems_share_replication.rst b/doc/admin-guide/source/shared-file-systems-share-replication.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_share_replication.rst
rename to doc/admin-guide/source/shared-file-systems-share-replication.rst
diff --git a/doc/admin-guide/source/shared_file_systems_share_resize.rst b/doc/admin-guide/source/shared-file-systems-share-resize.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_share_resize.rst
rename to doc/admin-guide/source/shared-file-systems-share-resize.rst
diff --git a/doc/admin-guide/source/shared_file_systems_share_types.rst b/doc/admin-guide/source/shared-file-systems-share-types.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_share_types.rst
rename to doc/admin-guide/source/shared-file-systems-share-types.rst
diff --git a/doc/admin-guide/source/shared_file_systems_snapshots.rst b/doc/admin-guide/source/shared-file-systems-snapshots.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_snapshots.rst
rename to doc/admin-guide/source/shared-file-systems-snapshots.rst
diff --git a/doc/admin-guide/source/shared_file_systems_troubleshoot.rst b/doc/admin-guide/source/shared-file-systems-troubleshoot.rst
similarity index 100%
rename from doc/admin-guide/source/shared_file_systems_troubleshoot.rst
rename to doc/admin-guide/source/shared-file-systems-troubleshoot.rst
diff --git a/doc/admin-guide/source/shared_file_systems.rst b/doc/admin-guide/source/shared-file-systems.rst
similarity index 55%
rename from doc/admin-guide/source/shared_file_systems.rst
rename to doc/admin-guide/source/shared-file-systems.rst
index 7db558ab16..2243abd2cf 100644
--- a/doc/admin-guide/source/shared_file_systems.rst
+++ b/doc/admin-guide/source/shared-file-systems.rst
@@ -1,4 +1,4 @@
-.. _shared_file_systems:
+.. _shared-file-systems:
 
 ===================
 Shared File Systems
@@ -17,15 +17,15 @@ System (EFS) does.
 .. toctree::
    :maxdepth: 1
 
-   shared_file_systems_intro.rst
-   shared_file_systems_key_concepts.rst
-   shared_file_systems_share_management.rst
-   shared_file_systems_manage_shares_cli.rst
-   shared_file_systems_share_types.rst
-   shared_file_systems_snapshots.rst
-   shared_file_systems_security_services.rst
-   shared_file_systems_cgroups.rst
-   shared_file_systems_share_replication.rst
-   shared_file_systems_multi_backend.rst
-   shared_file_systems_networking.rst
-   shared_file_systems_troubleshoot.rst
+   shared-file-systems-intro.rst
+   shared-file-systems-key-concepts.rst
+   shared-file-systems-share-management.rst
+   shared-file-systems-manage-shares-cli.rst
+   shared-file-systems-share-types.rst
+   shared-file-systems-snapshots.rst
+   shared-file-systems-security-services.rst
+   shared-file-systems-cgroups.rst
+   shared-file-systems-share-replication.rst
+   shared-file-systems-multi-backend.rst
+   shared-file-systems-networking.rst
+   shared-file-systems-troubleshoot.rst
diff --git a/doc/admin-guide/source/ts_cinder_config.rst b/doc/admin-guide/source/ts-cinder-config.rst
similarity index 100%
rename from doc/admin-guide/source/ts_cinder_config.rst
rename to doc/admin-guide/source/ts-cinder-config.rst
diff --git a/doc/admin-guide/source/ts_multipath_warn.rst b/doc/admin-guide/source/ts-multipath-warn.rst
similarity index 100%
rename from doc/admin-guide/source/ts_multipath_warn.rst
rename to doc/admin-guide/source/ts-multipath-warn.rst
diff --git a/doc/admin-guide/source/ts_no_emulator_x86_64.rst b/doc/admin-guide/source/ts-no-emulator-x86-64.rst
similarity index 100%
rename from doc/admin-guide/source/ts_no_emulator_x86_64.rst
rename to doc/admin-guide/source/ts-no-emulator-x86-64.rst
diff --git a/doc/admin-guide/source/ts_non_existent_host.rst b/doc/admin-guide/source/ts-non-existent-host.rst
similarity index 100%
rename from doc/admin-guide/source/ts_non_existent_host.rst
rename to doc/admin-guide/source/ts-non-existent-host.rst
diff --git a/doc/admin-guide/source/ts_non_existent_vlun.rst b/doc/admin-guide/source/ts-non-existent-vlun.rst
similarity index 100%
rename from doc/admin-guide/source/ts_non_existent_vlun.rst
rename to doc/admin-guide/source/ts-non-existent-vlun.rst
diff --git a/doc/admin-guide/source/ts_vol_attach_miss_sg_scan.rst b/doc/admin-guide/source/ts-vol-attach-miss-sg-scan.rst
similarity index 100%
rename from doc/admin-guide/source/ts_vol_attach_miss_sg_scan.rst
rename to doc/admin-guide/source/ts-vol-attach-miss-sg-scan.rst
diff --git a/www/static/.htaccess b/www/static/.htaccess
index 335d3daec7..13d1f65133 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -167,9 +167,132 @@ redirect 301 /user-guide/content/Launching_Instances_using_Dashboard.html /user-
 # Redirect top ten (or so) Admin User Guide pages post-migration
 redirect 301 /user-guide-admin/content/specify-host-to-boot-instances-on.html /admin-guide/cli_nova_specify_host.html
 redirect 301 /user-guide-admin/content/nova_cli_migrate_single.html /admin-guide/cli_nova_migrate.html
-
 redirect 301 /admin-guide-cloud/content/customize-flavors.html /admin-guide/compute-flavors.html
 
+# Redirect renamed Admin Guide pages
+
+redirectmatch 301 ^/([a-z-]+)/blockstorage_backup_disks.html /$1/blockstorage-backup-disks.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_get_capabilities.html /$1/blockstorage-get-capabilities.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_glusterfs_backend.html /$1/blockstorage-glusterfs-backend.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_glusterfs_removal.html /$1/blockstorage-glusterfs-removal.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_image_volume_cache.html /$1/blockstorage-image-volume-cache.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_multi_backend.html /$1/blockstorage-multi-backend.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_nfs_backend.html /$1/blockstorage-nfs-backend.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_over_subscription.html /$1/blockstorage-over-subscription.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_ratelimit_volume_copy_bandwidth.html /$1/blockstorage-ratelimit-volume-copy-bandwidth.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_volume_backed_image.html /$1/blockstorage-volume-backed-image.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_volume_backups.html /$1/blockstorage-volume-backups.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_volume_backups_export_import.html /$1/blockstorage-volume-backups-export-import.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_volume_migration.html /$1/blockstorage-volume-migration.html
+redirectmatch 301 ^/([a-z-]+)/blockstorage_volume_number_weigher.html /$1/blockstorage-volume-number-weigher.html
+redirectmatch 301 ^/([a-z-]+)/cli_admin_manage_environment.html /$1/cli-admin-manage-environment.html
+redirectmatch 301 ^/([a-z-]+)/cli_admin_manage_ip_addresses.html /$1/cli-admin-manage-ip-addresses.html
+redirectmatch 301 ^/([a-z-]+)/cli_admin_manage_stacks.html /$1/cli-admin-manage-stacks.html
+redirectmatch 301 ^/([a-z-]+)/cli_analyzing-log-files-with-swift.html /$1/cli-analyzing-log-files-with-swift.html
+redirectmatch 301 ^/([a-z-]+)/cli_cinder_quotas.html /$1/cli-cinder-quotas.html
+redirectmatch 301 ^/([a-z-]+)/cli_cinder_scheduling.html /$1/cli-cinder-scheduling.html
+redirectmatch 301 ^/([a-z-]+)/cli_keystone_manage_services.html /$1/cli-keystone-manage-services.html
+redirectmatch 301 ^/([a-z-]+)/cli_manage_flavors.html /$1/cli-manage-flavors.html
+redirectmatch 301 ^/([a-z-]+)/cli_manage_projects_users_and_roles.html /$1/cli-manage-projects-users-and-roles.html
+redirectmatch 301 ^/([a-z-]+)/cli_manage_services.html /$1/cli-manage-services.html
+redirectmatch 301 ^/([a-z-]+)/cli_manage_shares.html /$1/cli-manage-shares.html
+redirectmatch 301 ^/([a-z-]+)/cli_networking_advanced_quotas.html /$1/cli-networking-advanced-quotas.html
+redirectmatch 301 ^/([a-z-]+)/cli_nova_evacuate.html /$1/cli-nova-evacuate.html
+redirectmatch 301 ^/([a-z-]+)/cli_nova_manage_projects_security.html /$1/cli-nova-manage-projects-security.html
+redirectmatch 301 ^/([a-z-]+)/cli_nova_manage_services.html /$1/cli-nova-manage-services.html
+redirectmatch 301 ^/([a-z-]+)/cli_nova_migrate.html /$1/cli-nova-migrate.html
+redirectmatch 301 ^/([a-z-]+)/cli_nova_migrate_cfg_ssh.html /$1/cli-nova-migrate-cfg-ssh.html
+redirectmatch 301 ^/([a-z-]+)/cli_nova_numa_libvirt.html /$1/cli-nova-numa-libvirt.html
+redirectmatch 301 ^/([a-z-]+)/cli_nova_specify_host.html /$1/cli-nova-specify-host.html
+redirectmatch 301 ^/([a-z-]+)/cli_set_compute_quotas.html /$1/cli-set-compute-quotas.html
+redirectmatch 301 ^/([a-z-]+)/cli_set_quotas.html /$1/cli-set-quotas.html
+redirectmatch 301 ^/([a-z-]+)/compute_arch.html /$1/compute-arch.html
+redirectmatch 301 ^/([a-z-]+)/cross_project.html /$1/cross-project.html
+redirectmatch 301 ^/([a-z-]+)/cross_project_cors.html /$1/cross-project-cors.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_admin_manage_roles.html /$1/dashboard-admin-manage-roles.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_admin_manage_stacks.html /$1/dashboard-admin-manage-stacks.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_manage_flavors.html /$1/dashboard-manage-flavors.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_manage_host_aggregates.html /$1/dashboard-manage-host-aggregates.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_manage_images.html /$1/dashboard-manage-images.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_manage_instances.html /$1/dashboard-manage-instances.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_manage_resources.html /$1/dashboard-manage-resources.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_manage_services.html /$1/dashboard-manage-services.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_manage_shares.html /$1/dashboard-manage-shares.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_manage_volumes.html /$1/dashboard-manage-volumes.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_sessions.html /$1/dashboard-sessions.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_set_quotas.html /$1/dashboard-set-quotas.html
+redirectmatch 301 ^/([a-z-]+)/dashboard_view_cloud_resources.html /$1/dashboard-view-cloud-resources.html
+redirectmatch 301 ^/([a-z-]+)/identity_auth_token_middleware.html /$1/identity-auth-token-middleware.html
+redirectmatch 301 ^/([a-z-]+)/identity_concepts.html /$1/identity-concepts.html
+redirectmatch 301 ^/([a-z-]+)/identity_keystone_usage_and_features.html /$1/identity-keystone-usage-and-features.html
+redirectmatch 301 ^/([a-z-]+)/identity_management.html /$1/identity-management.html
+redirectmatch 301 ^/([a-z-]+)/identity_service_api_protection.html /$1/identity-service-api-protection.html
+redirectmatch 301 ^/([a-z-]+)/identity_start.html /$1/identity-start.html
+redirectmatch 301 ^/([a-z-]+)/identity_troubleshoot.html /$1/identity-troubleshoot.html
+redirectmatch 301 ^/([a-z-]+)/keystone_caching_layer.html /$1/keystone-caching-layer.html
+redirectmatch 301 ^/([a-z-]+)/keystone_certificates_for_pki.html /$1/keystone-certificates-for-pki.html
+redirectmatch 301 ^/([a-z-]+)/keystone_configure_with_SSL.html /$1/keystone-configure-with-SSL.html
+redirectmatch 301 ^/([a-z-]+)/keystone_domain_specific_config.html /$1/keystone-domain-specific-config.html
+redirectmatch 301 ^/([a-z-]+)/keystone_external_authentication.html /$1/keystone-external-authentication.html
+redirectmatch 301 ^/([a-z-]+)/keystone_fernet_token_faq.html /$1/keystone-fernet-token-faq.html
+redirectmatch 301 ^/([a-z-]+)/keystone_integrate_assignment_backend_ldap.html /$1/keystone-integrate-assignment-backend-ldap.html
+redirectmatch 301 ^/([a-z-]+)/keystone_integrate_identity_backend_ldap.html /$1/keystone-integrate-identity-backend-ldap.html
+redirectmatch 301 ^/([a-z-]+)/keystone_integrate_with_ldap.html /$1/keystone-integrate-with-ldap.html
+redirectmatch 301 ^/([a-z-]+)/keystone_secure_identity_to_ldap_backend.html /$1/keystone-secure-identity-to-ldap-backend.html
+redirectmatch 301 ^/([a-z-]+)/keystone_token-binding.html /$1/keystone-token-binding.html
+redirectmatch 301 ^/([a-z-]+)/keystone_tokens.html /$1/keystone-tokens.html
+redirectmatch 301 ^/([a-z-]+)/keystone_use_trusts.html /$1/keystone-use-trusts.html
+redirectmatch 301 ^/([a-z-]+)/networking_adv-config.html /$1/networking-adv-config.html
+redirectmatch 301 ^/([a-z-]+)/networking_adv-features.html /$1/networking-adv-features.html
+redirectmatch 301 ^/([a-z-]+)/networking_adv-operational-features.html /$1/networking-adv-operational-features.html
+redirectmatch 301 ^/([a-z-]+)/networking_arch.html /$1/networking-arch.html
+redirectmatch 301 ^/([a-z-]+)/networking_auth.html /$1/networking-auth.html
+redirectmatch 301 ^/([a-z-]+)/networking_config-agents.html /$1/networking-config-agents.html
+redirectmatch 301 ^/([a-z-]+)/networking_config-identity.html /$1/networking-config-identity.html
+redirectmatch 301 ^/([a-z-]+)/networking_config-plugins.html /$1/networking-config-plugins.html
+redirectmatch 301 ^/([a-z-]+)/networking_introduction.html /$1/networking-introduction.html
+redirectmatch 301 ^/([a-z-]+)/networking_multi-dhcp-agents.html /$1/networking-multi-dhcp-agents.html
+redirectmatch 301 ^/([a-z-]+)/networking_use.html /$1/networking-use.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_account_reaper.html /$1/objectstorage-account-reaper.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_arch.html /$1/objectstorage-arch.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_auditors.html /$1/objectstorage-auditors.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_characteristics.html /$1/objectstorage-characteristics.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_components.html /$1/objectstorage-components.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_EC.html /$1/objectstorage-EC.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_features.html /$1/objectstorage-features.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_intro.html /$1/objectstorage-intro.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_large-objects.html /$1/objectstorage-large-objects.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_replication.html /$1/objectstorage-replication.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_ringbuilder.html /$1/objectstorage-ringbuilder.html
+redirectmatch 301 ^/([a-z-]+)/objectstorage_tenant_specific_image_storage.html /$1/objectstorage-tenant-specific-image-storage.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems.html /$1/shared-file-systems.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_cgroups.html /$1/shared-file-systems-cgroups.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_crud_share.html /$1/shared-file-systems-crud-share.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_intro.html /$1/shared-file-systems-intro.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_key_concepts.html /$1/shared-file-systems-key-concepts.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_manage_and_unmanage_share.html /$1/shared-file-systems-manage-and-unmanage-share.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_manage_shares_cli.html /$1/shared-file-systems-manage-shares-cli.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_multi_backend.html /$1/shared-file-systems-multi-backend.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_network_plugins.html /$1/shared-file-systems-network-plugins.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_networking.html /$1/shared-file-systems-networking.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_quotas.html /$1/shared-file-systems-quotas.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_scheduling.html /$1/shared-file-systems-scheduling.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_security_services.html /$1/shared-file-systems-security-services.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_services_manage.html /$1/shared-file-systems-services-manage.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_share_management.html /$1/shared-file-systems-share-management.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_share_networks.html /$1/shared-file-systems-share-networks.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_share_replication.html /$1/shared-file-systems-share-replication.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_share_resize.html /$1/shared-file-systems-share-resize.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_share_types.html /$1/shared-file-systems-share-types.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_snapshots.html /$1/shared-file-systems-snapshots.html
+redirectmatch 301 ^/([a-z-]+)/shared_file_systems_troubleshoot.html /$1/shared-file-systems-troubleshoot.html
+redirectmatch 301 ^/([a-z-]+)/ts_cinder_config.html /$1/ts-cinder-config.html
+redirectmatch 301 ^/([a-z-]+)/ts_multipath_warn.html /$1/ts-multipath-warn.html
+redirectmatch 301 ^/([a-z-]+)/ts_no_emulator_x86_64.html /$1/ts-no-emulator-x86-64.html
+redirectmatch 301 ^/([a-z-]+)/ts_non_existent_host.html /$1/ts-non-existent-host.html
+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
+
 # 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