From 788b49f5541ce81194f060983bc0e8741598f8b9 Mon Sep 17 00:00:00 2001
From: Olena Logvinova <ologvinova@mirantis.com>
Date: Tue, 9 Aug 2016 20:46:53 +0300
Subject: [PATCH] [ops-guide] Changed underscore to hyphen in RST files

This patch:

- renames all the RST files in the ops-guide folder to use a
  hyphen instead of underscore;
- adds redirects to the renamed files to .htacces;
- removes /([a-z-]+) from Admin Guide redirects in .htacces.

Change-Id: I4c35a4c89ae9900a2e9bfe1a7a3bcb94ab72454b
Implements: blueprint consistency-file-rename
---
 doc/admin-guide/source/blockstorage.rst       |  2 +-
 doc/admin-guide/source/cli-manage-flavors.rst |  2 +-
 .../source/compute-networking-nova.rst        |  2 +-
 .../high-availability.rst                     |  2 +-
 ...operator-requirements-quota-management.rst |  2 +-
 .../operator-requirements-upgrades.rst        |  2 +-
 ...hnical-requirements-logging-monitoring.rst |  2 +-
 .../source/capacity-planning-scaling.rst      | 10 ++--
 .../source/design-compute.rst                 |  4 +-
 .../source/design-control-plane.rst           |  2 +-
 ...compute-focus-technical-considerations.rst |  6 +--
 ...eneralpurpose-technical-considerations.rst |  2 +-
 .../multi-site-operational-considerations.rst |  6 +--
 doc/arch-design/source/references.rst         |  4 +-
 doc/install-guide/source/keystone-users.rst   |  2 +-
 .../source/launch-instance-provider.rst       |  2 +-
 .../source/launch-instance-selfservice.rst    |  2 +-
 .../locale/fr/LC_MESSAGES/install-guide.po    |  4 +-
 .../locale/id/LC_MESSAGES/install-guide.po    |  8 +--
 .../locale/ja/LC_MESSAGES/install-guide.po    |  8 +--
 .../locale/ko_KR/LC_MESSAGES/install-guide.po |  4 +-
 .../source/{app_crypt.rst => app-crypt.rst}   |  0
 .../{app_resources.rst => app-resources.rst}  |  0
 .../{app_roadmaps.rst => app-roadmaps.rst}    |  4 +-
 .../{app_usecases.rst => app-usecases.rst}    |  0
 ...ntroller.rst => arch-cloud-controller.rst} |  2 +-
 ...mpute_nodes.rst => arch-compute-nodes.rst} |  6 +--
 ...e_neutron.rst => arch-example-neutron.rst} |  0
 ...work.rst => arch-example-nova-network.rst} |  4 +-
 ...thoughts.rst => arch-example-thoughts.rst} |  2 +-
 .../{arch_examples.rst => arch-examples.rst}  |  6 +--
 ...ork_design.rst => arch-network-design.rst} |  0
 ...{arch_provision.rst => arch-provision.rst} |  0
 .../{arch_scaling.rst => arch-scaling.rst}    | 10 ++--
 .../{arch_storage.rst => arch-storage.rst}    |  0
 doc/ops-guide/source/architecture.rst         | 14 ++---
 doc/ops-guide/source/index.rst                |  8 +--
 doc/ops-guide/source/operations.rst           | 20 +++----
 ...ion.rst => ops-advanced-configuration.rst} |  0
 ...p_recovery.rst => ops-backup-recovery.rst} |  0
 ..._compute.rst => ops-customize-compute.rst} |  0
 ...usion.rst => ops-customize-conclusion.rst} |  0
 ...hboard.rst => ops-customize-dashboard.rst} |  0
 ...ment.rst => ops-customize-development.rst} |  0
 ...ge.rst => ops-customize-objectstorage.rst} |  0
 .../{ops_customize.rst => ops-customize.rst}  | 10 ++--
 ...f_the_land.rst => ops-lay-of-the-land.rst} |  0
 ...rst => ops-logging-monitoring-summary.rst} |  0
 ...itoring.rst => ops-logging-monitoring.rst} |  6 +--
 ...ng_rsyslog.rst => ops-logging-rsyslog.rst} |  0
 .../{ops_logging.rst => ops-logging.rst}      |  2 +-
 ...plete.rst => ops-maintenance-complete.rst} |  0
 ...ompute.rst => ops-maintenance-compute.rst} |  0
 ....rst => ops-maintenance-configuration.rst} |  0
 ...ler.rst => ops-maintenance-controller.rst} |  2 +-
 ...abase.rst => ops-maintenance-database.rst} |  0
 ...mine.rst => ops-maintenance-determine.rst} |  2 +-
 ...dware.rst => ops-maintenance-hardware.rst} |  0
 ...ce_hdmwy.rst => ops-maintenance-hdmwy.rst} |  0
 ...bitmq.rst => ops-maintenance-rabbitmq.rst} |  0
 ...ance_slow.rst => ops-maintenance-slow.rst} |  0
 ...torage.rst => ops-maintenance-storage.rst} |  0
 doc/ops-guide/source/ops-maintenance.rst      | 23 ++++++++
 ...{ops_monitoring.rst => ops-monitoring.rst} |  0
 ...ng.rst => ops-network-troubleshooting.rst} |  0
 ...ary.rst => ops-projects-users-summary.rst} |  0
 ...jects_users.rst => ops-projects-users.rst} |  8 +--
 .../{ops_projects.rst => ops-projects.rst}    |  0
 .../source/{ops_quotas.rst => ops-quotas.rst} |  0
 .../{ops_uninstall.rst => ops-uninstall.rst}  |  0
 .../{ops_upgrades.rst => ops-upgrades.rst}    |  0
 ...ons.rst => ops-user-facing-operations.rst} |  0
 .../source/{ops_users.rst => ops-users.rst}   |  0
 doc/ops-guide/source/ops_maintenance.rst      | 23 --------
 doc/ops-guide/source/preface.rst              | 44 ++++++++--------
 www/static/.htaccess                          | 52 +++++++++++++++++++
 76 files changed, 189 insertions(+), 137 deletions(-)
 rename doc/ops-guide/source/{app_crypt.rst => app-crypt.rst} (100%)
 rename doc/ops-guide/source/{app_resources.rst => app-resources.rst} (100%)
 rename doc/ops-guide/source/{app_roadmaps.rst => app-roadmaps.rst} (99%)
 rename doc/ops-guide/source/{app_usecases.rst => app-usecases.rst} (100%)
 rename doc/ops-guide/source/{arch_cloud_controller.rst => arch-cloud-controller.rst} (99%)
 rename doc/ops-guide/source/{arch_compute_nodes.rst => arch-compute-nodes.rst} (98%)
 rename doc/ops-guide/source/{arch_example_neutron.rst => arch-example-neutron.rst} (100%)
 rename doc/ops-guide/source/{arch_example_nova_network.rst => arch-example-nova-network.rst} (99%)
 rename doc/ops-guide/source/{arch_example_thoughts.rst => arch-example-thoughts.rst} (95%)
 rename doc/ops-guide/source/{arch_examples.rst => arch-examples.rst} (92%)
 rename doc/ops-guide/source/{arch_network_design.rst => arch-network-design.rst} (100%)
 rename doc/ops-guide/source/{arch_provision.rst => arch-provision.rst} (100%)
 rename doc/ops-guide/source/{arch_scaling.rst => arch-scaling.rst} (98%)
 rename doc/ops-guide/source/{arch_storage.rst => arch-storage.rst} (100%)
 rename doc/ops-guide/source/{ops_advanced_configuration.rst => ops-advanced-configuration.rst} (100%)
 rename doc/ops-guide/source/{ops_backup_recovery.rst => ops-backup-recovery.rst} (100%)
 rename doc/ops-guide/source/{ops_customize_compute.rst => ops-customize-compute.rst} (100%)
 rename doc/ops-guide/source/{ops_customize_conclusion.rst => ops-customize-conclusion.rst} (100%)
 rename doc/ops-guide/source/{ops_customize_dashboard.rst => ops-customize-dashboard.rst} (100%)
 rename doc/ops-guide/source/{ops_customize_development.rst => ops-customize-development.rst} (100%)
 rename doc/ops-guide/source/{ops_customize_objectstorage.rst => ops-customize-objectstorage.rst} (100%)
 rename doc/ops-guide/source/{ops_customize.rst => ops-customize.rst} (91%)
 rename doc/ops-guide/source/{ops_lay_of_the_land.rst => ops-lay-of-the-land.rst} (100%)
 rename doc/ops-guide/source/{ops_logging_monitoring_summary.rst => ops-logging-monitoring-summary.rst} (100%)
 rename doc/ops-guide/source/{ops_logging_monitoring.rst => ops-logging-monitoring.rst} (80%)
 rename doc/ops-guide/source/{ops_logging_rsyslog.rst => ops-logging-rsyslog.rst} (100%)
 rename doc/ops-guide/source/{ops_logging.rst => ops-logging.rst} (99%)
 rename doc/ops-guide/source/{ops_maintenance_complete.rst => ops-maintenance-complete.rst} (100%)
 rename doc/ops-guide/source/{ops_maintenance_compute.rst => ops-maintenance-compute.rst} (100%)
 rename doc/ops-guide/source/{ops_maintenance_configuration.rst => ops-maintenance-configuration.rst} (100%)
 rename doc/ops-guide/source/{ops_maintenance_controller.rst => ops-maintenance-controller.rst} (99%)
 rename doc/ops-guide/source/{ops_maintenance_database.rst => ops-maintenance-database.rst} (100%)
 rename doc/ops-guide/source/{ops_maintenance_determine.rst => ops-maintenance-determine.rst} (98%)
 rename doc/ops-guide/source/{ops_maintenance_hardware.rst => ops-maintenance-hardware.rst} (100%)
 rename doc/ops-guide/source/{ops_maintenance_hdmwy.rst => ops-maintenance-hdmwy.rst} (100%)
 rename doc/ops-guide/source/{ops_maintenance_rabbitmq.rst => ops-maintenance-rabbitmq.rst} (100%)
 rename doc/ops-guide/source/{ops_maintenance_slow.rst => ops-maintenance-slow.rst} (100%)
 rename doc/ops-guide/source/{ops_maintenance_storage.rst => ops-maintenance-storage.rst} (100%)
 create mode 100644 doc/ops-guide/source/ops-maintenance.rst
 rename doc/ops-guide/source/{ops_monitoring.rst => ops-monitoring.rst} (100%)
 rename doc/ops-guide/source/{ops_network_troubleshooting.rst => ops-network-troubleshooting.rst} (100%)
 rename doc/ops-guide/source/{ops_projects_users_summary.rst => ops-projects-users-summary.rst} (100%)
 rename doc/ops-guide/source/{ops_projects_users.rst => ops-projects-users.rst} (93%)
 rename doc/ops-guide/source/{ops_projects.rst => ops-projects.rst} (100%)
 rename doc/ops-guide/source/{ops_quotas.rst => ops-quotas.rst} (100%)
 rename doc/ops-guide/source/{ops_uninstall.rst => ops-uninstall.rst} (100%)
 rename doc/ops-guide/source/{ops_upgrades.rst => ops-upgrades.rst} (100%)
 rename doc/ops-guide/source/{ops_user_facing_operations.rst => ops-user-facing-operations.rst} (100%)
 rename doc/ops-guide/source/{ops_users.rst => ops-users.rst} (100%)
 delete mode 100644 doc/ops-guide/source/ops_maintenance.rst

diff --git a/doc/admin-guide/source/blockstorage.rst b/doc/admin-guide/source/blockstorage.rst
index c7c7b649fe..3414d7aa10 100644
--- a/doc/admin-guide/source/blockstorage.rst
+++ b/doc/admin-guide/source/blockstorage.rst
@@ -28,5 +28,5 @@ Amazon EC2 Elastic Block Storage (EBS) offering.
    blockstorage-manage-volumes.rst
    blockstorage-troubleshoot.rst
 
-.. _`Storage Decisions`: http://docs.openstack.org/ops-guide/arch_storage.html
+.. _`Storage Decisions`: http://docs.openstack.org/ops-guide/arch-storage.html
 .. _`OpenStack Operations Guide`: http://docs.openstack.org/ops-guide/
diff --git a/doc/admin-guide/source/cli-manage-flavors.rst b/doc/admin-guide/source/cli-manage-flavors.rst
index a6d4bef04f..c017170b4b 100644
--- a/doc/admin-guide/source/cli-manage-flavors.rst
+++ b/doc/admin-guide/source/cli-manage-flavors.rst
@@ -122,7 +122,7 @@ Create a flavor
    flavor that you do not want other tenants to have access to,
    you can change the flavor's access to make it a private flavor.
    See
-   `Private Flavors in the OpenStack Operations Guide <http://docs.openstack.org/ops-guide/ops_user_facing_operations.html#private-flavors>`_.
+   `Private Flavors in the OpenStack Operations Guide <http://docs.openstack.org/ops-guide/ops-user-facing-operations.html#private-flavors>`_.
 
    For a list of optional parameters, run this command:
 
diff --git a/doc/admin-guide/source/compute-networking-nova.rst b/doc/admin-guide/source/compute-networking-nova.rst
index c95cd26ddb..c77f8ca02b 100644
--- a/doc/admin-guide/source/compute-networking-nova.rst
+++ b/doc/admin-guide/source/compute-networking-nova.rst
@@ -135,7 +135,7 @@ compute node runs its own ``nova-network`` service. In both cases, all
 traffic between VMs and the internet flows through ``nova-network``. Each
 mode has benefits and drawbacks. For more on this, see the Network
 Topology section in the `OpenStack Operations Guide
-<http://docs.openstack.org/ops-guide/arch_network_design.html#network-topology>`__.
+<http://docs.openstack.org/ops-guide/arch-network-design.html#network-topology>`__.
 
 All networking options require network connectivity to be already set up
 between OpenStack physical nodes. OpenStack does not configure any
diff --git a/doc/arch-design-draft/source/arch-guide-draft-mitaka/high-availability.rst b/doc/arch-design-draft/source/arch-guide-draft-mitaka/high-availability.rst
index 53005accd3..6289ff4a50 100644
--- a/doc/arch-design-draft/source/arch-guide-draft-mitaka/high-availability.rst
+++ b/doc/arch-design-draft/source/arch-guide-draft-mitaka/high-availability.rst
@@ -79,7 +79,7 @@ extensible OpenStack Networking (neutron). OpenStack Networking and legacy
 networking both have their advantages and disadvantages. They are both valid
 and supported options that fit different network deployment models described in
 the `OpenStack Operations Guide
-<http://docs.openstack.org/ops-guide/arch_network_design.html#network-topology>`_.
+<http://docs.openstack.org/ops-guide/arch-network-design.html#network-topology>`_.
 
 When using the Networking service, the OpenStack controller servers or separate
 Networking hosts handle routing unless the dynamic virtual routers pattern for
diff --git a/doc/arch-design-draft/source/arch-guide-draft-mitaka/operator-requirements-quota-management.rst b/doc/arch-design-draft/source/arch-guide-draft-mitaka/operator-requirements-quota-management.rst
index dcba50f5dd..dc61228346 100644
--- a/doc/arch-design-draft/source/arch-guide-draft-mitaka/operator-requirements-quota-management.rst
+++ b/doc/arch-design-draft/source/arch-guide-draft-mitaka/operator-requirements-quota-management.rst
@@ -20,5 +20,5 @@ launch more than 25 instances in any single region.
 
 For more information on managing quotas refer to the `Managing projects
 and users
-chapter <http://docs.openstack.org/ops-guide/ops_projects_users.html>`__
+chapter <http://docs.openstack.org/ops-guide/ops-projects-users.html>`__
 of the OpenStack Operators Guide.
diff --git a/doc/arch-design-draft/source/arch-guide-draft-mitaka/operator-requirements-upgrades.rst b/doc/arch-design-draft/source/arch-guide-draft-mitaka/operator-requirements-upgrades.rst
index 4c4663cf2c..9a918d619e 100644
--- a/doc/arch-design-draft/source/arch-guide-draft-mitaka/operator-requirements-upgrades.rst
+++ b/doc/arch-design-draft/source/arch-guide-draft-mitaka/operator-requirements-upgrades.rst
@@ -15,7 +15,7 @@ independent OpenStack installations which are linked together using
 shared centralized services such as OpenStack Identity. At a high level
 the recommended order of operations to upgrade an individual OpenStack
 environment is (see the `Upgrades
-chapter <http://docs.openstack.org/ops-guide/ops_upgrades.html>`_
+chapter <http://docs.openstack.org/ops-guide/ops-upgrades.html>`_
 of the OpenStack Operations Guide for details):
 
 #. Upgrade the OpenStack Identity service (keystone).
diff --git a/doc/arch-design-draft/source/arch-guide-draft-mitaka/technical-requirements-logging-monitoring.rst b/doc/arch-design-draft/source/arch-guide-draft-mitaka/technical-requirements-logging-monitoring.rst
index 06e070ecea..d4198a3131 100644
--- a/doc/arch-design-draft/source/arch-guide-draft-mitaka/technical-requirements-logging-monitoring.rst
+++ b/doc/arch-design-draft/source/arch-guide-draft-mitaka/technical-requirements-logging-monitoring.rst
@@ -18,7 +18,7 @@ Specific meters that are critically important to capture include:
 
 Logging and monitoring does not significantly differ for a multi-site OpenStack
 cloud. The tools described in the `Logging and monitoring chapter
-<http://docs.openstack.org/ops-guide/ops_logging_monitoring.html>`__ of
+<http://docs.openstack.org/ops-guide/ops-logging-monitoring.html>`__ of
 the Operations Guide remain applicable. Logging and monitoring can be provided
 on a per-site basis, and in a common centralized location.
 
diff --git a/doc/arch-design-draft/source/capacity-planning-scaling.rst b/doc/arch-design-draft/source/capacity-planning-scaling.rst
index 6bd6166bbf..ca85797f72 100644
--- a/doc/arch-design-draft/source/capacity-planning-scaling.rst
+++ b/doc/arch-design-draft/source/capacity-planning-scaling.rst
@@ -68,9 +68,9 @@ The starting point is the core count of your cloud. By applying
 some ratios, you can gather information about:
 
 -  The number of virtual machines (VMs) you expect to run,
-   ``((overcommit fraction × cores) / virtual cores per instance)``
+   ``((overcommit fraction × cores) / virtual cores per instance)``
 
--  How much storage is required ``(flavor disk size × number of instances)``
+-  How much storage is required ``(flavor disk size × number of instances)``
 
 You can use these ratios to determine how much additional infrastructure
 you need to support your cloud.
@@ -118,7 +118,7 @@ refreshes the list of VMs every 30 seconds.
 
 After you consider these factors, you can determine how many cloud
 controller cores you require. A typical eight core, 8 GB of RAM server
-is sufficient for up to a rack of compute nodes — given the above
+is sufficient for up to a rack of compute nodes — given the above
 caveats.
 
 You must also consider key hardware specifications for the performance
@@ -131,7 +131,7 @@ CPU performance (CPU/core).
 
    For a discussion of metric tracking, including how to extract
    metrics from your cloud, see the .`OpenStack Operations Guide
-   <http://docs.openstack.org/ops-guide/ops_logging_monitoring.html>`_.
+   <http://docs.openstack.org/ops-guide/ops-logging-monitoring.html>`_.
 
 Adding Cloud Controller Nodes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -417,7 +417,7 @@ nodes, a :term:`weight` should be specified that reflects the
 
 Monitoring the resource usage and user growth will enable you to know
 when to procure. The `Logging and Monitoring
-<http://docs.openstack.org/ops-guide/ops_logging_monitoring.html>`_
+<http://docs.openstack.org/ops-guide/ops-logging-monitoring.html>`_
 chapte in the Operations Guide details some useful metrics.
 
 Burn-in Testing
diff --git a/doc/arch-design-draft/source/design-compute.rst b/doc/arch-design-draft/source/design-compute.rst
index f32703b159..5e7bef2a7f 100644
--- a/doc/arch-design-draft/source/design-compute.rst
+++ b/doc/arch-design-draft/source/design-compute.rst
@@ -75,7 +75,7 @@ community experience.
 
 For example, KVM is the most widely adopted hypervisor in the OpenStack
 community. Besides KVM, more deployments run Xen, LXC, VMware, and
-Hyper-V than the others listed. However, each of these are lacking some
+Hyper-V than the others listed. However, each of these are lacking some
 feature support or the documentation on how to use them with OpenStack
 is out of date.
 
@@ -285,7 +285,7 @@ Logging
 ~~~~~~~
 
 Logging is described in more detail in `Logging and Monitoring
-<http://docs.openstack.org/ops-guide/ops_logging_monitoring.html>`_. However,
+<http://docs.openstack.org/ops-guide/ops-logging-monitoring.html>`_. However,
 it is an important design consideration to take into account before
 commencing operations of your cloud.
 
diff --git a/doc/arch-design-draft/source/design-control-plane.rst b/doc/arch-design-draft/source/design-control-plane.rst
index 95017900eb..9c9e8ca50f 100644
--- a/doc/arch-design-draft/source/design-control-plane.rst
+++ b/doc/arch-design-draft/source/design-control-plane.rst
@@ -372,7 +372,7 @@ OpenStack Identity provides authentication decisions and user attribute
 information, which is then used by the other OpenStack services to
 perform authorization. The policy is set in the ``policy.json`` file.
 For information on how to configure these, see `Managing Projects and Users
-<http://docs.openstack.org/ops-guide/ops_projects_users.html>`_ in the
+<http://docs.openstack.org/ops-guide/ops-projects-users.html>`_ in the
 OpenStack Operations Guide.
 
 OpenStack Identity supports different plug-ins for authentication
diff --git a/doc/arch-design/source/compute-focus-technical-considerations.rst b/doc/arch-design/source/compute-focus-technical-considerations.rst
index 2c179d4637..ebc858974b 100644
--- a/doc/arch-design/source/compute-focus-technical-considerations.rst
+++ b/doc/arch-design/source/compute-focus-technical-considerations.rst
@@ -38,10 +38,10 @@ equation of:
 
 * 1600 = (16 × (number of physical cores)) / 2
 
-* Storage required = 50 GB × 1600
+* Storage required = 50 GB × 1600
 
 On the surface, the equations reveal the need for 200 physical cores and
-80 TB of storage for ``/var/lib/nova/instances/``. However, it is also
+80 TB of storage for ``/var/lib/nova/instances/``. However, it is also
 important to look at patterns of usage to estimate the load that the API
 services, database servers, and queue servers are likely to encounter.
 
@@ -167,7 +167,7 @@ configuration, particularly where they present different ratios of CPU
 versus RAM versus HDD requirements.
 
 For more information on Flavors see `OpenStack Operations Guide:
-Flavors <http://docs.openstack.org/ops-guide/ops_user_facing_operations.html#flavors>`_.
+Flavors <http://docs.openstack.org/ops-guide/ops-user-facing-operations.html#flavors>`_.
 
 OpenStack components
 ~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/arch-design/source/generalpurpose-technical-considerations.rst b/doc/arch-design/source/generalpurpose-technical-considerations.rst
index 0ad8f9f7c6..2eb58397bb 100644
--- a/doc/arch-design/source/generalpurpose-technical-considerations.rst
+++ b/doc/arch-design/source/generalpurpose-technical-considerations.rst
@@ -522,7 +522,7 @@ case, the switching infrastructure must support L3 routing.
 OpenStack Networking and legacy networking both have their advantages
 and disadvantages. They are both valid and supported options that fit
 different network deployment models described in the
-`Networking deployment options table <http://docs.openstack.org/ops-guide/arch_network_design.html#network-topology>`
+`Networking deployment options table <http://docs.openstack.org/ops-guide/arch-network-design.html#network-topology>`
 of OpenStack Operations Guide.
 
 Ensure your deployment has adequate back-up capabilities.
diff --git a/doc/arch-design/source/multi-site-operational-considerations.rst b/doc/arch-design/source/multi-site-operational-considerations.rst
index 2c30dcaef3..440a4a0c58 100644
--- a/doc/arch-design/source/multi-site-operational-considerations.rst
+++ b/doc/arch-design/source/multi-site-operational-considerations.rst
@@ -48,7 +48,7 @@ Logging and monitoring
 
 Logging and monitoring does not significantly differ for a multi-site
 OpenStack cloud. The tools described in the `Logging and monitoring
-chapter <http://docs.openstack.org/ops-guide/ops_logging_monitoring.html>`__
+chapter <http://docs.openstack.org/ops-guide/ops-logging-monitoring.html>`__
 of the OpenStack Operations Guide remain applicable. Logging and monitoring
 can be provided on a per-site basis, and in a common centralized location.
 
@@ -64,7 +64,7 @@ independent OpenStack installations which are linked together using
 shared centralized services such as OpenStack Identity. At a high level
 the recommended order of operations to upgrade an individual OpenStack
 environment is (see the `Upgrades
-chapter <http://docs.openstack.org/ops-guide/ops_upgrades.html>`__
+chapter <http://docs.openstack.org/ops-guide/ops-upgrades.html>`__
 of the OpenStack Operations Guide for details):
 
 #. Upgrade the OpenStack Identity service (keystone).
@@ -119,7 +119,7 @@ launch more than 25 instances in any single region.
 
 For more information on managing quotas refer to the `Managing projects
 and users
-chapter <http://docs.openstack.org/ops-guide/ops_projects_users.html>`__
+chapter <http://docs.openstack.org/ops-guide/ops-projects-users.html>`__
 of the OpenStack Operators Guide.
 
 Policy management
diff --git a/doc/arch-design/source/references.rst b/doc/arch-design/source/references.rst
index 85513a67f7..5b668a80e1 100644
--- a/doc/arch-design/source/references.rst
+++ b/doc/arch-design/source/references.rst
@@ -28,7 +28,7 @@ characteristics to images.
 : Official LibGuestFS documentation.
 
 `Logging and Monitoring
-<http://docs.openstack.org/ops-guide/ops_logging_monitoring.html>`_
+<http://docs.openstack.org/ops-guide/ops-logging-monitoring.html>`_
 : Official OpenStack Operations documentation.
 
 `ManageIQ Cloud Management Platform <http://manageiq.org/>`_
@@ -47,7 +47,7 @@ and enable the delivery of the most efficient server,
 storage and data center hardware designs for scalable computing.
 
 `OpenStack Flavors
-<http://docs.openstack.org/ops-guide/ops_user_facing_operations.html#flavors>`_
+<http://docs.openstack.org/ops-guide/ops-user-facing-operations.html#flavors>`_
 : Official OpenStack documentation.
 
 `OpenStack High Availability Guide <http://docs.openstack.org/ha-guide/>`_
diff --git a/doc/install-guide/source/keystone-users.rst b/doc/install-guide/source/keystone-users.rst
index 98478186a1..9f3b7157fd 100644
--- a/doc/install-guide/source/keystone-users.rst
+++ b/doc/install-guide/source/keystone-users.rst
@@ -93,7 +93,7 @@ service. The authentication service uses a combination of :term:`domains
         OpenStack service. The default policy for most services grants
         administrative access to the ``admin`` role. For more information,
         see the `OpenStack Operations Guide - Managing Projects and
-        Users <http://docs.openstack.org/ops-guide/ops_projects_users.html>`__.
+        Users <http://docs.openstack.org/ops-guide/ops-projects-users.html>`__.
 
 #. This guide uses a service project that contains a unique user for each
    service that you add to your environment. Create the ``service``
diff --git a/doc/install-guide/source/launch-instance-provider.rst b/doc/install-guide/source/launch-instance-provider.rst
index 051bacbb6d..e0a1b08f8b 100644
--- a/doc/install-guide/source/launch-instance-provider.rst
+++ b/doc/install-guide/source/launch-instance-provider.rst
@@ -242,7 +242,7 @@ Access the instance remotely
 
 If your instance does not launch or seem to work as you expect, see the
 `Instance Boot Failures
-<http://docs.openstack.org/ops-guide/ops_maintenance_compute.html#instances>`__
+<http://docs.openstack.org/ops-guide/ops-maintenance-compute.html#instances>`__
 section in OpenStack Operations Guide for more information or use one of
 the :doc:`many other options <common/app-support>`
 to seek assistance. We want your first installation to work!
diff --git a/doc/install-guide/source/launch-instance-selfservice.rst b/doc/install-guide/source/launch-instance-selfservice.rst
index b5db8bdaf1..11d475edd8 100644
--- a/doc/install-guide/source/launch-instance-selfservice.rst
+++ b/doc/install-guide/source/launch-instance-selfservice.rst
@@ -266,7 +266,7 @@ Access the instance remotely
 
 If your instance does not launch or seem to work as you expect, see the
 `Instance Boot Failures
-<http://docs.openstack.org/ops-guide/ops_maintenance_compute.html#instances>`__
+<http://docs.openstack.org/ops-guide/ops-maintenance-compute.html#instances>`__
 section in OpenStack Operations Guide for more information or use one of
 the :doc:`many other options <common/app-support>`
 to seek assistance. We want your first installation to work!
diff --git a/doc/install-guide/source/locale/fr/LC_MESSAGES/install-guide.po b/doc/install-guide/source/locale/fr/LC_MESSAGES/install-guide.po
index 727aa62723..7b541bcdda 100644
--- a/doc/install-guide/source/locale/fr/LC_MESSAGES/install-guide.po
+++ b/doc/install-guide/source/locale/fr/LC_MESSAGES/install-guide.po
@@ -374,14 +374,14 @@ msgid ""
 "default policy for most services grants administrative access to the "
 "``admin`` role. For more information, see the `OpenStack Operations Guide - "
 "Managing Projects and Users <http://docs.openstack.org/ops-guide/"
-"ops_projects_users.html>`__."
+"ops-projects-users.html>`__."
 msgstr ""
 "Tous les rôles que vous créez doivent correspondre aux rôles spécifiés dans "
 "le fichier ``policy.json`` dans le répertoire des fichiers de configuration "
 "de chaque service OpenStack. La politique par défaut pour la plupart des "
 "services accorde des accès administratifs au rôle ``admin``. Pour plus "
 "d'informations, voir le `Guide des Opérations OpenStack - Gérer les Projets "
-"et les Utilisateurs <http://docs.openstack.org/ops-guide/ops_projects_users."
+"et les Utilisateurs <http://docs.openstack.org/ops-guide/ops-projects-users."
 "html>`__."
 
 msgid "Appendix"
diff --git a/doc/install-guide/source/locale/id/LC_MESSAGES/install-guide.po b/doc/install-guide/source/locale/id/LC_MESSAGES/install-guide.po
index e0995c50ea..2736d1ae72 100644
--- a/doc/install-guide/source/locale/id/LC_MESSAGES/install-guide.po
+++ b/doc/install-guide/source/locale/id/LC_MESSAGES/install-guide.po
@@ -417,14 +417,14 @@ msgid ""
 "default policy for most services grants administrative access to the "
 "``admin`` role. For more information, see the `OpenStack Operations Guide - "
 "Managing Projects and Users <http://docs.openstack.org/ops-guide/"
-"ops_projects_users.html>`__."
+"ops-projects-users.html>`__."
 msgstr ""
 "Apa peran yang Anda buat harus memetakan peran yang ditentukan dalam `` "
 "berkas policy.json`` di direktori file konfigurasi setiap layanan OpenStack. "
 "Kebijakan default untuk sebagian besar layanan memberikan akses "
 "administratif untuk `` peran admin``. Untuk informasi lebih lanjut, lihat "
 "`Panduan OpenStack Operasi - Managing Proyek dan Pengguna <http://docs."
-"openstack.org/ops-guide/ops_projects_users.html>` __."
+"openstack.org/ops-guide/ops-projects-users.html>` __."
 
 msgid "Appendix"
 msgstr "Appendix"
@@ -2003,14 +2003,14 @@ msgstr ""
 msgid ""
 "If your instance does not launch or seem to work as you expect, see the "
 "`Instance Boot Failures <http://docs.openstack.org/ops-guide/"
-"ops_maintenance_compute.html#instances>`__ section in OpenStack Operations "
+"ops-maintenance-compute.html#instances>`__ section in OpenStack Operations "
 "Guide for more information or use one of the :doc:`many other options "
 "<common/app-support>` to seek assistance. We want your first installation to "
 "work!"
 msgstr ""
 "Jika misalnya Anda tidak memulai atau tampaknya bekerja seperti yang Anda "
 "harapkan, melihat `Kegagalan Instance Boot <http://docs.openstack.org/ops-"
-"guide/ops_maintenance_compute.html#instances>` __ bagian di Panduan "
+"guide/ops-maintenance-compute.html#instances>` __ bagian di Panduan "
 "OpenStack Operasi untuk lebih informasi atau menggunakan salah satu: doc: "
 "`banyak pilihan lain <umum / app-support>` untuk mencari bantuan. Kami ingin "
 "instalasi pertama Anda untuk bekerja!"
diff --git a/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po b/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
index d248954a03..cef31295f3 100644
--- a/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
+++ b/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
@@ -433,13 +433,13 @@ msgid ""
 "default policy for most services grants administrative access to the "
 "``admin`` role. For more information, see the `OpenStack Operations Guide - "
 "Managing Projects and Users <http://docs.openstack.org/ops-guide/"
-"ops_projects_users.html>`__."
+"ops-projects-users.html>`__."
 msgstr ""
 "作成したロールは、各 OpenStack サービスの設定ファイルディレクトリーにある "
 "``policy.json`` ファイルに指定されたロールに対応している必要があります。ほと"
 "んどのサービスに対するデフォルトのポリシーでは、管理アクセス権が ``admin`` "
 "ロールに付与されています。詳細は、`OpenStack Operations Guide - Managing "
-"Projects and Users <http://docs.openstack.org/ops-guide/ops_projects_users."
+"Projects and Users <http://docs.openstack.org/ops-guide/ops-projects-users."
 "html>`__ を参照してください。"
 
 msgid "Appendix"
@@ -2075,14 +2075,14 @@ msgstr ""
 msgid ""
 "If your instance does not launch or seem to work as you expect, see the "
 "`Instance Boot Failures <http://docs.openstack.org/ops-guide/"
-"ops_maintenance_compute.html#instances>`__ section in OpenStack Operations "
+"ops-maintenance-compute.html#instances>`__ section in OpenStack Operations "
 "Guide for more information or use one of the :doc:`many other options "
 "<common/app-support>` to seek assistance. We want your first installation to "
 "work!"
 msgstr ""
 "インスタンスが起動しない場合や期待通り動作しない場合、詳細は OpenStack "
 "Operations Guide の `Instance Boot Failures <http://docs.openstack.org/ops-"
-"guide/ops_maintenance_compute.html#instances>`__ セクションを参照してくださ"
+"guide/ops-maintenance-compute.html#instances>`__ セクションを参照してくださ"
 "い。または、支援を得るために :doc:`他の多くの方法 <common/app-support>` を利"
 "用してください。はじめてのインストール環境が正しく動作することを期待していま"
 "す。"
diff --git a/doc/install-guide/source/locale/ko_KR/LC_MESSAGES/install-guide.po b/doc/install-guide/source/locale/ko_KR/LC_MESSAGES/install-guide.po
index c29c4737c5..143b18c0ba 100644
--- a/doc/install-guide/source/locale/ko_KR/LC_MESSAGES/install-guide.po
+++ b/doc/install-guide/source/locale/ko_KR/LC_MESSAGES/install-guide.po
@@ -437,13 +437,13 @@ msgid ""
 "default policy for most services grants administrative access to the "
 "``admin`` role. For more information, see the `OpenStack Operations Guide - "
 "Managing Projects and Users <http://docs.openstack.org/ops-guide/"
-"ops_projects_users.html>`__."
+"ops-projects-users.html>`__."
 msgstr ""
 "생성하는 모든 역할은 각 OpenStack 서비스에 대한 구성 파일 디렉토리 내에 있는 "
 "``policy.json`` 에 명시된 역할과 연결되어야 합니다. 대부분의 서비스에 대한 디"
 "폴트 정책은 ``admin`` 역할에 대해 관리 액세스를 부여하는 것입니다. 보다 자세"
 "한 정보는 `OpenStack Operations Guide - Managing Projects and Users <http://"
-"docs.openstack.org/ops-guide/ops_projects_users.html>`__ 를 살펴봅니다."
+"docs.openstack.org/ops-guide/ops-projects-users.html>`__ 를 살펴봅니다."
 
 # auto translated by TM merge from project: openstack-manuals, version: stable-mitaka, DocId: doc/install-guide/source/locale/install-guide
 msgid "Appendix"
diff --git a/doc/ops-guide/source/app_crypt.rst b/doc/ops-guide/source/app-crypt.rst
similarity index 100%
rename from doc/ops-guide/source/app_crypt.rst
rename to doc/ops-guide/source/app-crypt.rst
diff --git a/doc/ops-guide/source/app_resources.rst b/doc/ops-guide/source/app-resources.rst
similarity index 100%
rename from doc/ops-guide/source/app_resources.rst
rename to doc/ops-guide/source/app-resources.rst
diff --git a/doc/ops-guide/source/app_roadmaps.rst b/doc/ops-guide/source/app-roadmaps.rst
similarity index 99%
rename from doc/ops-guide/source/app_roadmaps.rst
rename to doc/ops-guide/source/app-roadmaps.rst
index c02fa3cb05..e6dac5ada7 100644
--- a/doc/ops-guide/source/app_roadmaps.rst
+++ b/doc/ops-guide/source/app-roadmaps.rst
@@ -219,7 +219,7 @@ The roadmap for the next release as it is developed can be seen at
 
 To determine the potential features going in to future releases, or to
 look at features implemented previously, take a look at the existing
-blueprints such as  `OpenStack Compute (nova)
+blueprints such as `OpenStack Compute (nova)
 Blueprints <https://blueprints.launchpad.net/nova>`_, `OpenStack
 Identity (keystone)
 Blueprints <https://blueprints.launchpad.net/keystone>`_, and release
@@ -266,7 +266,7 @@ tool. This tool tests database migration performance on copies of
 real-world user databases.
 
 These changes have facilitated the first proper OpenStack upgrade guide,
-found in :doc:`ops_upgrades`, and will continue to improve in the next
+found in :doc:`ops-upgrades`, and will continue to improve in the next
 release.
 
 Deprecation of Nova Network
diff --git a/doc/ops-guide/source/app_usecases.rst b/doc/ops-guide/source/app-usecases.rst
similarity index 100%
rename from doc/ops-guide/source/app_usecases.rst
rename to doc/ops-guide/source/app-usecases.rst
diff --git a/doc/ops-guide/source/arch_cloud_controller.rst b/doc/ops-guide/source/arch-cloud-controller.rst
similarity index 99%
rename from doc/ops-guide/source/arch_cloud_controller.rst
rename to doc/ops-guide/source/arch-cloud-controller.rst
index 43e87f9347..a50ebd8d12 100644
--- a/doc/ops-guide/source/arch_cloud_controller.rst
+++ b/doc/ops-guide/source/arch-cloud-controller.rst
@@ -368,7 +368,7 @@ space, and so on, are associated with a project.
 OpenStack Identity provides authentication decisions and user attribute
 information, which is then used by the other OpenStack services to
 perform authorization. The policy is set in the ``policy.json`` file.
-For information on how to configure these, see :doc:`ops_projects_users`
+For information on how to configure these, see :doc:`ops-projects-users`
 
 OpenStack Identity supports different plug-ins for authentication
 decisions and identity storage. Examples of these plug-ins include:
diff --git a/doc/ops-guide/source/arch_compute_nodes.rst b/doc/ops-guide/source/arch-compute-nodes.rst
similarity index 98%
rename from doc/ops-guide/source/arch_compute_nodes.rst
rename to doc/ops-guide/source/arch-compute-nodes.rst
index 55a6b80b06..6378c9b5a9 100644
--- a/doc/ops-guide/source/arch_compute_nodes.rst
+++ b/doc/ops-guide/source/arch-compute-nodes.rst
@@ -69,7 +69,7 @@ community experience.
 
 For example, KVM is the most widely adopted hypervisor in the OpenStack
 community. Besides KVM, more deployments run Xen, LXC, VMware, and
-Hyper-V than the others listed. However, each of these are lacking some
+Hyper-V than the others listed. However, each of these are lacking some
 feature support or the documentation on how to use them with OpenStack
 is out of date.
 
@@ -281,7 +281,7 @@ particular use case.
 Logging
 ~~~~~~~
 
-Logging is detailed more fully in :doc:`ops_logging_monitoring`. However,
+Logging is detailed more fully in :doc:`ops-logging-monitoring`. However,
 it is an important design consideration to take into account before
 commencing operations of your cloud.
 
@@ -294,7 +294,7 @@ Networking
 ~~~~~~~~~~
 
 Networking in OpenStack is a complex, multifaceted challenge. See
-:doc:`arch_network_design`.
+:doc:`arch-network-design`.
 
 Conclusion
 ~~~~~~~~~~
diff --git a/doc/ops-guide/source/arch_example_neutron.rst b/doc/ops-guide/source/arch-example-neutron.rst
similarity index 100%
rename from doc/ops-guide/source/arch_example_neutron.rst
rename to doc/ops-guide/source/arch-example-neutron.rst
diff --git a/doc/ops-guide/source/arch_example_nova_network.rst b/doc/ops-guide/source/arch-example-nova-network.rst
similarity index 99%
rename from doc/ops-guide/source/arch_example_nova_network.rst
rename to doc/ops-guide/source/arch-example-nova-network.rst
index a4dcfdf6cc..b11d7da7f6 100644
--- a/doc/ops-guide/source/arch_example_nova_network.rst
+++ b/doc/ops-guide/source/arch-example-nova-network.rst
@@ -249,11 +249,11 @@ Optional Extensions
 
 You can extend this reference architecture as follows:
 
--  Add additional cloud controllers (see :doc:`ops_maintenance`).
+-  Add additional cloud controllers (see :doc:`ops-maintenance`).
 
 -  Add an OpenStack Storage service (see the Object Storage chapter in
    the `OpenStack Installation Guide
    <http://docs.openstack.org/#install-guides>`_ for your distribution).
 
 -  Add additional OpenStack Block Storage hosts (see
-   :doc:`ops_maintenance`).
+   :doc:`ops-maintenance`).
diff --git a/doc/ops-guide/source/arch_example_thoughts.rst b/doc/ops-guide/source/arch-example-thoughts.rst
similarity index 95%
rename from doc/ops-guide/source/arch_example_thoughts.rst
rename to doc/ops-guide/source/arch-example-thoughts.rst
index b9589d61f2..9f63dc5314 100644
--- a/doc/ops-guide/source/arch_example_thoughts.rst
+++ b/doc/ops-guide/source/arch-example-thoughts.rst
@@ -5,7 +5,7 @@ Parting Thoughts on Architecture Examples
 With so many considerations and options available, our hope is to
 provide a few clearly-marked and tested paths for your OpenStack
 exploration. If you're looking for additional ideas, check out
-:doc:`app_usecases`, the
+:doc:`app-usecases`, the
 `OpenStack Installation Guides <http://docs.openstack.org/#install-guides>`_, or the
 `OpenStack User Stories
 page <http://www.openstack.org/user-stories/>`_.
diff --git a/doc/ops-guide/source/arch_examples.rst b/doc/ops-guide/source/arch-examples.rst
similarity index 92%
rename from doc/ops-guide/source/arch_examples.rst
rename to doc/ops-guide/source/arch-examples.rst
index e9686c9fd1..c9660547f1 100644
--- a/doc/ops-guide/source/arch_examples.rst
+++ b/doc/ops-guide/source/arch-examples.rst
@@ -25,6 +25,6 @@ serving users.
 .. toctree::
    :maxdepth: 2
 
-   arch_example_nova_network.rst
-   arch_example_neutron.rst
-   arch_example_thoughts.rst
+   arch-example-nova-network.rst
+   arch-example-neutron.rst
+   arch-example-thoughts.rst
diff --git a/doc/ops-guide/source/arch_network_design.rst b/doc/ops-guide/source/arch-network-design.rst
similarity index 100%
rename from doc/ops-guide/source/arch_network_design.rst
rename to doc/ops-guide/source/arch-network-design.rst
diff --git a/doc/ops-guide/source/arch_provision.rst b/doc/ops-guide/source/arch-provision.rst
similarity index 100%
rename from doc/ops-guide/source/arch_provision.rst
rename to doc/ops-guide/source/arch-provision.rst
diff --git a/doc/ops-guide/source/arch_scaling.rst b/doc/ops-guide/source/arch-scaling.rst
similarity index 98%
rename from doc/ops-guide/source/arch_scaling.rst
rename to doc/ops-guide/source/arch-scaling.rst
index ce2547a223..c08a4c7dc3 100644
--- a/doc/ops-guide/source/arch_scaling.rst
+++ b/doc/ops-guide/source/arch-scaling.rst
@@ -69,9 +69,9 @@ The starting point for most is the core count of your cloud. By applying
 some ratios, you can gather information about:
 
 -  The number of virtual machines (VMs) you expect to run,
-   ``((overcommit fraction × cores) / virtual cores per instance)``
+   ``((overcommit fraction × cores) / virtual cores per instance)``
 
--  How much storage is required ``(flavor disk size × number of instances)``
+-  How much storage is required ``(flavor disk size × number of instances)``
 
 You can use these ratios to determine how much additional infrastructure
 you need to support your cloud.
@@ -117,7 +117,7 @@ of VMs every 30 seconds.
 
 After you consider these factors, you can determine how many cloud
 controller cores you require. A typical eight core, 8 GB of RAM server
-is sufficient for up to a rack of compute nodes — given the above
+is sufficient for up to a rack of compute nodes — given the above
 caveats.
 
 You must also consider key hardware specifications for the performance
@@ -128,7 +128,7 @@ bandwidth (Gbps/core), and overall CPU performance (CPU/core).
 .. tip::
 
    For a discussion of metric tracking, including how to extract
-   metrics from your cloud, see :doc:`ops_logging_monitoring`.
+   metrics from your cloud, see :doc:`ops-logging-monitoring`.
 
 Adding Cloud Controller Nodes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -416,7 +416,7 @@ When adding object storage nodes, a :term:`weight` should be specified
 that reflects the :term:`capability` of the node.
 
 Monitoring the resource usage and user growth will enable you to know
-when to procure. :doc:`ops_logging_monitoring` details some useful metrics.
+when to procure. :doc:`ops-logging-monitoring` details some useful metrics.
 
 Burn-in Testing
 ---------------
diff --git a/doc/ops-guide/source/arch_storage.rst b/doc/ops-guide/source/arch-storage.rst
similarity index 100%
rename from doc/ops-guide/source/arch_storage.rst
rename to doc/ops-guide/source/arch-storage.rst
diff --git a/doc/ops-guide/source/architecture.rst b/doc/ops-guide/source/architecture.rst
index 97f7b8e8c3..506e916a02 100644
--- a/doc/ops-guide/source/architecture.rst
+++ b/doc/ops-guide/source/architecture.rst
@@ -43,10 +43,10 @@ architecture for an OpenStack cloud.
 .. toctree::
    :maxdepth: 2
 
-   arch_examples.rst
-   arch_provision.rst
-   arch_cloud_controller.rst
-   arch_compute_nodes.rst
-   arch_scaling.rst
-   arch_storage.rst
-   arch_network_design.rst
+   arch-examples.rst
+   arch-provision.rst
+   arch-cloud-controller.rst
+   arch-compute-nodes.rst
+   arch-scaling.rst
+   arch-storage.rst
+   arch-network-design.rst
diff --git a/doc/ops-guide/source/index.rst b/doc/ops-guide/source/index.rst
index 03ec4288e8..1b9e436782 100644
--- a/doc/ops-guide/source/index.rst
+++ b/doc/ops-guide/source/index.rst
@@ -25,10 +25,10 @@ Appendix
 .. toctree::
    :maxdepth: 1
 
-   app_usecases.rst
-   app_crypt.rst
-   app_roadmaps.rst
-   app_resources.rst
+   app-usecases.rst
+   app-crypt.rst
+   app-roadmaps.rst
+   app-resources.rst
    common/app-support.rst
 
 Glossary
diff --git a/doc/ops-guide/source/operations.rst b/doc/ops-guide/source/operations.rst
index db2450e802..282426f821 100644
--- a/doc/ops-guide/source/operations.rst
+++ b/doc/ops-guide/source/operations.rst
@@ -28,13 +28,13 @@ problem.
 .. toctree::
    :maxdepth: 2
 
-   ops_lay_of_the_land.rst
-   ops_projects_users.rst
-   ops_user_facing_operations.rst
-   ops_maintenance.rst
-   ops_network_troubleshooting.rst
-   ops_logging_monitoring.rst
-   ops_backup_recovery.rst
-   ops_customize.rst
-   ops_advanced_configuration.rst
-   ops_upgrades.rst
+   ops-lay-of-the-land.rst
+   ops-projects-users.rst
+   ops-user-facing-operations.rst
+   ops-maintenance.rst
+   ops-network-troubleshooting.rst
+   ops-logging-monitoring.rst
+   ops-backup-recovery.rst
+   ops-customize.rst
+   ops-advanced-configuration.rst
+   ops-upgrades.rst
diff --git a/doc/ops-guide/source/ops_advanced_configuration.rst b/doc/ops-guide/source/ops-advanced-configuration.rst
similarity index 100%
rename from doc/ops-guide/source/ops_advanced_configuration.rst
rename to doc/ops-guide/source/ops-advanced-configuration.rst
diff --git a/doc/ops-guide/source/ops_backup_recovery.rst b/doc/ops-guide/source/ops-backup-recovery.rst
similarity index 100%
rename from doc/ops-guide/source/ops_backup_recovery.rst
rename to doc/ops-guide/source/ops-backup-recovery.rst
diff --git a/doc/ops-guide/source/ops_customize_compute.rst b/doc/ops-guide/source/ops-customize-compute.rst
similarity index 100%
rename from doc/ops-guide/source/ops_customize_compute.rst
rename to doc/ops-guide/source/ops-customize-compute.rst
diff --git a/doc/ops-guide/source/ops_customize_conclusion.rst b/doc/ops-guide/source/ops-customize-conclusion.rst
similarity index 100%
rename from doc/ops-guide/source/ops_customize_conclusion.rst
rename to doc/ops-guide/source/ops-customize-conclusion.rst
diff --git a/doc/ops-guide/source/ops_customize_dashboard.rst b/doc/ops-guide/source/ops-customize-dashboard.rst
similarity index 100%
rename from doc/ops-guide/source/ops_customize_dashboard.rst
rename to doc/ops-guide/source/ops-customize-dashboard.rst
diff --git a/doc/ops-guide/source/ops_customize_development.rst b/doc/ops-guide/source/ops-customize-development.rst
similarity index 100%
rename from doc/ops-guide/source/ops_customize_development.rst
rename to doc/ops-guide/source/ops-customize-development.rst
diff --git a/doc/ops-guide/source/ops_customize_objectstorage.rst b/doc/ops-guide/source/ops-customize-objectstorage.rst
similarity index 100%
rename from doc/ops-guide/source/ops_customize_objectstorage.rst
rename to doc/ops-guide/source/ops-customize-objectstorage.rst
diff --git a/doc/ops-guide/source/ops_customize.rst b/doc/ops-guide/source/ops-customize.rst
similarity index 91%
rename from doc/ops-guide/source/ops_customize.rst
rename to doc/ops-guide/source/ops-customize.rst
index a4425184f2..195b784b46 100644
--- a/doc/ops-guide/source/ops_customize.rst
+++ b/doc/ops-guide/source/ops-customize.rst
@@ -5,11 +5,11 @@ Customization
 .. toctree::
    :maxdepth: 1
 
-   ops_customize_development.rst
-   ops_customize_objectstorage.rst
-   ops_customize_compute.rst
-   ops_customize_dashboard.rst
-   ops_customize_conclusion.rst
+   ops-customize-development.rst
+   ops-customize-objectstorage.rst
+   ops-customize-compute.rst
+   ops-customize-dashboard.rst
+   ops-customize-conclusion.rst
 
 OpenStack might not do everything you need it to do out of the box. To
 add a new feature, you can follow different paths.
diff --git a/doc/ops-guide/source/ops_lay_of_the_land.rst b/doc/ops-guide/source/ops-lay-of-the-land.rst
similarity index 100%
rename from doc/ops-guide/source/ops_lay_of_the_land.rst
rename to doc/ops-guide/source/ops-lay-of-the-land.rst
diff --git a/doc/ops-guide/source/ops_logging_monitoring_summary.rst b/doc/ops-guide/source/ops-logging-monitoring-summary.rst
similarity index 100%
rename from doc/ops-guide/source/ops_logging_monitoring_summary.rst
rename to doc/ops-guide/source/ops-logging-monitoring-summary.rst
diff --git a/doc/ops-guide/source/ops_logging_monitoring.rst b/doc/ops-guide/source/ops-logging-monitoring.rst
similarity index 80%
rename from doc/ops-guide/source/ops_logging_monitoring.rst
rename to doc/ops-guide/source/ops-logging-monitoring.rst
index 6cb9b8ca64..5d26401855 100644
--- a/doc/ops-guide/source/ops_logging_monitoring.rst
+++ b/doc/ops-guide/source/ops-logging-monitoring.rst
@@ -5,9 +5,9 @@ Logging and Monitoring
 .. toctree::
    :maxdepth: 1
 
-   ops_logging.rst
-   ops_monitoring.rst
-   ops_logging_monitoring_summary.rst
+   ops-logging.rst
+   ops-monitoring.rst
+   ops-logging-monitoring-summary.rst
 
 As an OpenStack cloud is composed of so many different services, there
 are a large number of log files. This chapter aims to assist you in
diff --git a/doc/ops-guide/source/ops_logging_rsyslog.rst b/doc/ops-guide/source/ops-logging-rsyslog.rst
similarity index 100%
rename from doc/ops-guide/source/ops_logging_rsyslog.rst
rename to doc/ops-guide/source/ops-logging-rsyslog.rst
diff --git a/doc/ops-guide/source/ops_logging.rst b/doc/ops-guide/source/ops-logging.rst
similarity index 99%
rename from doc/ops-guide/source/ops_logging.rst
rename to doc/ops-guide/source/ops-logging.rst
index f683d684eb..be84613942 100644
--- a/doc/ops-guide/source/ops_logging.rst
+++ b/doc/ops-guide/source/ops-logging.rst
@@ -262,4 +262,4 @@ capabilities and configuration requirements.
 .. toctree::
    :maxdepth: 1
 
-   ops_logging_rsyslog.rst
+   ops-logging-rsyslog.rst
diff --git a/doc/ops-guide/source/ops_maintenance_complete.rst b/doc/ops-guide/source/ops-maintenance-complete.rst
similarity index 100%
rename from doc/ops-guide/source/ops_maintenance_complete.rst
rename to doc/ops-guide/source/ops-maintenance-complete.rst
diff --git a/doc/ops-guide/source/ops_maintenance_compute.rst b/doc/ops-guide/source/ops-maintenance-compute.rst
similarity index 100%
rename from doc/ops-guide/source/ops_maintenance_compute.rst
rename to doc/ops-guide/source/ops-maintenance-compute.rst
diff --git a/doc/ops-guide/source/ops_maintenance_configuration.rst b/doc/ops-guide/source/ops-maintenance-configuration.rst
similarity index 100%
rename from doc/ops-guide/source/ops_maintenance_configuration.rst
rename to doc/ops-guide/source/ops-maintenance-configuration.rst
diff --git a/doc/ops-guide/source/ops_maintenance_controller.rst b/doc/ops-guide/source/ops-maintenance-controller.rst
similarity index 99%
rename from doc/ops-guide/source/ops_maintenance_controller.rst
rename to doc/ops-guide/source/ops-maintenance-controller.rst
index af9a34c285..6cae12bccb 100644
--- a/doc/ops-guide/source/ops_maintenance_controller.rst
+++ b/doc/ops-guide/source/ops-maintenance-controller.rst
@@ -88,7 +88,7 @@ The next best approach is to use a configuration-management tool, such
 as Puppet, to automatically build a cloud controller. This should not
 take more than 15 minutes if you have a spare server available. After
 the controller rebuilds, restore any backups taken
-(see :doc:`ops_backup_recovery`).
+(see :doc:`ops-backup-recovery`).
 
 Also, in practice, the ``nova-compute`` services on the compute nodes do
 not always reconnect cleanly to rabbitmq hosted on the controller when
diff --git a/doc/ops-guide/source/ops_maintenance_database.rst b/doc/ops-guide/source/ops-maintenance-database.rst
similarity index 100%
rename from doc/ops-guide/source/ops_maintenance_database.rst
rename to doc/ops-guide/source/ops-maintenance-database.rst
diff --git a/doc/ops-guide/source/ops_maintenance_determine.rst b/doc/ops-guide/source/ops-maintenance-determine.rst
similarity index 98%
rename from doc/ops-guide/source/ops_maintenance_determine.rst
rename to doc/ops-guide/source/ops-maintenance-determine.rst
index eea2a70947..0cf753b079 100644
--- a/doc/ops-guide/source/ops_maintenance_determine.rst
+++ b/doc/ops-guide/source/ops-maintenance-determine.rst
@@ -29,7 +29,7 @@ Terminal 2:
    # nova list
 
 Look for any errors or traces in the log file. For more information, see
-:doc:`ops_logging_monitoring`.
+:doc:`ops-logging-monitoring`.
 
 If the error indicates that the problem is with another component,
 switch to tailing that component's log file. For example, if nova cannot
diff --git a/doc/ops-guide/source/ops_maintenance_hardware.rst b/doc/ops-guide/source/ops-maintenance-hardware.rst
similarity index 100%
rename from doc/ops-guide/source/ops_maintenance_hardware.rst
rename to doc/ops-guide/source/ops-maintenance-hardware.rst
diff --git a/doc/ops-guide/source/ops_maintenance_hdmwy.rst b/doc/ops-guide/source/ops-maintenance-hdmwy.rst
similarity index 100%
rename from doc/ops-guide/source/ops_maintenance_hdmwy.rst
rename to doc/ops-guide/source/ops-maintenance-hdmwy.rst
diff --git a/doc/ops-guide/source/ops_maintenance_rabbitmq.rst b/doc/ops-guide/source/ops-maintenance-rabbitmq.rst
similarity index 100%
rename from doc/ops-guide/source/ops_maintenance_rabbitmq.rst
rename to doc/ops-guide/source/ops-maintenance-rabbitmq.rst
diff --git a/doc/ops-guide/source/ops_maintenance_slow.rst b/doc/ops-guide/source/ops-maintenance-slow.rst
similarity index 100%
rename from doc/ops-guide/source/ops_maintenance_slow.rst
rename to doc/ops-guide/source/ops-maintenance-slow.rst
diff --git a/doc/ops-guide/source/ops_maintenance_storage.rst b/doc/ops-guide/source/ops-maintenance-storage.rst
similarity index 100%
rename from doc/ops-guide/source/ops_maintenance_storage.rst
rename to doc/ops-guide/source/ops-maintenance-storage.rst
diff --git a/doc/ops-guide/source/ops-maintenance.rst b/doc/ops-guide/source/ops-maintenance.rst
new file mode 100644
index 0000000000..aafa314e53
--- /dev/null
+++ b/doc/ops-guide/source/ops-maintenance.rst
@@ -0,0 +1,23 @@
+====================================
+Maintenance, Failures, and Debugging
+====================================
+
+.. toctree::
+   :maxdepth: 2
+
+   ops-maintenance-controller.rst
+   ops-maintenance-compute.rst
+   ops-maintenance-storage.rst
+   ops-maintenance-complete.rst
+   ops-maintenance-configuration.rst
+   ops-maintenance-hardware.rst
+   ops-maintenance-database.rst
+   ops-maintenance-rabbitmq.rst
+   ops-maintenance-hdmwy.rst
+   ops-maintenance-determine.rst
+   ops-maintenance-slow.rst
+   ops-uninstall.rst
+
+Downtime, whether planned or unscheduled, is a certainty when running a
+cloud. This chapter aims to provide useful information for dealing
+proactively, or reactively, with these occurrences.
diff --git a/doc/ops-guide/source/ops_monitoring.rst b/doc/ops-guide/source/ops-monitoring.rst
similarity index 100%
rename from doc/ops-guide/source/ops_monitoring.rst
rename to doc/ops-guide/source/ops-monitoring.rst
diff --git a/doc/ops-guide/source/ops_network_troubleshooting.rst b/doc/ops-guide/source/ops-network-troubleshooting.rst
similarity index 100%
rename from doc/ops-guide/source/ops_network_troubleshooting.rst
rename to doc/ops-guide/source/ops-network-troubleshooting.rst
diff --git a/doc/ops-guide/source/ops_projects_users_summary.rst b/doc/ops-guide/source/ops-projects-users-summary.rst
similarity index 100%
rename from doc/ops-guide/source/ops_projects_users_summary.rst
rename to doc/ops-guide/source/ops-projects-users-summary.rst
diff --git a/doc/ops-guide/source/ops_projects_users.rst b/doc/ops-guide/source/ops-projects-users.rst
similarity index 93%
rename from doc/ops-guide/source/ops_projects_users.rst
rename to doc/ops-guide/source/ops-projects-users.rst
index a2da7e752c..7462c4171b 100644
--- a/doc/ops-guide/source/ops_projects_users.rst
+++ b/doc/ops-guide/source/ops-projects-users.rst
@@ -4,10 +4,10 @@ Managing Projects and Users
 
 .. toctree::
 
-   ops_projects.rst
-   ops_quotas.rst
-   ops_users.rst
-   ops_projects_users_summary.rst
+   ops-projects.rst
+   ops-quotas.rst
+   ops-users.rst
+   ops-projects-users-summary.rst
 
 An OpenStack cloud does not have much value without users. This chapter
 covers topics that relate to managing users, projects, and quotas. This
diff --git a/doc/ops-guide/source/ops_projects.rst b/doc/ops-guide/source/ops-projects.rst
similarity index 100%
rename from doc/ops-guide/source/ops_projects.rst
rename to doc/ops-guide/source/ops-projects.rst
diff --git a/doc/ops-guide/source/ops_quotas.rst b/doc/ops-guide/source/ops-quotas.rst
similarity index 100%
rename from doc/ops-guide/source/ops_quotas.rst
rename to doc/ops-guide/source/ops-quotas.rst
diff --git a/doc/ops-guide/source/ops_uninstall.rst b/doc/ops-guide/source/ops-uninstall.rst
similarity index 100%
rename from doc/ops-guide/source/ops_uninstall.rst
rename to doc/ops-guide/source/ops-uninstall.rst
diff --git a/doc/ops-guide/source/ops_upgrades.rst b/doc/ops-guide/source/ops-upgrades.rst
similarity index 100%
rename from doc/ops-guide/source/ops_upgrades.rst
rename to doc/ops-guide/source/ops-upgrades.rst
diff --git a/doc/ops-guide/source/ops_user_facing_operations.rst b/doc/ops-guide/source/ops-user-facing-operations.rst
similarity index 100%
rename from doc/ops-guide/source/ops_user_facing_operations.rst
rename to doc/ops-guide/source/ops-user-facing-operations.rst
diff --git a/doc/ops-guide/source/ops_users.rst b/doc/ops-guide/source/ops-users.rst
similarity index 100%
rename from doc/ops-guide/source/ops_users.rst
rename to doc/ops-guide/source/ops-users.rst
diff --git a/doc/ops-guide/source/ops_maintenance.rst b/doc/ops-guide/source/ops_maintenance.rst
deleted file mode 100644
index feef8e98a7..0000000000
--- a/doc/ops-guide/source/ops_maintenance.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-====================================
-Maintenance, Failures, and Debugging
-====================================
-
-.. toctree::
-   :maxdepth: 2
-
-   ops_maintenance_controller.rst
-   ops_maintenance_compute.rst
-   ops_maintenance_storage.rst
-   ops_maintenance_complete.rst
-   ops_maintenance_configuration.rst
-   ops_maintenance_hardware.rst
-   ops_maintenance_database.rst
-   ops_maintenance_rabbitmq.rst
-   ops_maintenance_hdmwy.rst
-   ops_maintenance_determine.rst
-   ops_maintenance_slow.rst
-   ops_uninstall.rst
-
-Downtime, whether planned or unscheduled, is a certainty when running a
-cloud. This chapter aims to provide useful information for dealing
-proactively, or reactively, with these occurrences.
diff --git a/doc/ops-guide/source/preface.rst b/doc/ops-guide/source/preface.rst
index 18a9aa0202..9a6dee659a 100644
--- a/doc/ops-guide/source/preface.rst
+++ b/doc/ops-guide/source/preface.rst
@@ -125,7 +125,7 @@ your OpenStack cloud.
    lot of background knowledge. However, if you are fairly new to cloud
    computing, we recommend that you make use of the :doc:`common/glossary`
    at the back of the book, as well as the online documentation for OpenStack
-   and additional resources mentioned in this book in :doc:`app_resources`.
+   and additional resources mentioned in this book in :doc:`app-resources`.
 
 Further Reading
 ---------------
@@ -190,38 +190,38 @@ OpenStack clouds.
 
 **Part I:**
 
-:doc:`arch_examples`
+:doc:`arch-examples`
     Because of all the decisions the other chapters discuss, this
     chapter describes the decisions made for this particular book and
     much of the justification for the example architecture.
 
-:doc:`arch_provision`
+:doc:`arch-provision`
     While this book doesn't describe installation, we do recommend
     automation for deployment and configuration, discussed in this
     chapter.
 
-:doc:`arch_cloud_controller`
+:doc:`arch-cloud-controller`
     The cloud controller is an invention for the sake of consolidating
     and describing which services run on which nodes. This chapter
     discusses hardware and network considerations as well as how to
     design the cloud controller for performance and separation of
     services.
 
-:doc:`arch_compute_nodes`
+:doc:`arch-compute-nodes`
     This chapter describes the compute nodes, which are dedicated to
     running virtual machines. Some hardware choices come into play here,
     as well as logging and networking descriptions.
 
-:doc:`arch_scaling`
+:doc:`arch-scaling`
     This chapter discusses the growth of your cloud resources through
     scaling and segregation considerations.
 
-:doc:`arch_storage`
+:doc:`arch-storage`
     As with other architecture decisions, storage concepts within
     OpenStack offer many options. This chapter lays out the choices for
     you.
 
-:doc:`arch_network_design`
+:doc:`arch-network-design`
     Your OpenStack cloud networking needs to fit into your existing
     networks while also enabling the best design for your users and
     administrators, and this chapter gives you in-depth information
@@ -229,68 +229,68 @@ OpenStack clouds.
 
 **Part II:**
 
-:doc:`ops_lay_of_the_land`
+:doc:`ops-lay-of-the-land`
     This chapter is written to let you get your hands wrapped around
     your OpenStack cloud through command-line tools and understanding
     what is already set up in your cloud.
 
-:doc:`ops_projects_users`
+:doc:`ops-projects-users`
     This chapter walks through user-enabling processes that all admins
     must face to manage users, give them quotas to parcel out resources,
     and so on.
 
-:doc:`ops_user_facing_operations`
+:doc:`ops-user-facing-operations`
     This chapter shows you how to use OpenStack cloud resources and how
     to train your users.
 
-:doc:`ops_maintenance`
+:doc:`ops-maintenance`
     This chapter goes into the common failures that the authors have
     seen while running clouds in production, including troubleshooting.
 
-:doc:`ops_network_troubleshooting`
+:doc:`ops-network-troubleshooting`
     Because network troubleshooting is especially difficult with virtual
     resources, this chapter is chock-full of helpful tips and tricks for
     tracing network traffic, finding the root cause of networking
     failures, and debugging related services, such as DHCP and DNS.
 
-:doc:`ops_logging_monitoring`
+:doc:`ops-logging-monitoring`
     This chapter shows you where OpenStack places logs and how to best
     read and manage logs for monitoring purposes.
 
-:doc:`ops_backup_recovery`
+:doc:`ops-backup-recovery`
     This chapter describes what you need to back up within OpenStack as
     well as best practices for recovering backups.
 
-:doc:`ops_customize`
+:doc:`ops-customize`
     For readers who need to get a specialized feature into OpenStack,
     this chapter describes how to use DevStack to write custom
     middleware or a custom scheduler to rebalance your resources.
 
-:doc:`ops_advanced_configuration`
+:doc:`ops-advanced-configuration`
     Much of OpenStack is driver-oriented, so you can plug in different
     solutions to the base set of services. This chapter describes some
     advanced configuration topics.
 
-:doc:`ops_upgrades`
+:doc:`ops-upgrades`
     This chapter provides upgrade information based on the architectures
     used in this book.
 
 **Back matter:**
 
-:doc:`app_usecases`
+:doc:`app-usecases`
     You can read a small selection of use cases from the OpenStack
     community with some technical details and further resources.
 
-:doc:`app_crypt`
+:doc:`app-crypt`
     These are shared legendary tales of image disappearances, VM
     massacres, and crazy troubleshooting techniques that result in
     hard-learned lessons and wisdom.
 
-:doc:`app_roadmaps`
+:doc:`app-roadmaps`
     Read about how to track the OpenStack roadmap through the open and
     transparent development processes.
 
-:doc:`app_resources`
+:doc:`app-resources`
     So many OpenStack resources are available online because of the
     fast-moving nature of the project, but there are also resources
     listed here that the authors found helpful while learning
diff --git a/www/static/.htaccess b/www/static/.htaccess
index 13d1f65133..d61776f8ec 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -293,6 +293,58 @@ redirectmatch 301 ^/([a-z-]+)/ts_non_existent_host.html /$1/ts-non-existent-host
 redirectmatch 301 ^/([a-z-]+)/ts_non_existent_vlun.html /$1/ts-non-existent-vlun.html
 redirectmatch 301 ^/([a-z-]+)/ts_vol_attach_miss_sg_scan.html /$1/ts-vol-attach-miss-sg-scan.html
 
+# Redirect renamed Ops Guide pages
+
+redirect 301 /ops-guide/app_crypt.html /ops-guide/app-crypt.html
+redirect 301 /ops-guide/ops_advanced_configuration.html /ops-guide/ops-advanced-configuration.html
+redirect 301 /ops-guide/arch_provision.html /ops-guide/arch-provision.html
+redirect 301 /ops-guide/ops_customize.html /ops-guide/ops-customize.html
+redirect 301 /ops-guide/arch_example_neutron.html /ops-guide/arch-example-neutron.html
+redirect 301 /ops-guide/arch_example_nova_network.html /ops-guide/arch-example-nova-network.html
+redirect 301 /ops-guide/ops_lay_of_the_land.html /ops-guide/ops-lay-of-the-land.html
+redirect 301 /ops-guide/ops_maintenance_rabbitmq.html /ops-guide/ops-maintenance-rabbitmq.html
+redirect 301 /ops-guide/ops_customize_conclusion.html /ops-guide/ops-customize-conclusion.html
+redirect 301 /ops-guide/ops_maintenance_storage.html /ops-guide/ops-maintenance-storage.html
+redirect 301 /ops-guide/ops_maintenance_complete.html /ops-guide/ops-maintenance-complete.html
+redirect 301 /ops-guide/ops_logging_monitoring.html /ops-guide/ops-logging-monitoring.html
+redirect 301 /ops-guide/ops_logging.html /ops-guide/ops-logging.html
+redirect 301 /ops-guide/ops_maintenance_slow.html /ops-guide/ops-maintenance-slow.html
+redirect 301 /ops-guide/arch_examples.html /ops-guide/arch-examples.html
+redirect 301 /ops-guide/ops_backup_recovery.html /ops-guide/ops-backup-recovery.html
+redirect 301 /ops-guide/ops_maintenance_configuration.html /ops-guide/ops-maintenance-configuration.html
+redirect 301 /ops-guide/ops_maintenance_hardware.html /ops-guide/ops-maintenance-hardware.html
+redirect 301 /ops-guide/ops_customize_dashboard.html /ops-guide/ops-customize-dashboard.html
+redirect 301 /ops-guide/ops_uninstall.html /ops-guide/ops-uninstall.html
+redirect 301 /ops-guide/arch_storage.html /ops-guide/arch-storage.html
+redirect 301 /ops-guide/app_roadmaps.html /ops-guide/app-roadmaps.html
+redirect 301 /ops-guide/ops_maintenance_database.html /ops-guide/ops-maintenance-database.html
+redirect 301 /ops-guide/ops_maintenance_hdmwy.html /ops-guide/ops-maintenance-hdmwy.html
+redirect 301 /ops-guide/ops_customize_compute.html /ops-guide/ops-customize-compute.html
+redirect 301 /ops-guide/arch_cloud_controller.html /ops-guide/arch-cloud-controller.html
+redirect 301 /ops-guide/ops_maintenance_controller.html /ops-guide/ops-maintenance-controller.html
+redirect 301 /ops-guide/ops_customize_development.html /ops-guide/ops-customize-development.html
+redirect 301 /ops-guide/ops_maintenance_compute.html /ops-guide/ops-maintenance-compute.html
+redirect 301 /ops-guide/app_resources.html /ops-guide/app-resources.html
+redirect 301 /ops-guide/ops_projects.html /ops-guide/ops-projects.html
+redirect 301 /ops-guide/arch_compute_nodes.html /ops-guide/arch-compute-nodes.html
+redirect 301 /ops-guide/ops_projects_users.html /ops-guide/ops-projects-users.html
+redirect 301 /ops-guide/ops_quotas.html /ops-guide/ops-quotas.html
+redirect 301 /ops-guide/arch_network_design.html /ops-guide/arch-network-design.html
+redirect 301 /ops-guide/ops_customize_objectstorage.html /ops-guide/ops-customize-objectstorage.html
+redirect 301 /ops-guide/arch_scaling.html /ops-guide/arch-scaling.html
+redirect 301 /ops-guide/ops_user_facing_operations.html /ops-guide/ops-user-facing-operations.html
+redirect 301 /ops-guide/ops_maintenance_determine.html /ops-guide/ops-maintenance-determine.html
+redirect 301 /ops-guide/ops_monitoring.html /ops-guide/ops-monitoring.html
+redirect 301 /ops-guide/ops_upgrades.html /ops-guide/ops-upgrades.html
+redirect 301 /ops-guide/ops_projects_users_summary.html /ops-guide/ops-projects-users-summary.html
+redirect 301 /ops-guide/arch_example_thoughts.html /ops-guide/arch-example-thoughts.html
+redirect 301 /ops-guide/ops_users.html /ops-guide/ops-users.html
+redirect 301 /ops-guide/app_usecases.html /ops-guide/app-usecases.html
+redirect 301 /ops-guide/ops_network_troubleshooting.html /ops-guide/ops-network-troubleshooting.html
+redirect 301 /ops-guide/ops_logging_monitoring_summary.html /ops-guide/ops-logging-monitoring-summary.html
+redirect 301 /ops-guide/ops_logging_rsyslog.html /ops-guide/ops-logging-rsyslog.html
+redirect 301 /ops-guide/ops_maintenance.html /ops-guide/ops-maintenance.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