fix paths and added redirects

.s2i/httpd-cfg/01-commercial.conf

@@ -133,6 +133,37 @@ AddType text/vtt                            vtt
     # Service Mesh redirect from 3 to 4
     RewriteRule ^container-platform/3\.11/servicemesh-install/servicemesh-install.html$ /container-platform/4.3/service_mesh/service_mesh_install/preparing-ossm-installation.html [NE,R=301]
 
+    # redirects for paths using dashes
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/web-console/?(.*)$ /container-platform/$1/web_console/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/networking/multiple-networks/?(.*)$ /container-platform/$1/networking/multiple_networks/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/networking/openshift-sdn/?(.*)$ /container-platform/$1/networking/openshift_sdn/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/networking/configuring-ingress-cluster-traffic/?(.*)$ /container-platform/$1/networking/configuring_ingress_cluster_traffic/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/storage/persistent-storage/?(.*)$ /container-platform/$1/storage/persistent_storage/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/registry/configuring-registry-storage/?(.*)$ /container-platform/$1/registry/configuring_registry_storage/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/operators/understanding-olm/?(.*)$ /container-platform/$1/operators/understanding_olm/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/openshift_images/managing-images/?(.*)$ /container-platform/$1/openshift_images/managing_images/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/applications/application-life-cycle-management/?(.*)$ /container-platform/$1/applications/application_life_cycle_management/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/monitoring/cluster-monitoring/?(.*)$ /container-platform/$1/monitoring/cluster_monitoring/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/metering/configuring-metering/?(.*)$ /container-platform/$1/metering/configuring_metering/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/migration/migrating-3-4/?(.*)$ /container-platform/$1/migration/migrating_3_4/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/migration/migrating-4_1-4/?(.*)$ /container-platform/$1/migration/migrating_4_1_4/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/migration/migrating-4_2-4/?(.*)$ /container-platform/$1/migration/migrating_4_2_4/$2 [NE,R=301]
+
+    RewriteRule ^container-platform/(4\.1|4\.2|4\.3)/cli_reference/helm-cli/?(.*)$ /container-platform/$1/cli_reference/helm_cli/$2 [NE,R=301]
+
     # CNV redirects for paths using dashes
     RewriteRule ^container-platform/4\.3/cnv/(cnv_install|cnv-install)/cnv-about-cnv.html/?(.*)$ /container-platform/4.3/cnv/cnv-about-cnv.html [NE,R=301]
 

_topic_map.yml

@@ -240,7 +240,7 @@ Topics:
     File: opting-out-of-remote-health-reporting
 ---
 Name: Web console
-Dir: web-console
+Dir: web_console
 Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
 Topics:
 - Name: Accessing the web console
@@ -367,7 +367,7 @@ Topics:
 - Name: Configuring network policy
   File: configuring-networkpolicy
 - Name: Multiple networks
-  Dir: multiple-networks
+  Dir: multiple_networks
   Distros: openshift-enterprise,openshift-origin
   Topics:
   - Name: Understanding multiple networks
@@ -393,7 +393,7 @@ Topics:
   - Name: Configuring PTP
     File: configuring-ptp
 - Name: OpenShift SDN
-  Dir: openshift-sdn
+  Dir: openshift_sdn
   Topics:
   - Name: About OpenShift SDN
     File: about-openshift-sdn
@@ -417,7 +417,7 @@ Topics:
   - Name: Secured routes
     File: secured-routes
 - Name: Configuring ingress cluster traffic
-  Dir: configuring-ingress-cluster-traffic
+  Dir: configuring_ingress_cluster_traffic
   Topics:
   - Name: Overview
     File: overview-traffic
@@ -448,7 +448,7 @@ Topics:
   File: understanding-persistent-storage
   Distros: openshift-enterprise,openshift-origin,openshift-dedicated,openshift-online
 - Name: Configuring persistent storage
-  Dir: persistent-storage
+  Dir: persistent_storage
   Distros: openshift-enterprise,openshift-origin
   Topics:
   - Name: Persistent storage using Amazon EFS
@@ -500,7 +500,7 @@ Topics:
   File: configuring-registry-operator
   Distros: openshift-enterprise,openshift-origin
 - Name: Setting up and configuring the registry
-  Dir: configuring-registry-storage
+  Dir: configuring_registry_storage
   Distros: openshift-enterprise,openshift-origin
   Topics:
   - Name: Configuring the registry for AWS user-provisioned infrastructure
@@ -530,7 +530,7 @@ Topics:
 - Name: Understanding Operators
   File: olm-what-operators-are
 - Name: Understanding the Operator Lifecycle Manager (OLM)
-  Dir: understanding-olm
+  Dir: understanding_olm
   Distros: openshift-enterprise,openshift-origin
   Topics:
   - Name: Workflow and architecture
@@ -653,7 +653,7 @@ Topics:
 - Name: Creating images
   File: create-images
 - Name: Managing images
-  Dir: managing-images
+  Dir: managing_images
   Topics:
   - Name: Managing images overview
     File: managing-images-overview
@@ -700,7 +700,7 @@ Topics:
     File: configuring-project-creation
     Distros: openshift-enterprise,openshift-origin
 - Name:  Application life cycle management
-  Dir: application-life-cycle-management
+  Dir: application_life_cycle_management
   Topics:
   - Name: Creating applications using the Developer perspective
     File: odc-creating-applications-using-developer-perspective
@@ -995,7 +995,7 @@ Dir: monitoring
 Distros: openshift-enterprise,openshift-origin
 Topics:
 - Name: Cluster monitoring
-  Dir: cluster-monitoring
+  Dir: cluster_monitoring
   Topics:
   - Name: About cluster monitoring
     File: about-cluster-monitoring
@@ -1021,7 +1021,7 @@ Topics:
 - Name: Installing metering
   File: metering-installing-metering
 - Name: Configuring metering
-  Dir: configuring-metering
+  Dir: configuring_metering
   Topics:
   - Name: About configuring metering
     File: metering-about-configuring
@@ -1105,7 +1105,7 @@ Dir: migration
 Distros: openshift-enterprise
 Topics:
 - Name: Migrating OpenShift Container Platform 3 to 4
-  Dir: migrating-3-4
+  Dir: migrating_3_4
   Topics:
   - Name: About migrating OpenShift Container Platform 3 to 4
     File: about-migration
@@ -1124,7 +1124,7 @@ Topics:
   - Name: Troubleshooting
     File: troubleshooting
 - Name: Migrating OpenShift Container Platform 4.1 to 4.3
-  Dir: migrating-4_1-4
+  Dir: migrating_4_1_4
   Topics:
   - Name: Migrating application workloads from OpenShift Container Platform 4.1 to 4.3
     File: migrating-application-workloads-4_1-to-4
@@ -1137,7 +1137,7 @@ Topics:
   - Name: Troubleshooting
     File: troubleshooting
 - Name: Migrating Openshift Container Platform 4.2 to 4.3
-  Dir: migrating-4_2-4
+  Dir: migrating_4_2_4
   Topics:
   - Name: Migrating application workloads from OpenShift Container Platform 4.2 to 4.3
     File: migrating-application-workloads-4_2-to-4
@@ -1198,7 +1198,7 @@ Topics:
   - Name: odo release notes
     File: odo-release-notes
 - Name: Helm CLI
-  Dir: helm-cli
+  Dir: helm_cli
   Distros: openshift-enterprise
   Topics:
   - Name: Getting started with Helm on OpenShift Container Platform

applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc

@@ -26,8 +26,8 @@ endif::[]
 .Prerequisites
 To create applications using the *Developer* perspective ensure that:
 
-* You have xref:../../web-console/web-console.adoc#web-console[logged in to the web console].
-* You are in the xref:../../web-console/odc-about-developer-perspective.adoc#odc-about-developer-perspective[*Developer* perspective].
+* You have xref:../../web_console/web-console.adoc#web-console[logged in to the web console].
+* You are in the xref:../../web_console/odc-about-developer-perspective.adoc#odc-about-developer-perspective[*Developer* perspective].
 * You have the appropriate xref:../../authentication/using-rbac.adoc#default-roles_using-rbac[roles and permissions] in a project to create applications and other workloads in {product-title}.
 
 ifdef::openshift-enterprise,openshift-origin[]

applications/application_life_cycle_management/odc-viewing-application-composition-using-topology-view.adoc

@@ -9,10 +9,10 @@ The *Topology* view in the *Developer* perspective of the web console provides a
 .Prerequisites
 To view your applications in the *Topology* view and interact with them, ensure that:
 
-* You have xref:../../web-console/web-console.adoc#web-console[logged in to the web console].
-* You are in the xref:../../web-console/odc-about-developer-perspective.adoc#odc-about-developer-perspective[*Developer* perspective].
+* You have xref:../../web_console/web-console.adoc#web-console[logged in to the web console].
+* You are in the xref:../../web_console/odc-about-developer-perspective.adoc#odc-about-developer-perspective[*Developer* perspective].
 * You have the appropriate xref:../../authentication/using-rbac.adoc#default-roles_using-rbac[roles and permissions] in a project to create applications and other workloads in {product-title}.
-* You have xref:../application-life-cycle-management/odc-creating-applications-using-developer-perspective.adoc#odc-creating-applications-using-developer-perspective[created and deployed an application on {product-title} using the *Developer* perspective].
+* You have xref:../../applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc#odc-creating-applications-using-developer-perspective[created and deployed an application on {product-title} using the *Developer* perspective].
 
 
 include::modules/odc-viewing-application-topology.adoc[leveloffset=+1]

applications/deployments/deployment-strategies.adoc

@@ -53,14 +53,14 @@ include::modules/deployments-canary-deployments.adoc[leveloffset=+2]
 include::modules/deployments-creating-rolling-deployment.adoc[leveloffset=+2]
 include::modules/odc-starting-rolling-deployment.adoc[leveloffset=+2]
 .Additional resources
-- xref:../../applications/application-life-cycle-management/odc-creating-applications-using-developer-perspective.adoc#odc-creating-applications-using-developer-perspective[Creating and deploying applications on {product-title} using the *Developer* perspective]
-- xref:../../applications/application-life-cycle-management/odc-viewing-application-composition-using-topology-view.adoc#odc-viewing-application-composition-using-topology-view[Viewing the applications in your project, verifying their deployment status, and interacting with them in the *Topology* view]
+- xref:../../applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc#odc-creating-applications-using-developer-perspective[Creating and deploying applications on {product-title} using the *Developer* perspective]
+- xref:../../applications/application_life_cycle_management/odc-viewing-application-composition-using-topology-view.adoc#odc-viewing-application-composition-using-topology-view[Viewing the applications in your project, verifying their deployment status, and interacting with them in the *Topology* view]
 
 include::modules/deployments-recreate-strategy.adoc[leveloffset=+1]
 include::modules/odc-starting-recreate-deployment.adoc[leveloffset=+1]
 .Additional resources
-- xref:../../applications/application-life-cycle-management/odc-creating-applications-using-developer-perspective.adoc#odc-creating-applications-using-developer-perspective[Creating and deploying applications on {product-title} using the *Developer* perspective]
-- xref:../../applications/application-life-cycle-management/odc-viewing-application-composition-using-topology-view.adoc#odc-viewing-application-composition-using-topology-view[Viewing the applications in your project, verifying their deployment status, and interacting with them in the *Topology* view]
+- xref:../../applications/application_life_cycle_management/odc-creating-applications-using-developer-perspective.adoc#odc-creating-applications-using-developer-perspective[Creating and deploying applications on {product-title} using the *Developer* perspective]
+- xref:../../applications/application_life_cycle_management/odc-viewing-application-composition-using-topology-view.adoc#odc-viewing-application-composition-using-topology-view[Viewing the applications in your project, verifying their deployment status, and interacting with them in the *Topology* view]
 
 include::modules/deployments-custom-strategy.adoc[leveloffset=+1]
 include::modules/deployments-lifecycle-hooks.adoc[leveloffset=+1]

cnv/cnv_install/installing-container-native-virtualization.adoc

@@ -8,7 +8,7 @@ Install {CNVProductName} to add virtualization functionality to your {product-ti
 cluster.
 
 You can use the {product-title} {product-version}
-xref:../../web-console/web-console.adoc#web-console-overview_web-console[web console]
+xref:../../web_console/web-console.adoc#web-console-overview_web-console[web console]
 to subscribe to and deploy the {CNVProductName} Operators.
 
 .Prerequisites

cnv/cnv_install/preparing-cluster-for-cnv.adoc

@@ -13,5 +13,5 @@ installation configurations are recommended:
 * The {product-title} cluster is installed on
 xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[bare metal].
 Manage your Compute nodes in accordance with the number and size of the virtual machines to host in the cluster.
-* xref:../../monitoring/cluster-monitoring/about-cluster-monitoring.adoc#about-cluster-monitoring[Monitoring]
+* xref:../../monitoring/cluster_monitoring/about-cluster-monitoring.adoc#about-cluster-monitoring[Monitoring]
 is configured in the cluster.

cnv/cnv_install/uninstalling-container-native-virtualization.adoc

@@ -5,7 +5,7 @@ include::modules/cnv-document-attributes.adoc[]
 toc::[]
 
 You can uninstall {CNVProductName} by using the {product-title}
-xref:../../web-console/web-console.adoc#web-console-overview_web-console[web console].
+xref:../../web_console/web-console.adoc#web-console-overview_web-console[web console].
 
 .Prerequisites
 

cnv/upgrading-container-native-virtualization.adoc

@@ -16,4 +16,4 @@ include::modules/cnv-monitoring-upgrade-status.adoc[leveloffset=+1]
 
 .Additional information
 
-* xref:../operators/understanding-olm/olm-understanding-olm.adoc#olm-csv_olm-understanding-olm[ClusterServiceVersions (CSVs)]
+* xref:../operators/understanding_olm/olm-understanding-olm.adoc#olm-csv_olm-understanding-olm[ClusterServiceVersions (CSVs)]

installing/install_config/customizations.adoc

@@ -42,7 +42,7 @@ to @api-approvers (github) or #forum-api-review (slack).
 |Controls default and enforced xref:../../builds/build-configuration.adoc#build-configuration[configuration] for all builds on the cluster.
 
 |console.config.openshift.io
-|Configures the behavior of the web console interface, including the xref:../../web-console/configuring-web-console.adoc#configuring-web-console[logout behavior].
+|Configures the behavior of the web console interface, including the xref:../../web_console/configuring-web-console.adoc#configuring-web-console[logout behavior].
 
 |featuregate.config.openshift.io
 |Enables xref:../../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[FeatureGates]
@@ -111,7 +111,7 @@ documentation for details on how and when you can create additional resource ins
 |alertmanager.monitoring.coreos.com
 |main
 |openshift-monitoring
-|Controls the xref:../../monitoring/cluster-monitoring/configuring-the-monitoring-stack.adoc#configuring-alertmanager[alertmanager] deployment parameters.
+|Controls the xref:../../monitoring/cluster_monitoring/configuring-the-monitoring-stack.adoc#configuring-alertmanager[alertmanager] deployment parameters.
 
 |ingresscontroller.operator.openshift.io
 |default

installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc

@@ -82,4 +82,4 @@ include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
 * xref:../../installing/install_config/customizations.adoc#customizations[Customize your cluster].
 * If necessary, you can
 xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting].
-* xref:../../registry/configuring-registry-storage/configuring-registry-storage-baremetal.adoc#configuring-registry-storage-baremetal[Set up your registry and configure registry storage].
+* xref:../../registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc#configuring-registry-storage-baremetal[Set up your registry and configure registry storage].

installing/installing_bare_metal/installing-bare-metal.adoc

@@ -84,4 +84,4 @@ include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
 * xref:../../installing/install_config/customizations.adoc#customizations[Customize your cluster].
 * If necessary, you can
 xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting].
-* xref:../../registry/configuring-registry-storage/configuring-registry-storage-baremetal.adoc#configuring-registry-storage-baremetal[Set up your registry and configure registry storage].
+* xref:../../registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc#configuring-registry-storage-baremetal[Set up your registry and configure registry storage].

installing/installing_ibm_z/installing-ibm-z.adoc

@@ -22,7 +22,7 @@ Restricted network installations are not tested or supported on IBM Z in {produc
 .Prerequisites
 
 * Provision
-xref:../../storage/persistent-storage/persistent-storage-nfs.adoc#persistent-storage-nfs[persistent storage using NFS]
+xref:../../storage/persistent_storage/persistent-storage-nfs.adoc#persistent-storage-nfs[persistent storage using NFS]
 for your cluster. To deploy a private image registry, your storage must provide
 ReadWriteMany access modes.
 * Review details about the

installing/installing_vsphere/installing-vsphere-network-customizations.adoc

@@ -77,4 +77,4 @@ include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
 * xref:../../installing/install_config/customizations.adoc#customizations[Customize your cluster].
 * If necessary, you can
 xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting].
-* xref:../../registry/configuring-registry-storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Set up your registry and configure registry storage].
+* xref:../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Set up your registry and configure registry storage].

installing/installing_vsphere/installing-vsphere.adoc

@@ -73,4 +73,4 @@ include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
 * xref:../../installing/install_config/customizations.adoc#customizations[Customize your cluster].
 * If necessary, you can
 xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting].
-* xref:../../registry/configuring-registry-storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Set up your registry and configure registry storage].
+* xref:../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Set up your registry and configure registry storage].

metering/configuring_metering/metering-about-configuring.adoc

@@ -7,10 +7,10 @@ toc::[]
 
 A `CustomResource` called your `MeteringConfig` specifies all the configuration details for your metering installation. When you first install the metering stack, a default `MeteringConfig` is generated. Use the examples in the documentation to modify this default file. Keep in mind the following key points:
 
-* At a minimum, you need to xref:../../metering/configuring-metering/metering-configure-persistent-storage.adoc#metering-configure-persistent-storage[configure persistent storage] and xref:../../metering/configuring-metering/metering-configure-hive-metastore.adoc#metering-configure-hive-metastore[configure the Hive metastore].
+* At a minimum, you need to xref:../../metering/configuring_metering/metering-configure-persistent-storage.adoc#metering-configure-persistent-storage[configure persistent storage] and xref:../../metering/configuring_metering/metering-configure-hive-metastore.adoc#metering-configure-hive-metastore[configure the Hive metastore].
 
 * Most default configuration settings work, but larger deployments or highly customized deployments should review all configuration options carefully.
 
-* Some configuration options can not be modifed after installation.
+* Some configuration options can not be modified after installation.
 
 For configuration options that can be modified after installation, make the changes in your `MeteringConfig` and reapply the file.

metering/metering-installing-metering.adoc

@@ -23,16 +23,16 @@ include::modules/metering-install-operator.adoc[leveloffset=+1]
 // Including this content directly in the assembly because the workflow requires linking off to the config docs, and we don't current link
 // inside of modules - klamenzo 2019-09-23
 [id="metering-install-metering-stack_{context}"]
-== Installing the Metering stack 
+== Installing the Metering stack
 
 After adding the Metering Operator to your cluster you can install the components of metering by installing the metering stack.
 
 .Prerequisites
 
-* Review the xref:../metering/configuring-metering/metering-about-configuring.adoc#metering-about-configuring[configuration options]
+* Review the xref:../metering/configuring_metering/metering-about-configuring.adoc#metering-about-configuring[configuration options]
 * Create a MeteringConfig resource. You can begin the following process to generate a default MeteringConfig, then use the examples in the documentation to modify this default file for your specific installation. Review the following topics to create your MeteringConfig resource:
-** For configuration options, review xref:../metering/configuring-metering/metering-about-configuring.adoc#metering-about-configuring[About configuring metering]. 
-** At a minimum, you need to xref:../metering/configuring-metering/metering-configure-persistent-storage.adoc#metering-configure-persistent-storage[configure persistent storage] and xref:../metering/configuring-metering/metering-configure-hive-metastore.adoc#metering-configure-hive-metastore[configure the Hive metastore].
+** For configuration options, review xref:../metering/configuring_metering/metering-about-configuring.adoc#metering-about-configuring[About configuring metering].
+** At a minimum, you need to xref:../metering/configuring_metering/metering-configure-persistent-storage.adoc#metering-configure-persistent-storage[configure persistent storage] and xref:../metering/configuring_metering/metering-configure-hive-metastore.adoc#metering-configure-hive-metastore[configure the Hive metastore].
 
 [IMPORTANT]
 ====
@@ -47,7 +47,7 @@ There can only be one MeteringConfig resource in the `openshift-metering` namesp
 +
 [NOTE]
 ====
-For example configuration files and all supported configuration options, review the xref:../metering/configuring-metering/metering-about-configuring.adoc#metering-about-configuring[configuing metering documentation].
+For example configuration files and all supported configuration options, review the xref:../metering/configuring_metering/metering-about-configuring.adoc#metering-about-configuring[configuing metering documentation].
 ====
 
 . Enter your MeteringConfig into the YAML editor and click *Create*.
@@ -59,7 +59,6 @@ include::modules/metering-install-verify.adoc[leveloffset=+1]
 [id="metering-install-additional-resources_{context}"]
 == Additional resources
 
-* For more information on configuration steps and available storage platforms, see xref:../metering/configuring-metering/metering-configure-persistent-storage.adoc#metering-configure-persistent-storage[Configuring persistent storage].
-
-* For the steps to configure Hive, see xref:../metering/configuring-metering/metering-configure-hive-metastore.adoc#metering-configure-hive-metastore[Configuring the Hive metastore].
+* For more information on configuration steps and available storage platforms, see xref:../metering/configuring_metering/metering-configure-persistent-storage.adoc#metering-configure-persistent-storage[Configuring persistent storage].
 
+* For the steps to configure Hive, see xref:../metering/configuring_metering/metering-configure-hive-metastore.adoc#metering-configure-hive-metastore[Configuring the Hive metastore].

metering/metering-troubleshooting-debugging.adoc

@@ -10,7 +10,7 @@ Use the following sections to help troubleshoot and debug specific issues with m
 In addition to the information in this section, be sure to review the following topics:
 
 * xref:../metering/metering-installing-metering.adoc#metering-install-prerequisites_installing-metering[Prerequities for installing metering].
-* xref:../metering/configuring-metering/metering-about-configuring.adoc#metering-about-configuring[About configuring metering]
+* xref:../metering/configuring_metering/metering-about-configuring.adoc#metering-about-configuring[About configuring metering]
 
 include::modules/metering-troubleshooting.adoc[leveloffset=+1]
 

metering/reports/metering-storage-locations.adoc

@@ -7,7 +7,7 @@ toc::[]
 
 A StorageLocation is a custom resource that configures where data will be stored by the reporting-operator. This includes the data collected from Prometheus, and the results produced by generating a Report custom resource.
 
-You only need to configure a StorageLocation if you want to store data in multiple locations, like multiple S3 buckets or both S3 and HDFS, or if you wish to access a database in Hive/Presto that was not created by metering. For most users this is not a requirement, and the xref:../../metering/configuring-metering/metering-about-configuring.adoc#metering-about-configuring[documentation on configuring metering] is sufficent to configure all necessary storage components.
+You only need to configure a StorageLocation if you want to store data in multiple locations, like multiple S3 buckets or both S3 and HDFS, or if you wish to access a database in Hive/Presto that was not created by metering. For most users this is not a requirement, and the xref:../../metering/configuring_metering/metering-about-configuring.adoc#metering-about-configuring[documentation on configuring metering] is sufficent to configure all necessary storage components.
 
 == StorageLocation examples
 

migration/migrating_3_4/about-migration.adoc

@@ -9,10 +9,10 @@ toc::[]
 
 To successfully transition from {product-title} 3 to {product-title} 4, it is important that you review the following information:
 
-xref:../../migration/migrating-3-4/planning-migration-3-to-4.adoc#planning-migration-3-to-4[Planning your transition]::
+xref:../../migration/migrating_3_4/planning-migration-3-to-4.adoc#planning-migration-3-to-4[Planning your transition]::
 Learn about the differences between {product-title} versions 3 and 4. Prior to transitioning, be sure that you have reviewed and prepared for storage, networking, logging, security, and monitoring considerations.
 
-xref:../../migration/migrating-3-4/migrating-application-workloads-3-to-4.adoc#migrating-application-workloads-3-to-4[Performing your migration]::
+xref:../../migration/migrating_3_4/migrating-application-workloads-3-to-4.adoc#migrating-application-workloads-3-to-4[Performing your migration]::
 Learn about and use the tools to perform your migration:
 * Cluster Application Migration (CAM) tool to migrate your application workloads
 * Control Plane Migration Assistant (CPMA) to migrate your control plane

migration/migrating_3_4/configuring-replication-repository.adoc

@@ -6,14 +6,14 @@ include::modules/common-attributes.adoc[]
 
 toc::[]
 
-You must configure an object storage to use as a replication repository. The Cluster Application Migration tool copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster, using either the xref:../../migration/migrating-3-4/configuring-replication-repository.adoc#file-system-copy-method_{context}[file system] or the xref:../../migration/migrating-3-4/configuring-replication-repository.adoc#snapshot-copy-method_{context}[snapshot] data copy method.
+You must configure an object storage to use as a replication repository. The Cluster Application Migration tool copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster, using either the xref:../../migration/migrating_3_4/configuring-replication-repository.adoc#file-system-copy-method_{context}[file system] or the xref:../../migration/migrating_3_4/configuring-replication-repository.adoc#snapshot-copy-method_{context}[snapshot] data copy method.
 
 The following storage providers are supported:
 
 * Generic S3 object storage, for example, NooBaa, Minio, Ceph S3
-* xref:../../migration/migrating-3-4/configuring-replication-repository.adoc#migration-configuring-aws-s3_{context}[AWS S3]
-* xref:../../migration/migrating-3-4/configuring-replication-repository.adoc#migration-configuring-gcp_{context}[Google Cloud Provider]
-* xref:../../migration/migrating-3-4/configuring-replication-repository.adoc#migration-configuring-azure_{context}[Microsoft Azure]
+* xref:../../migration/migrating_3_4/configuring-replication-repository.adoc#migration-configuring-aws-s3_{context}[AWS S3]
+* xref:../../migration/migrating_3_4/configuring-replication-repository.adoc#migration-configuring-gcp_{context}[Google Cloud Provider]
+* xref:../../migration/migrating_3_4/configuring-replication-repository.adoc#migration-configuring-azure_{context}[Microsoft Azure]
 
 include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1]
 include::modules/migration-configuring-aws-s3.adoc[leveloffset=+1]

migration/migrating_3_4/deploying_cam.adoc

@@ -6,7 +6,7 @@ include::modules/common-attributes.adoc[]
 
 toc::[]
 
-Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating-3-4/deploying_cam.adoc#installing-cam-operator-ocp-3_sourcecluster-3-4[{product-title} 3 source] and xref:../../migration/migrating-3-4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-3-4[{product-title} {product-version} target] clusters.
+Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating_3_4/deploying_cam.adoc#installing-cam-operator-ocp-3_sourcecluster-3-4[{product-title} 3 source] and xref:../../migration/migrating_3_4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-3-4[{product-title} {product-version} target] clusters.
 
 :context: sourcecluster-3-4
 :sourcecluster-3-4:

migration/migrating_3_4/migrating-application-workloads-3-to-4.adoc

@@ -10,11 +10,11 @@ You can migrate application workloads from {product-title} 3.7 (and later) to {p
 
 The CAM tool's web console and API, based on Kubernetes Custom Resources, enable you to migrate stateful application workloads at the granularity of a namespace.
 
-Optionally, you can use the xref:../../migration/migrating-3-4/migrating-with-cpma.adoc#migration-understanding-cpma_{context}[Control Plane Migration Assistant (CPMA)] to assist you in migrating control plane settings.
+Optionally, you can use the xref:../../migration/migrating_3_4/migrating-with-cpma.adoc#migration-understanding-cpma_{context}[Control Plane Migration Assistant (CPMA)] to assist you in migrating control plane settings.
 
 [IMPORTANT]
 ====
-Before you begin your migration, be sure to review the information on xref:../../migration/migrating-3-4/planning-migration-3-to-4.adoc#planning-migration-3-to-4[planning your migration].
+Before you begin your migration, be sure to review the information on xref:../../migration/migrating_3_4/planning-migration-3-to-4.adoc#planning-migration-3-to-4[planning your migration].
 ====
 
 include::modules/migration-prerequisites.adoc[leveloffset=+1]

migration/migrating_3_4/planning-migration-3-to-4.adoc

@@ -12,7 +12,7 @@ Before performing your migration to {product-title} 4.3, it is important to take
 This planning document assumes that you are transitioning from {product-title} 3.11 to {product-title} 4.3.
 ====
 
-This document provides high-level information on the most important xref:../../migration/migrating-3-4/planning-migration-3-to-4.adoc#migration-comparing-ocp-3-4[differences between {product-title} 3 and {product-title} 4] and the most noteworthy xref:../../migration/migrating-3-4/planning-migration-3-to-4.adoc#migration-considerations[migration considerations]. For detailed information on configuring your {product-title} 4 cluster, review the appropriate sections of the {product-title} documentation. For detailed information on new features and other notable technical changes, review the xref:../../release_notes/ocp-4-4-release-notes.adoc#ocp-4-4-release-notes[OpenShift Container Platform 4.4 release notes].
+This document provides high-level information on the most important xref:../../migration/migrating_3_4/planning-migration-3-to-4.adoc#migration-comparing-ocp-3-4[differences between {product-title} 3 and {product-title} 4] and the most noteworthy xref:../../migration/migrating_3_4/planning-migration-3-to-4.adoc#migration-considerations[migration considerations]. For detailed information on configuring your {product-title} 4 cluster, review the appropriate sections of the {product-title} documentation. For detailed information on new features and other notable technical changes, review the xref:../../release_notes/ocp-4-4-release-notes.adoc#ocp-4-4-release-notes[OpenShift Container Platform 4.4 release notes].
 
 It is not possible to upgrade your existing {product-title} 3 cluster to {product-title} 4. You must start with a new {product-title} 4 installation. Tools are available to assist in migrating your control plane settings and application workloads.
 
@@ -87,21 +87,21 @@ Review the following storage changes to consider when transitioning from {produc
 
 Local storage is only supported by using the Local Storage Operator in {product-title} 4.3. It is not supported to use the local provisioner method from {product-title} 3.11.
 
-For more information, see xref:../../storage/persistent-storage/persistent-storage-local.adoc#persistent-storage-using-local-volume[Persistent storage using local volumes].
+For more information, see xref:../../storage/persistent_storage/persistent-storage-local.adoc#persistent-storage-using-local-volume[Persistent storage using local volumes].
 
 [discrete]
 ==== FlexVolume persistent storage
 
 The FlexVolume plug-in location changed from {product-title} 3.11. The new location in {product-title} 4.3 is `/etc/kubernetes/kubelet-plugins/volume/exec`. Attachable FlexVolume plug-ins are no longer supported.
 
-For more information, see xref:../../storage/persistent-storage/persistent-storage-flexvolume.adoc#persistent-storage-using-flexvolume[Persistent storage using FlexVolume].
+For more information, see xref:../../storage/persistent_storage/persistent-storage-flexvolume.adoc#persistent-storage-using-flexvolume[Persistent storage using FlexVolume].
 
 [discrete]
 ==== Container Storage Interface (CSI) persistent storage
 
 Persistent storage using the Container Storage Interface (CSI) was link:https://access.redhat.com/support/offerings/techpreview[Technology Preview] in {product-title} 3.11. CSI version 1.1.0 is fully supported in {product-title} 4.3, but does not ship with any CSI drivers. You must install your own driver.
 
-For more information, see xref:../../storage/persistent-storage/persistent-storage-csi.adoc#persistent-storage-using-csi[Persistent storage using the Container Storage Interface (CSI)].
+For more information, see xref:../../storage/persistent_storage/persistent-storage-csi.adoc#persistent-storage-using-csi[Persistent storage using the Container Storage Interface (CSI)].
 
 [discrete]
 ==== Unsupported persistent storage options
@@ -190,4 +190,4 @@ Review the following monitoring changes to consider when transitioning from {pro
 
 The default alert that triggers to ensure the availability of the monitoring structure was called `DeadMansSwitch` in {product-title} 3.11. This was renamed to `Watchdog` in {product-title} 4. If you had PagerDuty integration set up with this alert in {product-title} 3.11, you must set up the PagerDuty integration for the `Watchdog` alert in {product-title} 4.
 
-For more information, see xref:../../monitoring/cluster-monitoring/configuring-the-monitoring-stack.adoc#applying-custom-alertmanager-configuration_configuring-monitoring[Applying custom Alertmanager configuration].
+For more information, see xref:../../monitoring/cluster_monitoring/configuring-the-monitoring-stack.adoc#applying-custom-alertmanager-configuration_configuring-monitoring[Applying custom Alertmanager configuration].

migration/migrating_4_1_4/configuring-replication-repository.adoc

@@ -6,14 +6,14 @@ include::modules/common-attributes.adoc[]
 
 toc::[]
 
-You must configure an object storage to use as a replication repository. The Cluster Application Migration tool copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster, using either the xref:../../migration/migrating-4_1-4/configuring-replication-repository.adoc#file-system-copy-method_{context}[file system] or the xref:../../migration/migrating-4_1-4/configuring-replication-repository.adoc#snapshot-copy-method_{context}[snapshot] data copy method.
+You must configure an object storage to use as a replication repository. The Cluster Application Migration tool copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster, using either the xref:../../migration/migrating_4_1_4/configuring-replication-repository.adoc#file-system-copy-method_{context}[file system] or the xref:../../migration/migrating_4_1_4/configuring-replication-repository.adoc#snapshot-copy-method_{context}[snapshot] data copy method.
 
 The following storage providers are supported:
 
 * Generic S3 object storage, for example, NooBaa, Minio, Ceph S3
-* xref:../../migration/migrating-4_1-4/configuring-replication-repository.adoc#migration-configuring-aws-s3_{context}[AWS S3]
-* xref:../../migration/migrating-4_1-4/configuring-replication-repository.adoc#migration-configuring-gcp_{context}[Google Cloud Provider]
-* xref:../../migration/migrating-4_1-4/configuring-replication-repository.adoc#migration-configuring-azure_{context}[Microsoft Azure]
+* xref:../../migration/migrating_4_1_4/configuring-replication-repository.adoc#migration-configuring-aws-s3_{context}[AWS S3]
+* xref:../../migration/migrating_4_1_4/configuring-replication-repository.adoc#migration-configuring-gcp_{context}[Google Cloud Provider]
+* xref:../../migration/migrating_4_1_4/configuring-replication-repository.adoc#migration-configuring-azure_{context}[Microsoft Azure]
 
 include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1]
 include::modules/migration-configuring-aws-s3.adoc[leveloffset=+1]

migration/migrating_4_1_4/deploying_cam.adoc

@@ -6,7 +6,7 @@ include::modules/common-attributes.adoc[]
 
 toc::[]
 
-Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating-4_1-4/deploying_cam.adoc#installing-cam-operator-ocp-4_sourcecluster-4_1-4_x[{product-title} 4.1 source] and xref:../../migration/migrating-4_1-4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-4_1-4_x[{product-title} {product-version} target] clusters.
+Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating_4_1_4/deploying_cam.adoc#installing-cam-operator-ocp-4_sourcecluster-4_1-4_x[{product-title} 4.1 source] and xref:../../migration/migrating_4_1_4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-4_1-4_x[{product-title} {product-version} target] clusters.
 
 :context: sourcecluster-4_1-4_x
 :sourcecluster-4_1-4_x:

migration/migrating_4_2_4/configuring-replication-repository.adoc

@@ -6,14 +6,14 @@ include::modules/common-attributes.adoc[]
 
 toc::[]
 
-You must configure an object storage to use as a replication repository. The Cluster Application Migration tool copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster, using either the xref:../../migration/migrating-4_2-4/configuring-replication-repository.adoc#file-system-copy-method_{context}[file system] or the xref:../../migration/migrating-4_2-4/configuring-replication-repository.adoc#snapshot-copy-method_{context}[snapshot] data copy method.
+You must configure an object storage to use as a replication repository. The Cluster Application Migration tool copies data from the source cluster to the replication repository, and then from the replication repository to the target cluster, using either the xref:../../migration/migrating_4_2_4/configuring-replication-repository.adoc#file-system-copy-method_{context}[file system] or the xref:../../migration/migrating_4_2_4/configuring-replication-repository.adoc#snapshot-copy-method_{context}[snapshot] data copy method.
 
 The following storage providers are supported:
 
 * Generic S3 object storage, for example, NooBaa, Minio, Ceph S3
-* xref:../../migration/migrating-4_2-4/configuring-replication-repository.adoc#migration-configuring-aws-s3_{context}[AWS S3]
-* xref:../../migration/migrating-4_2-4/configuring-replication-repository.adoc#migration-configuring-gcp_{context}[Google Cloud Provider]
-* xref:../../migration/migrating-4_2-4/configuring-replication-repository.adoc#migration-configuring-azure_{context}[Microsoft Azure]
+* xref:../../migration/migrating_4_2_4/configuring-replication-repository.adoc#migration-configuring-aws-s3_{context}[AWS S3]
+* xref:../../migration/migrating_4_2_4/configuring-replication-repository.adoc#migration-configuring-gcp_{context}[Google Cloud Provider]
+* xref:../../migration/migrating_4_2_4/configuring-replication-repository.adoc#migration-configuring-azure_{context}[Microsoft Azure]
 
 include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1]
 include::modules/migration-configuring-aws-s3.adoc[leveloffset=+1]

migration/migrating_4_2_4/deploying_cam.adoc

@@ -6,7 +6,7 @@ include::modules/common-attributes.adoc[]
 
 toc::[]
 
-Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating-4_2-4/deploying_cam.adoc#installing-cam-operator-ocp-4_sourcecluster-4_2-4_x[{product-title} 4.2 source] and xref:../../migration/migrating-4_2-4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-4_2-4_x[{product-title} {product-version} target] clusters.
+Deploying the Cluster Application Migration (CAM) tool requires installing the CAM Operator on the xref:../../migration/migrating_4_2_4/deploying_cam.adoc#installing-cam-operator-ocp-4_sourcecluster-4_2-4_x[{product-title} 4.2 source] and xref:../../migration/migrating_4_2_4/deploying_cam.adoc#installing-cam-operator-ocp-4_targetcluster-4_2-4_x[{product-title} {product-version} target] clusters.
 
 :context: sourcecluster-4_2-4_x
 :sourcecluster-4_2-4_x:

modules/adding-a-custom-logo.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * web-console/customizing-the-web-console.adoc
+// * web_console/customizing-the-web-console.adoc
 
 [id="adding-a-custom-logo_{context}"]
 = Adding a custom logo and product name

modules/adding-custom-notification-banners.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * web-console/customizing-the-web-console.adoc
+// * web_console/customizing-the-web-console.adoc
 
 [id="creating-custom-notification-banners_{context}"]
 = Creating custom notification banners

modules/adding-yaml-examples-to-kube-resources.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * web-console/customizing-the-web-console.adoc
+// * web_console/customizing-the-web-console.adoc
 
 [id="adding-yaml-examples-to-kube-resources_{context}"]
 = Adding YAML examples to Kubernetes resources

modules/applications-create-using-cli-image.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * applications/application-life-cycle-management/creating-applications-using-the-cli.adoc
+// * applications/application_life_cycle_management/creating-applications-using-the-cli.adoc
 
 [id="applications-create-using-cli-image_{context}"]
 = Creating an application from an image

modules/applications-create-using-cli-modify.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * applications/application-life-cycle-management/creating-applications-using-the-cli.adoc
+// * applications/application_life_cycle_management/creating-applications-using-the-cli.adoc
 
 [id="applications-create-using-cli-modify_{context}"]
 = Modifying application creation

modules/applications-create-using-cli-source-code.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * applications/application-life-cycle-management/creating-applications-using-the-cli.adoc
+// * applications/application_life_cycle_management/creating-applications-using-the-cli.adoc
 
 [id="applications-create-using-cli-source-code_{context}"]
 = Creating an application from source code

modules/applications-create-using-cli-template.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * applications/application-life-cycle-management/creating-applications-using-the-cli.adoc
+// * applications/application_life_cycle_management/creating-applications-using-the-cli.adoc
 
 [id="applications-create-using-cli-template_{context}"]
 = Creating an application from a template

modules/cnv-about-the-overview-dashboard.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 // * cnv/cnv_users_guide/cnv-using-dashboard-to-get-cluster-info.adoc
-// * web-console/using-dashboard-to-get-cluster-information.adoc
+// * web_console/using-dashboard-to-get-cluster-information.adoc
 ifeval::["{context}" == "cnv-using-dashboard-to-get-cluster-info"]
 :cnv-cluster:
 endif::[]

modules/creating-custom-links.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * web-console/customizing-the-web-console.adoc
+// * web_console/customizing-the-web-console.adoc
 
 [id="creating-custom-links_{context}"]
 = Creating custom links in the web console

modules/customizing-cli-downloads.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * web-console/customizing-the-web-console.adoc
+// * web_console/customizing-the-web-console.adoc
 
 [id="creating-custom-CLI-downloads_{context}"]
 = Customizing CLI downloads

modules/defining-template-for-external-log-link.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * web-console/customizing-the-web-console.adoc
+// * web_console/customizing-the-web-console.adoc
 
 [id="defining-template-for-external-log-links_{context}"]
 = Defining a template for an external log link

modules/dynamic-provisioning-azure-file-considerations.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// storage/persistent-storage/persistent-storage-azure-file.adoc
+// storage/persistent_storage/persistent-storage-azure-file.adoc
 
 [id="azure-file-considerations_{context}"]
 = Considerations when using Azure File

modules/metering-configure-persistentvolumes.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * metering/configuring-metering/metering-configure-hive-metastore.adoc
+// * monitoring/cluster_monitoring/metering-configure-hive-metastore.adoc
 
 [id="metering-configure-persistentvolumes_{context}"]
 = Configuring PersistentVolumes

modules/metering-exposing-the-reporting-api.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * metering/configuring-metering/metering-configure-reporting-operator.adoc
+// * monitoring/cluster_monitoring/metering-configure-reporting-operator.adoc
 
 [id="metering-exposing-the-reporting-api_{context}"]
 = Exposing the reporting API

modules/metering-prometheus-connection.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * metering/configuring-metering/metering-configure-reporting-operator.adoc
+// * monitoring/cluster_monitoring/metering-configure-reporting-operator.adoc
 
 [id="metering-prometheus-connection_{context}"]
 = Prometheus connection

modules/metering-store-data-in-azure.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * metering/configuring-metering/metering-configure-persistent-storage.adoc
+// * monitoring/cluster_monitoring/metering-configure-persistent-storage.adoc
 
 [id="metering-store-data-in-azure_{context}"]
 = Storing data in Microsoft Azure

modules/metering-store-data-in-gcp.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * metering/configuring-metering/metering-configure-persistent-storage.adoc
+// * monitoring/cluster_monitoring/metering-configure-persistent-storage.adoc
 
 [id="metering-store-data-in-gcp_{context}"]
 = Storing data in Google Cloud Storage

modules/metering-store-data-in-s3-compatible.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * metering/configuring-metering/metering-configure-persistent-storage.adoc
+// * monitoring/cluster_monitoring/metering-configure-persistent-storage.adoc
 
 [id="metering-store-data-in-s3-compatible_{context}"]
 = Storing data in S3-compatible storage

modules/metering-store-data-in-s3.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * metering/configuring-metering/metering-configure-persistent-storage.adoc
+// * monitoring/cluster_monitoring/metering-configure-persistent-storage.adoc
 
 [id="metering-store-data-in-s3_{context}"]
 = Storing data in Amazon S3

modules/metering-store-data-in-shared-volumes.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * metering/configuring-metering/metering-configure-persistent-storage.adoc
+// * monitoring/cluster_monitoring/metering-configure-persistent-storage.adoc
 
 [id="metering-store-data-in-shared-volumes_{context}"]
 = Storing data in shared volumes

modules/metering-use-mysql-or-postgresql-for-hive.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * metering/configuring-metering/metering-configure-hive-metastore.adoc
+// * monitoring/cluster_monitoring/metering-configure-hive-metastore.adoc
 
 [id="metering-use-mysql-or-postgresql-for-hive_{context}"]
 = Use MySQL or PostgreSQL for the Hive metastore

modules/migration-adding-cluster-to-cam.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_1-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_2-4/migrating-applications-with-cam.adoc
+// migration/migrating_3_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_1_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_2_4/migrating-applications-with-cam.adoc
 [id='migration-adding-cluster-to-cam_{context}']
 = Adding a cluster to the CAM web console
 

modules/migration-adding-replication-repository-to-cam.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_1-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_2-4/migrating-applications-with-cam.adoc
+// migration/migrating_3_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_1_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_2_4/migrating-applications-with-cam.adoc
 [id='migration-adding-replication-repository-to-cam_{context}']
 = Adding a replication repository to the CAM web console
 

modules/migration-changing-migration-plan-limits.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_1-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_2-4/migrating-applications-with-cam.adoc
+// migration/migrating_3_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_1_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_2_4/migrating-applications-with-cam.adoc
 [id='migration-changing-migration-plan-limits_{context}']
 = Changing migration plan limits for large migrations
 

modules/migration-configuring-aws-s3.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/configuring-replication-repository.adoc
-// migration/migrating-4_1-4/configuring-replication-repository.adoc
-// migration/migrating-4_2-4/configuring-replication-repository.adoc
+// migration/migrating_3_4/configuring-replication-repository.adoc
+// migration/migrating_4_1_4/configuring-replication-repository.adoc
+// migration/migrating_4_2_4/configuring-replication-repository.adoc
 [id='migration-configuring-aws-s3_{context}']
 = Configuring an AWS S3 storage bucket as a replication repository
 

modules/migration-configuring-azure.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/configuring-replication-repository.adoc
-// migration/migrating-4_1-4/configuring-replication-repository.adoc
-// migration/migrating-4_2-4/configuring-replication-repository.adoc
+// migration/migrating_3_4/configuring-replication-repository.adoc
+// migration/migrating_4_1_4/configuring-replication-repository.adoc
+// migration/migrating_4_2_4/configuring-replication-repository.adoc
 [id='migration-configuring-azure_{context}']
 = Configuring a Microsoft Azure Blob storage container as a replication repository
 

modules/migration-configuring-gcp.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/configuring-replication-repository.adoc
-// migration/migrating-4_1-4/configuring-replication-repository.adoc
-// migration/migrating-4_2-4/configuring-replication-repository.adoc
+// migration/migrating_3_4/configuring-replication-repository.adoc
+// migration/migrating_4_1_4/configuring-replication-repository.adoc
+// migration/migrating_4_2_4/configuring-replication-repository.adoc
 [id='migration-configuring-gcp_{context}']
 = Configuring a Google Cloud Provider storage bucket as a replication repository
 

modules/migration-creating-migration-plan-cam.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_1-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_2-4/migrating-applications-with-cam.adoc
+// migration/migrating_3_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_1_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_2_4/migrating-applications-with-cam.adoc
 [id='migration-creating-migration-plan-cam_{context}']
 = Creating a migration plan in the CAM web console
 

modules/migration-downloading-logs.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/troubleshooting.adoc
-// migration/migrating-4_1-4/troubleshooting.adoc
-// migration/migrating-4_2-4/troubleshooting.adoc
+// migration/migrating_3_4/troubleshooting.adoc
+// migration/migrating_4_1_4/troubleshooting.adoc
+// migration/migrating_4_2_4/troubleshooting.adoc
 [id='migration-downloading-logs_{context}']
 = Downloading migration logs
 

modules/migration-installing-cam-operator-ocp-3.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/deploying_cam.adoc
+// migration/migrating_3_4/deploying_cam.adoc
 [id="installing-cam-operator-ocp-3_{context}"]
 = Installing the CAM Operator on an {product-title} 3 source cluster
 

modules/migration-installing-cam-operator-ocp-4.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/deploying_cam.adoc
-// migration/migrating-4_1-4/deploying_cam.adoc
-// migration/migrating-4_2-4/deploying_cam.adoc
+// migration/migrating_3_4/deploying_cam.adoc
+// migration/migrating_4_1_4/deploying_cam.adoc
+// migration/migrating_4_2_4/deploying_cam.adoc
 [id="installing-cam-operator-ocp-4_{context}"]
 ifdef::sourcecluster-4_1-4_x[]
 = Installing the CAM Operator on an {product-title} 4.1 source cluster

modules/migration-known-issues.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/troubleshooting.adoc
-// migration/migrating-4_1-4/troubleshooting.adoc
-// migration/migrating-4_2-4/troubleshooting.adoc
+// migration/migrating_3_4/troubleshooting.adoc
+// migration/migrating_4_1_4/troubleshooting.adoc
+// migration/migrating_4_2_4/troubleshooting.adoc
 [id='migration-known-issues_{context}']
 = Known issues
 

modules/migration-launching-cam.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_1-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_2-4/migrating-applications-with-cam.adoc
+// migration/migrating_3_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_1_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_2_4/migrating-applications-with-cam.adoc
 [id="migration-launching-cam_{context}"]
 = Launching the CAM web console
 

modules/migration-manually-rolling-back-migration.adoc

@@ -1,5 +1,5 @@
 // Module included in the following assemblies:
-// migration/migrating-3-4/troubleshooting.adoc
+// migration/migrating_3_4/troubleshooting.adoc
 // migration/migrating-4-4/troubleshooting.adoc
 // migration/migrating-4-4/troubleshooting.adoc
 [id='migration-manually-rolling-back-migration_{context}']

modules/migration-prerequisites.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/migrating-application-workloads-3-to-4.adoc
-// migration/migrating-4_1-4/migrating-application-workloads-4_1-to-4.adoc
-// migration/migrating-4_2-4/migrating-application-workloads-4_2-to-4.adoc
+// migration/migrating_3_4/migrating-application-workloads-3-to-4.adoc
+// migration/migrating_4_1_4/migrating-application-workloads-4_1-to-4.adoc
+// migration/migrating_4_2_4/migrating-application-workloads-4_2-to-4.adoc
 [id='migration-prerequisites_{context}']
 = Migration prerequisites
 

modules/migration-restic-timeout.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/troubleshooting.adoc
-// migration/migrating-4_1-4/troubleshooting.adoc
-// migration/migrating-4_2-4/troubleshooting.adoc
+// migration/migrating_3_4/troubleshooting.adoc
+// migration/migrating_4_1_4/troubleshooting.adoc
+// migration/migrating_4_2_4/troubleshooting.adoc
 [id='migration-restic-timeout_{context}']
 = Restic timeout error
 

modules/migration-running-migration-plan-cam.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_1-4/migrating-applications-with-cam.adoc
-// migration/migrating-4_2-4/migrating-applications-with-cam.adoc
+// migration/migrating_3_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_1_4/migrating-applications-with-cam.adoc
+// migration/migrating_4_2_4/migrating-applications-with-cam.adoc
 [id='migration-running-migration-plan-cam_{context}']
 = Running a migration plan in the CAM web console
 

modules/migration-understanding-cam.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/migrating-application-workloads-3-to-4.adoc
+// migration/migrating_3_4/migrating-application-workloads-3-to-4.adoc
 // migration/migrating-4-4/migrating-application-workloads-4_1-to-4.adoc
 // migration/migrating-4-4/migrating-application-workloads-4_2-to-4.adoc
 [id='migration-understanding-cam_{context}']

modules/migration-understanding-data-copy-methods.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/configuring-replication-repository.adoc
-// migration/migrating-4_1-4/configuring-replication-repository.adoc
-// migration/migrating-4_2-4/configuring-replication-repository.adoc
+// migration/migrating_3_4/configuring-replication-repository.adoc
+// migration/migrating_4_1_4/configuring-replication-repository.adoc
+// migration/migrating_4_2_4/configuring-replication-repository.adoc
 [id='migration-understanding-data-copy-methods_{context}']
 = Understanding the data copy methods for migration
 

modules/migration-viewing-migration-crs.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// migration/migrating-3-4/troubleshooting.adoc
-// migration/migrating-4_1-4/troubleshooting.adoc
-// migration/migrating-4_2-4/troubleshooting.adoc
+// migration/migrating_3_4/troubleshooting.adoc
+// migration/migrating_4_1_4/troubleshooting.adoc
+// migration/migrating_4_2_4/troubleshooting.adoc
 [id='migration-viewing-migration-crs_{context}']
 = Viewing migration Custom Resources (CRs)
 

modules/monitoring-about-cluster-monitoring.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * monitoring/cluster-monitoring/about-cluster-monitoring.adoc
+// * monitoring/cluster_monitoring/about-cluster-monitoring.adoc
 // * cnv/cnv_users_guide/cnv-openshift-cluster-monitoring.adoc
 //
 // This module uses a conditionalized title so that the module

modules/monitoring-accessing-prometheus-alerting-ui-grafana-using-the-web-console.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * monitoring/cluster-monitoring/prometheus-alertmanager-and-grafana.adoc
+// * monitoring/cluster_monitoring/prometheus-alertmanager-and-grafana.adoc
 
 [id="monitoring-accessing-prometheus-alerting-ui-grafana-using-the-web-console_{context}"]
 = Accessing Prometheus, Alerting UI, and Grafana using the web console

modules/monitoring-accessing-prometheus-alertmanager-grafana-directly.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * monitoring/cluster-monitoring/prometheus-alertmanager-and-grafana.adoc
+// * monitoring/cluster_monitoring/prometheus-alertmanager-and-grafana.adoc
 
 [id="monitoring-accessing-prometheus-alertmanager-grafana-directly_{context}"]
 = Accessing Prometheus, Alertmanager, and Grafana directly

modules/monitoring-accessing-the-metrics-of-your-service.adoc

@@ -40,4 +40,4 @@ Developers can only use the Developer Perspective. They can only query metrics f
 
 .Additional resources
 
-* See the xref:../monitoring/cluster-monitoring/examining-cluster-metrics.adoc#examining-cluster-metrics[section on using the PromQL interface].
+* See the xref:../monitoring/cluster_monitoring/examining-cluster-metrics.adoc#examining-cluster-metrics[section on using the PromQL interface].