Merge "[admin-guide] Rename RST files to use hyphen instead of underbar"

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

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

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

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

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

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

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

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:
 

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
 

doc/admin-guide/source/cross-project-cors.rst

@@ -1,4 +1,4 @@
-.. _cross_project:
+.. _cross-project:
 
 =============================
 Cross-origin resource sharing

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

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::
 

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

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>`_.

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>`__.

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
 ~~~~~~

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

doc/admin-guide/source/identity_management.rst

@@ -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

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
 ~~~~~~~~

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

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`.

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