From 6e74e65392b1a51a489c910bfaeb94a99152a114 Mon Sep 17 00:00:00 2001
From: Matthew Kassawara <mkassawara@gmail.com>
Date: Wed, 13 Jan 2016 17:06:03 -0700
Subject: [PATCH] [network] Preparation for Liberty/Mitaka updates

Prepare the networking guide for Liberty/Mitaka updates as
follows:

1) Change "legacy" to "classic" to provide a more positive
   connotation of such scenarios. Legacy should refer to
   nova-network.
2) Replace underscore with hyphen in filenames to meet
   conventions.
3) Replace :doc: with :ref: to minimize impact of future
   file renames.

Change-Id: I95bdd84b4a01cd9cbd06cad66821ad810295394f
backport: Liberty
---
 ...e.rst => adv-config-availability-zone.rst} |   0
 ...debugging.rst => adv-config-debugging.rst} |   0
 ..._config_FwaaS.rst => adv-config-fwaas.rst} |   0
 ...policy.rst => adv-config-group-policy.rst} |   0
 ...dv_config_ipam.rst => adv-config-ipam.rst} |   0
 ...dv_config_ipv6.rst => adv-config-ipv6.rst} |   0
 ..._config_LBaaS.rst => adv-config-lbaas.rst} |   0
 ...k_rbac.rst => adv-config-network-rbac.rst} |   0
 ...ational.rst => adv-config-operational.rst} |   0
 ...{adv_config_qos.rst => adv-config-qos.rst} |   0
 ...ng.rst => adv-config-service-chaining.rst} |   0
 ..._config_sriov.rst => adv-config-sriov.rst} |   0
 ...onfig_VPNaaS.rst => adv-config-vpnaas.rst} |   0
 doc/networking-guide/source/adv-config.rst    |  20 +++++++++
 doc/networking-guide/source/adv_config.rst    |  20 ---------
 ...ml2_plug_in.rst => config-ml2-plug-in.rst} |   0
 .../{config_server.rst => config-server.rst}  |   0
 doc/networking-guide/source/config.rst        |   4 +-
 doc/networking-guide/source/deploy.rst        |  14 +++---
 ...affle => scenario-classic-general.graffle} | Bin
 ...neral.png => scenario-classic-general.png} | Bin
 ...neral.svg => scenario-classic-general.svg} |   0
 ...hw.graffle => scenario-classic-hw.graffle} | Bin
 ...-legacy-hw.png => scenario-classic-hw.png} | Bin
 ...-legacy-hw.svg => scenario-classic-hw.svg} |   0
 ...e => scenario-classic-lb-compute1.graffle} | Bin
 ...1.png => scenario-classic-lb-compute1.png} | Bin
 ...1.svg => scenario-classic-lb-compute1.svg} |   0
 ...e => scenario-classic-lb-compute2.graffle} | Bin
 ...2.png => scenario-classic-lb-compute2.png} | Bin
 ...2.svg => scenario-classic-lb-compute2.svg} |   0
 ...le => scenario-classic-lb-flowew1.graffle} | Bin
 ...w1.png => scenario-classic-lb-flowew1.png} | Bin
 ...w1.svg => scenario-classic-lb-flowew1.svg} |   0
 ...le => scenario-classic-lb-flowew2.graffle} | Bin
 ...w2.png => scenario-classic-lb-flowew2.png} | Bin
 ...w2.svg => scenario-classic-lb-flowew2.svg} |   0
 ...le => scenario-classic-lb-flowns1.graffle} | Bin
 ...s1.png => scenario-classic-lb-flowns1.png} | Bin
 ...s1.svg => scenario-classic-lb-flowns1.svg} |   0
 ...le => scenario-classic-lb-flowns2.graffle} | Bin
 ...s2.png => scenario-classic-lb-flowns2.png} | Bin
 ...s2.svg => scenario-classic-lb-flowns2.svg} |   0
 ...e => scenario-classic-lb-network1.graffle} | Bin
 ...1.png => scenario-classic-lb-network1.png} | Bin
 ...1.svg => scenario-classic-lb-network1.svg} |   0
 ...e => scenario-classic-lb-network2.graffle} | Bin
 ...2.png => scenario-classic-lb-network2.png} | Bin
 ...2.svg => scenario-classic-lb-network2.svg} |   0
 ...e => scenario-classic-lb-services.graffle} | Bin
 ...s.png => scenario-classic-lb-services.png} | Bin
 ...s.svg => scenario-classic-lb-services.svg} |   0
 ...ffle => scenario-classic-networks.graffle} | Bin
 ...orks.png => scenario-classic-networks.png} | Bin
 ...orks.svg => scenario-classic-networks.svg} |   0
 ... => scenario-classic-ovs-compute1.graffle} | Bin
 ....png => scenario-classic-ovs-compute1.png} | Bin
 ....svg => scenario-classic-ovs-compute1.svg} |   0
 ... => scenario-classic-ovs-compute2.graffle} | Bin
 ....png => scenario-classic-ovs-compute2.png} | Bin
 ....svg => scenario-classic-ovs-compute2.svg} |   0
 ...e => scenario-classic-ovs-flowew1.graffle} | Bin
 ...1.png => scenario-classic-ovs-flowew1.png} | Bin
 ...1.svg => scenario-classic-ovs-flowew1.svg} |   0
 ...e => scenario-classic-ovs-flowew2.graffle} | Bin
 ...2.png => scenario-classic-ovs-flowew2.png} | Bin
 ...2.svg => scenario-classic-ovs-flowew2.svg} |   0
 ...e => scenario-classic-ovs-flowns1.graffle} | Bin
 ...1.png => scenario-classic-ovs-flowns1.png} | Bin
 ...1.svg => scenario-classic-ovs-flowns1.svg} |   0
 ...e => scenario-classic-ovs-flowns2.graffle} | Bin
 ...2.png => scenario-classic-ovs-flowns2.png} | Bin
 ...2.svg => scenario-classic-ovs-flowns2.svg} |   0
 ... => scenario-classic-ovs-network1.graffle} | Bin
 ....png => scenario-classic-ovs-network1.png} | Bin
 ....svg => scenario-classic-ovs-network1.svg} |   0
 ... => scenario-classic-ovs-network2.graffle} | Bin
 ....png => scenario-classic-ovs-network2.png} | Bin
 ....svg => scenario-classic-ovs-network2.svg} |   0
 ... => scenario-classic-ovs-services.graffle} | Bin
 ....png => scenario-classic-ovs-services.png} | Bin
 ....svg => scenario-classic-ovs-services.svg} |   0
 doc/networking-guide/source/index.rst         |   6 +--
 ...working.rst => intro-basic-networking.rst} |   0
 ... => intro-network-address-translation.rst} |   0
 ...paces.rst => intro-network-namespaces.rst} |   0
 ...ts.rst => intro-networking-components.rst} |   0
 ...ro_networking.rst => intro-networking.rst} |  10 ++---
 ...w.rst => intro-os-networking-overview.rst} |   0
 ...ce.rst => intro-os-networking-service.rst} |   0
 ...networking.rst => intro-os-networking.rst} |   4 +-
 ...gies.rst => intro-tunnel-technologies.rst} |   0
 ...o_dvr.rst => migration-classic-to-dvr.rst} |   0
 ...3_HA.rst => migration-classic-to-l3ha.rst} |  12 +++---
 ... => migration-nova-network-to-neutron.rst} |   0
 doc/networking-guide/source/migration.rst     |   6 +--
 ..._for_DHCP.rst => misc-add-ha-for-dhcp.rst} |   0
 .../{misc_libvirt.rst => misc-libvirt.rst}    |   0
 doc/networking-guide/source/miscellaneous.rst |   4 +-
 ..._legacy_lb.rst => scenario-classic-lb.rst} |  40 +++++++++---------
 ...egacy_ovs.rst => scenario-classic-ovs.rst} |  40 +++++++++---------
 ...nario_dvr_ovs.rst => scenario-dvr-ovs.rst} |  12 +++---
 ...nario_l3ha_lb.rst => scenario-l3ha-lb.rst} |  10 +++--
 ...rio_l3ha_ovs.rst => scenario-l3ha-ovs.rst} |  10 +++--
 ...ovider_lb.rst => scenario-provider-lb.rst} |   2 +
 ...ider_ovs.rst => scenario-provider-ovs.rst} |   2 +
 tox.ini                                       |   2 +-
 107 files changed, 116 insertions(+), 102 deletions(-)
 rename doc/networking-guide/source/{adv_config_availability_zone.rst => adv-config-availability-zone.rst} (100%)
 rename doc/networking-guide/source/{adv_config_debugging.rst => adv-config-debugging.rst} (100%)
 rename doc/networking-guide/source/{adv_config_FwaaS.rst => adv-config-fwaas.rst} (100%)
 rename doc/networking-guide/source/{adv_config_group_policy.rst => adv-config-group-policy.rst} (100%)
 rename doc/networking-guide/source/{adv_config_ipam.rst => adv-config-ipam.rst} (100%)
 rename doc/networking-guide/source/{adv_config_ipv6.rst => adv-config-ipv6.rst} (100%)
 rename doc/networking-guide/source/{adv_config_LBaaS.rst => adv-config-lbaas.rst} (100%)
 rename doc/networking-guide/source/{adv_config_network_rbac.rst => adv-config-network-rbac.rst} (100%)
 rename doc/networking-guide/source/{adv_config_operational.rst => adv-config-operational.rst} (100%)
 rename doc/networking-guide/source/{adv_config_qos.rst => adv-config-qos.rst} (100%)
 rename doc/networking-guide/source/{adv_config_service_chaining.rst => adv-config-service-chaining.rst} (100%)
 rename doc/networking-guide/source/{adv_config_sriov.rst => adv-config-sriov.rst} (100%)
 rename doc/networking-guide/source/{adv_config_VPNaaS.rst => adv-config-vpnaas.rst} (100%)
 create mode 100644 doc/networking-guide/source/adv-config.rst
 delete mode 100644 doc/networking-guide/source/adv_config.rst
 rename doc/networking-guide/source/{config_ml2_plug_in.rst => config-ml2-plug-in.rst} (100%)
 rename doc/networking-guide/source/{config_server.rst => config-server.rst} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-general.graffle => scenario-classic-general.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-general.png => scenario-classic-general.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-general.svg => scenario-classic-general.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-hw.graffle => scenario-classic-hw.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-hw.png => scenario-classic-hw.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-hw.svg => scenario-classic-hw.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-compute1.graffle => scenario-classic-lb-compute1.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-compute1.png => scenario-classic-lb-compute1.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-compute1.svg => scenario-classic-lb-compute1.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-compute2.graffle => scenario-classic-lb-compute2.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-compute2.png => scenario-classic-lb-compute2.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-compute2.svg => scenario-classic-lb-compute2.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowew1.graffle => scenario-classic-lb-flowew1.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowew1.png => scenario-classic-lb-flowew1.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowew1.svg => scenario-classic-lb-flowew1.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowew2.graffle => scenario-classic-lb-flowew2.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowew2.png => scenario-classic-lb-flowew2.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowew2.svg => scenario-classic-lb-flowew2.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowns1.graffle => scenario-classic-lb-flowns1.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowns1.png => scenario-classic-lb-flowns1.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowns1.svg => scenario-classic-lb-flowns1.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowns2.graffle => scenario-classic-lb-flowns2.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowns2.png => scenario-classic-lb-flowns2.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-flowns2.svg => scenario-classic-lb-flowns2.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-network1.graffle => scenario-classic-lb-network1.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-network1.png => scenario-classic-lb-network1.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-network1.svg => scenario-classic-lb-network1.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-network2.graffle => scenario-classic-lb-network2.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-network2.png => scenario-classic-lb-network2.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-network2.svg => scenario-classic-lb-network2.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-services.graffle => scenario-classic-lb-services.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-services.png => scenario-classic-lb-services.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-lb-services.svg => scenario-classic-lb-services.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-networks.graffle => scenario-classic-networks.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-networks.png => scenario-classic-networks.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-networks.svg => scenario-classic-networks.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-compute1.graffle => scenario-classic-ovs-compute1.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-compute1.png => scenario-classic-ovs-compute1.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-compute1.svg => scenario-classic-ovs-compute1.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-compute2.graffle => scenario-classic-ovs-compute2.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-compute2.png => scenario-classic-ovs-compute2.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-compute2.svg => scenario-classic-ovs-compute2.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowew1.graffle => scenario-classic-ovs-flowew1.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowew1.png => scenario-classic-ovs-flowew1.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowew1.svg => scenario-classic-ovs-flowew1.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowew2.graffle => scenario-classic-ovs-flowew2.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowew2.png => scenario-classic-ovs-flowew2.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowew2.svg => scenario-classic-ovs-flowew2.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowns1.graffle => scenario-classic-ovs-flowns1.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowns1.png => scenario-classic-ovs-flowns1.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowns1.svg => scenario-classic-ovs-flowns1.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowns2.graffle => scenario-classic-ovs-flowns2.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowns2.png => scenario-classic-ovs-flowns2.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-flowns2.svg => scenario-classic-ovs-flowns2.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-network1.graffle => scenario-classic-ovs-network1.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-network1.png => scenario-classic-ovs-network1.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-network1.svg => scenario-classic-ovs-network1.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-network2.graffle => scenario-classic-ovs-network2.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-network2.png => scenario-classic-ovs-network2.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-network2.svg => scenario-classic-ovs-network2.svg} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-services.graffle => scenario-classic-ovs-services.graffle} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-services.png => scenario-classic-ovs-services.png} (100%)
 rename doc/networking-guide/source/figures/{scenario-legacy-ovs-services.svg => scenario-classic-ovs-services.svg} (100%)
 rename doc/networking-guide/source/{intro_basic_networking.rst => intro-basic-networking.rst} (100%)
 rename doc/networking-guide/source/{intro_network_address_translation.rst => intro-network-address-translation.rst} (100%)
 rename doc/networking-guide/source/{intro_network_namespaces.rst => intro-network-namespaces.rst} (100%)
 rename doc/networking-guide/source/{intro_networking_components.rst => intro-networking-components.rst} (100%)
 rename doc/networking-guide/source/{intro_networking.rst => intro-networking.rst} (90%)
 rename doc/networking-guide/source/{intro_os_networking_overview.rst => intro-os-networking-overview.rst} (100%)
 rename doc/networking-guide/source/{intro_os_networking_service.rst => intro-os-networking-service.rst} (100%)
 rename doc/networking-guide/source/{intro_os_networking.rst => intro-os-networking.rst} (70%)
 rename doc/networking-guide/source/{intro_tunnel_technologies.rst => intro-tunnel-technologies.rst} (100%)
 rename doc/networking-guide/source/{migration_legacy_to_dvr.rst => migration-classic-to-dvr.rst} (100%)
 rename doc/networking-guide/source/{migration_legacy_to_L3_HA.rst => migration-classic-to-l3ha.rst} (94%)
 rename doc/networking-guide/source/{migration_nova_network_to_neutron.rst => migration-nova-network-to-neutron.rst} (100%)
 rename doc/networking-guide/source/{misc_add_ha_for_DHCP.rst => misc-add-ha-for-dhcp.rst} (100%)
 rename doc/networking-guide/source/{misc_libvirt.rst => misc-libvirt.rst} (100%)
 rename doc/networking-guide/source/{scenario_legacy_lb.rst => scenario-classic-lb.rst} (97%)
 rename doc/networking-guide/source/{scenario_legacy_ovs.rst => scenario-classic-ovs.rst} (97%)
 rename doc/networking-guide/source/{scenario_dvr_ovs.rst => scenario-dvr-ovs.rst} (99%)
 rename doc/networking-guide/source/{scenario_l3ha_lb.rst => scenario-l3ha-lb.rst} (99%)
 rename doc/networking-guide/source/{scenario_l3ha_ovs.rst => scenario-l3ha-ovs.rst} (99%)
 rename doc/networking-guide/source/{scenario_provider_lb.rst => scenario-provider-lb.rst} (99%)
 rename doc/networking-guide/source/{scenario_provider_ovs.rst => scenario-provider-ovs.rst} (99%)

diff --git a/doc/networking-guide/source/adv_config_availability_zone.rst b/doc/networking-guide/source/adv-config-availability-zone.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_availability_zone.rst
rename to doc/networking-guide/source/adv-config-availability-zone.rst
diff --git a/doc/networking-guide/source/adv_config_debugging.rst b/doc/networking-guide/source/adv-config-debugging.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_debugging.rst
rename to doc/networking-guide/source/adv-config-debugging.rst
diff --git a/doc/networking-guide/source/adv_config_FwaaS.rst b/doc/networking-guide/source/adv-config-fwaas.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_FwaaS.rst
rename to doc/networking-guide/source/adv-config-fwaas.rst
diff --git a/doc/networking-guide/source/adv_config_group_policy.rst b/doc/networking-guide/source/adv-config-group-policy.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_group_policy.rst
rename to doc/networking-guide/source/adv-config-group-policy.rst
diff --git a/doc/networking-guide/source/adv_config_ipam.rst b/doc/networking-guide/source/adv-config-ipam.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_ipam.rst
rename to doc/networking-guide/source/adv-config-ipam.rst
diff --git a/doc/networking-guide/source/adv_config_ipv6.rst b/doc/networking-guide/source/adv-config-ipv6.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_ipv6.rst
rename to doc/networking-guide/source/adv-config-ipv6.rst
diff --git a/doc/networking-guide/source/adv_config_LBaaS.rst b/doc/networking-guide/source/adv-config-lbaas.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_LBaaS.rst
rename to doc/networking-guide/source/adv-config-lbaas.rst
diff --git a/doc/networking-guide/source/adv_config_network_rbac.rst b/doc/networking-guide/source/adv-config-network-rbac.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_network_rbac.rst
rename to doc/networking-guide/source/adv-config-network-rbac.rst
diff --git a/doc/networking-guide/source/adv_config_operational.rst b/doc/networking-guide/source/adv-config-operational.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_operational.rst
rename to doc/networking-guide/source/adv-config-operational.rst
diff --git a/doc/networking-guide/source/adv_config_qos.rst b/doc/networking-guide/source/adv-config-qos.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_qos.rst
rename to doc/networking-guide/source/adv-config-qos.rst
diff --git a/doc/networking-guide/source/adv_config_service_chaining.rst b/doc/networking-guide/source/adv-config-service-chaining.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_service_chaining.rst
rename to doc/networking-guide/source/adv-config-service-chaining.rst
diff --git a/doc/networking-guide/source/adv_config_sriov.rst b/doc/networking-guide/source/adv-config-sriov.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_sriov.rst
rename to doc/networking-guide/source/adv-config-sriov.rst
diff --git a/doc/networking-guide/source/adv_config_VPNaaS.rst b/doc/networking-guide/source/adv-config-vpnaas.rst
similarity index 100%
rename from doc/networking-guide/source/adv_config_VPNaaS.rst
rename to doc/networking-guide/source/adv-config-vpnaas.rst
diff --git a/doc/networking-guide/source/adv-config.rst b/doc/networking-guide/source/adv-config.rst
new file mode 100644
index 0000000000..1cafce5b9f
--- /dev/null
+++ b/doc/networking-guide/source/adv-config.rst
@@ -0,0 +1,20 @@
+======================
+Advanced configuration
+======================
+
+.. toctree::
+   :maxdepth: 2
+
+   adv-config-operational.rst
+   adv-config-network-rbac.rst
+   adv-config-lbaas.rst
+   adv-config-fwaas.rst
+   adv-config-vpnaas.rst
+   adv-config-service-chaining.rst
+   adv-config-qos.rst
+   adv-config-group-policy.rst
+   adv-config-debugging.rst
+   adv-config-ipv6.rst
+   adv-config-sriov.rst
+   adv-config-ipam.rst
+   adv-config-availability-zone.rst
diff --git a/doc/networking-guide/source/adv_config.rst b/doc/networking-guide/source/adv_config.rst
deleted file mode 100644
index 1b23357f45..0000000000
--- a/doc/networking-guide/source/adv_config.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-======================
-Advanced configuration
-======================
-
-.. toctree::
-   :maxdepth: 2
-
-   adv_config_operational.rst
-   adv_config_network_rbac.rst
-   adv_config_LBaaS.rst
-   adv_config_FwaaS.rst
-   adv_config_VPNaaS.rst
-   adv_config_service_chaining.rst
-   adv_config_qos.rst
-   adv_config_group_policy.rst
-   adv_config_debugging.rst
-   adv_config_ipv6.rst
-   adv_config_sriov.rst
-   adv_config_ipam.rst
-   adv_config_availability_zone.rst
diff --git a/doc/networking-guide/source/config_ml2_plug_in.rst b/doc/networking-guide/source/config-ml2-plug-in.rst
similarity index 100%
rename from doc/networking-guide/source/config_ml2_plug_in.rst
rename to doc/networking-guide/source/config-ml2-plug-in.rst
diff --git a/doc/networking-guide/source/config_server.rst b/doc/networking-guide/source/config-server.rst
similarity index 100%
rename from doc/networking-guide/source/config_server.rst
rename to doc/networking-guide/source/config-server.rst
diff --git a/doc/networking-guide/source/config.rst b/doc/networking-guide/source/config.rst
index 5ce3929a4c..a305a39345 100644
--- a/doc/networking-guide/source/config.rst
+++ b/doc/networking-guide/source/config.rst
@@ -9,5 +9,5 @@ the `Configuration Reference
 .. toctree::
    :maxdepth: 2
 
-   config_server.rst
-   config_ml2_plug_in.rst
+   config-server.rst
+   config-ml2-plug-in.rst
diff --git a/doc/networking-guide/source/deploy.rst b/doc/networking-guide/source/deploy.rst
index edc0dc3ba4..0e391761e2 100644
--- a/doc/networking-guide/source/deploy.rst
+++ b/doc/networking-guide/source/deploy.rst
@@ -5,10 +5,10 @@ Deployment scenarios
 .. toctree::
    :maxdepth: 2
 
-   scenario_legacy_ovs.rst
-   scenario_legacy_lb.rst
-   scenario_dvr_ovs.rst
-   scenario_l3ha_ovs.rst
-   scenario_l3ha_lb.rst
-   scenario_provider_ovs.rst
-   scenario_provider_lb.rst
+   scenario-classic-ovs.rst
+   scenario-classic-lb.rst
+   scenario-dvr-ovs.rst
+   scenario-l3ha-ovs.rst
+   scenario-l3ha-lb.rst
+   scenario-provider-ovs.rst
+   scenario-provider-lb.rst
diff --git a/doc/networking-guide/source/figures/scenario-legacy-general.graffle b/doc/networking-guide/source/figures/scenario-classic-general.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-general.graffle
rename to doc/networking-guide/source/figures/scenario-classic-general.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-general.png b/doc/networking-guide/source/figures/scenario-classic-general.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-general.png
rename to doc/networking-guide/source/figures/scenario-classic-general.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-general.svg b/doc/networking-guide/source/figures/scenario-classic-general.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-general.svg
rename to doc/networking-guide/source/figures/scenario-classic-general.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-hw.graffle b/doc/networking-guide/source/figures/scenario-classic-hw.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-hw.graffle
rename to doc/networking-guide/source/figures/scenario-classic-hw.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-hw.png b/doc/networking-guide/source/figures/scenario-classic-hw.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-hw.png
rename to doc/networking-guide/source/figures/scenario-classic-hw.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-hw.svg b/doc/networking-guide/source/figures/scenario-classic-hw.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-hw.svg
rename to doc/networking-guide/source/figures/scenario-classic-hw.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-compute1.graffle b/doc/networking-guide/source/figures/scenario-classic-lb-compute1.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-compute1.graffle
rename to doc/networking-guide/source/figures/scenario-classic-lb-compute1.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-compute1.png b/doc/networking-guide/source/figures/scenario-classic-lb-compute1.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-compute1.png
rename to doc/networking-guide/source/figures/scenario-classic-lb-compute1.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-compute1.svg b/doc/networking-guide/source/figures/scenario-classic-lb-compute1.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-compute1.svg
rename to doc/networking-guide/source/figures/scenario-classic-lb-compute1.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-compute2.graffle b/doc/networking-guide/source/figures/scenario-classic-lb-compute2.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-compute2.graffle
rename to doc/networking-guide/source/figures/scenario-classic-lb-compute2.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-compute2.png b/doc/networking-guide/source/figures/scenario-classic-lb-compute2.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-compute2.png
rename to doc/networking-guide/source/figures/scenario-classic-lb-compute2.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-compute2.svg b/doc/networking-guide/source/figures/scenario-classic-lb-compute2.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-compute2.svg
rename to doc/networking-guide/source/figures/scenario-classic-lb-compute2.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowew1.graffle b/doc/networking-guide/source/figures/scenario-classic-lb-flowew1.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowew1.graffle
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowew1.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowew1.png b/doc/networking-guide/source/figures/scenario-classic-lb-flowew1.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowew1.png
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowew1.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowew1.svg b/doc/networking-guide/source/figures/scenario-classic-lb-flowew1.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowew1.svg
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowew1.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowew2.graffle b/doc/networking-guide/source/figures/scenario-classic-lb-flowew2.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowew2.graffle
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowew2.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowew2.png b/doc/networking-guide/source/figures/scenario-classic-lb-flowew2.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowew2.png
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowew2.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowew2.svg b/doc/networking-guide/source/figures/scenario-classic-lb-flowew2.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowew2.svg
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowew2.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowns1.graffle b/doc/networking-guide/source/figures/scenario-classic-lb-flowns1.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowns1.graffle
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowns1.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowns1.png b/doc/networking-guide/source/figures/scenario-classic-lb-flowns1.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowns1.png
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowns1.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowns1.svg b/doc/networking-guide/source/figures/scenario-classic-lb-flowns1.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowns1.svg
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowns1.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowns2.graffle b/doc/networking-guide/source/figures/scenario-classic-lb-flowns2.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowns2.graffle
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowns2.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowns2.png b/doc/networking-guide/source/figures/scenario-classic-lb-flowns2.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowns2.png
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowns2.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-flowns2.svg b/doc/networking-guide/source/figures/scenario-classic-lb-flowns2.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-flowns2.svg
rename to doc/networking-guide/source/figures/scenario-classic-lb-flowns2.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-network1.graffle b/doc/networking-guide/source/figures/scenario-classic-lb-network1.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-network1.graffle
rename to doc/networking-guide/source/figures/scenario-classic-lb-network1.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-network1.png b/doc/networking-guide/source/figures/scenario-classic-lb-network1.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-network1.png
rename to doc/networking-guide/source/figures/scenario-classic-lb-network1.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-network1.svg b/doc/networking-guide/source/figures/scenario-classic-lb-network1.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-network1.svg
rename to doc/networking-guide/source/figures/scenario-classic-lb-network1.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-network2.graffle b/doc/networking-guide/source/figures/scenario-classic-lb-network2.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-network2.graffle
rename to doc/networking-guide/source/figures/scenario-classic-lb-network2.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-network2.png b/doc/networking-guide/source/figures/scenario-classic-lb-network2.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-network2.png
rename to doc/networking-guide/source/figures/scenario-classic-lb-network2.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-network2.svg b/doc/networking-guide/source/figures/scenario-classic-lb-network2.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-network2.svg
rename to doc/networking-guide/source/figures/scenario-classic-lb-network2.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-services.graffle b/doc/networking-guide/source/figures/scenario-classic-lb-services.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-services.graffle
rename to doc/networking-guide/source/figures/scenario-classic-lb-services.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-services.png b/doc/networking-guide/source/figures/scenario-classic-lb-services.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-services.png
rename to doc/networking-guide/source/figures/scenario-classic-lb-services.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-lb-services.svg b/doc/networking-guide/source/figures/scenario-classic-lb-services.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-lb-services.svg
rename to doc/networking-guide/source/figures/scenario-classic-lb-services.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-networks.graffle b/doc/networking-guide/source/figures/scenario-classic-networks.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-networks.graffle
rename to doc/networking-guide/source/figures/scenario-classic-networks.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-networks.png b/doc/networking-guide/source/figures/scenario-classic-networks.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-networks.png
rename to doc/networking-guide/source/figures/scenario-classic-networks.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-networks.svg b/doc/networking-guide/source/figures/scenario-classic-networks.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-networks.svg
rename to doc/networking-guide/source/figures/scenario-classic-networks.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-compute1.graffle b/doc/networking-guide/source/figures/scenario-classic-ovs-compute1.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-compute1.graffle
rename to doc/networking-guide/source/figures/scenario-classic-ovs-compute1.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-compute1.png b/doc/networking-guide/source/figures/scenario-classic-ovs-compute1.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-compute1.png
rename to doc/networking-guide/source/figures/scenario-classic-ovs-compute1.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-compute1.svg b/doc/networking-guide/source/figures/scenario-classic-ovs-compute1.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-compute1.svg
rename to doc/networking-guide/source/figures/scenario-classic-ovs-compute1.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-compute2.graffle b/doc/networking-guide/source/figures/scenario-classic-ovs-compute2.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-compute2.graffle
rename to doc/networking-guide/source/figures/scenario-classic-ovs-compute2.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-compute2.png b/doc/networking-guide/source/figures/scenario-classic-ovs-compute2.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-compute2.png
rename to doc/networking-guide/source/figures/scenario-classic-ovs-compute2.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-compute2.svg b/doc/networking-guide/source/figures/scenario-classic-ovs-compute2.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-compute2.svg
rename to doc/networking-guide/source/figures/scenario-classic-ovs-compute2.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowew1.graffle b/doc/networking-guide/source/figures/scenario-classic-ovs-flowew1.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowew1.graffle
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowew1.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowew1.png b/doc/networking-guide/source/figures/scenario-classic-ovs-flowew1.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowew1.png
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowew1.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowew1.svg b/doc/networking-guide/source/figures/scenario-classic-ovs-flowew1.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowew1.svg
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowew1.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowew2.graffle b/doc/networking-guide/source/figures/scenario-classic-ovs-flowew2.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowew2.graffle
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowew2.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowew2.png b/doc/networking-guide/source/figures/scenario-classic-ovs-flowew2.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowew2.png
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowew2.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowew2.svg b/doc/networking-guide/source/figures/scenario-classic-ovs-flowew2.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowew2.svg
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowew2.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowns1.graffle b/doc/networking-guide/source/figures/scenario-classic-ovs-flowns1.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowns1.graffle
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowns1.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowns1.png b/doc/networking-guide/source/figures/scenario-classic-ovs-flowns1.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowns1.png
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowns1.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowns1.svg b/doc/networking-guide/source/figures/scenario-classic-ovs-flowns1.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowns1.svg
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowns1.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowns2.graffle b/doc/networking-guide/source/figures/scenario-classic-ovs-flowns2.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowns2.graffle
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowns2.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowns2.png b/doc/networking-guide/source/figures/scenario-classic-ovs-flowns2.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowns2.png
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowns2.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-flowns2.svg b/doc/networking-guide/source/figures/scenario-classic-ovs-flowns2.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-flowns2.svg
rename to doc/networking-guide/source/figures/scenario-classic-ovs-flowns2.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-network1.graffle b/doc/networking-guide/source/figures/scenario-classic-ovs-network1.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-network1.graffle
rename to doc/networking-guide/source/figures/scenario-classic-ovs-network1.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-network1.png b/doc/networking-guide/source/figures/scenario-classic-ovs-network1.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-network1.png
rename to doc/networking-guide/source/figures/scenario-classic-ovs-network1.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-network1.svg b/doc/networking-guide/source/figures/scenario-classic-ovs-network1.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-network1.svg
rename to doc/networking-guide/source/figures/scenario-classic-ovs-network1.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-network2.graffle b/doc/networking-guide/source/figures/scenario-classic-ovs-network2.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-network2.graffle
rename to doc/networking-guide/source/figures/scenario-classic-ovs-network2.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-network2.png b/doc/networking-guide/source/figures/scenario-classic-ovs-network2.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-network2.png
rename to doc/networking-guide/source/figures/scenario-classic-ovs-network2.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-network2.svg b/doc/networking-guide/source/figures/scenario-classic-ovs-network2.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-network2.svg
rename to doc/networking-guide/source/figures/scenario-classic-ovs-network2.svg
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-services.graffle b/doc/networking-guide/source/figures/scenario-classic-ovs-services.graffle
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-services.graffle
rename to doc/networking-guide/source/figures/scenario-classic-ovs-services.graffle
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-services.png b/doc/networking-guide/source/figures/scenario-classic-ovs-services.png
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-services.png
rename to doc/networking-guide/source/figures/scenario-classic-ovs-services.png
diff --git a/doc/networking-guide/source/figures/scenario-legacy-ovs-services.svg b/doc/networking-guide/source/figures/scenario-classic-ovs-services.svg
similarity index 100%
rename from doc/networking-guide/source/figures/scenario-legacy-ovs-services.svg
rename to doc/networking-guide/source/figures/scenario-classic-ovs-services.svg
diff --git a/doc/networking-guide/source/index.rst b/doc/networking-guide/source/index.rst
index ad8a70c5f3..4217c9f867 100644
--- a/doc/networking-guide/source/index.rst
+++ b/doc/networking-guide/source/index.rst
@@ -26,13 +26,13 @@ Contents
    :maxdepth: 2
 
    common/conventions.rst
-   intro_networking.rst
-   intro_os_networking.rst
+   intro-networking.rst
+   intro-os-networking.rst
    config.rst
    deploy.rst
    migration.rst
    miscellaneous.rst
-   adv_config.rst
+   adv-config.rst
 
    common/app_support.rst
 
diff --git a/doc/networking-guide/source/intro_basic_networking.rst b/doc/networking-guide/source/intro-basic-networking.rst
similarity index 100%
rename from doc/networking-guide/source/intro_basic_networking.rst
rename to doc/networking-guide/source/intro-basic-networking.rst
diff --git a/doc/networking-guide/source/intro_network_address_translation.rst b/doc/networking-guide/source/intro-network-address-translation.rst
similarity index 100%
rename from doc/networking-guide/source/intro_network_address_translation.rst
rename to doc/networking-guide/source/intro-network-address-translation.rst
diff --git a/doc/networking-guide/source/intro_network_namespaces.rst b/doc/networking-guide/source/intro-network-namespaces.rst
similarity index 100%
rename from doc/networking-guide/source/intro_network_namespaces.rst
rename to doc/networking-guide/source/intro-network-namespaces.rst
diff --git a/doc/networking-guide/source/intro_networking_components.rst b/doc/networking-guide/source/intro-networking-components.rst
similarity index 100%
rename from doc/networking-guide/source/intro_networking_components.rst
rename to doc/networking-guide/source/intro-networking-components.rst
diff --git a/doc/networking-guide/source/intro_networking.rst b/doc/networking-guide/source/intro-networking.rst
similarity index 90%
rename from doc/networking-guide/source/intro_networking.rst
rename to doc/networking-guide/source/intro-networking.rst
index b6198159f2..8ec0f28df8 100644
--- a/doc/networking-guide/source/intro_networking.rst
+++ b/doc/networking-guide/source/intro-networking.rst
@@ -37,8 +37,8 @@ components:
 .. toctree::
    :maxdepth: 2
 
-   intro_basic_networking.rst
-   intro_networking_components.rst
-   intro_tunnel_technologies.rst
-   intro_network_namespaces.rst
-   intro_network_address_translation.rst
+   intro-basic-networking.rst
+   intro-networking-components.rst
+   intro-tunnel-technologies.rst
+   intro-network-namespaces.rst
+   intro-network-address-translation.rst
diff --git a/doc/networking-guide/source/intro_os_networking_overview.rst b/doc/networking-guide/source/intro-os-networking-overview.rst
similarity index 100%
rename from doc/networking-guide/source/intro_os_networking_overview.rst
rename to doc/networking-guide/source/intro-os-networking-overview.rst
diff --git a/doc/networking-guide/source/intro_os_networking_service.rst b/doc/networking-guide/source/intro-os-networking-service.rst
similarity index 100%
rename from doc/networking-guide/source/intro_os_networking_service.rst
rename to doc/networking-guide/source/intro-os-networking-service.rst
diff --git a/doc/networking-guide/source/intro_os_networking.rst b/doc/networking-guide/source/intro-os-networking.rst
similarity index 70%
rename from doc/networking-guide/source/intro_os_networking.rst
rename to doc/networking-guide/source/intro-os-networking.rst
index 0be4914ecc..d01cebc71b 100644
--- a/doc/networking-guide/source/intro_os_networking.rst
+++ b/doc/networking-guide/source/intro-os-networking.rst
@@ -5,5 +5,5 @@ Introduction to OpenStack Networking (neutron)
 .. toctree::
    :maxdepth: 2
 
-   intro_os_networking_overview.rst
-   intro_os_networking_service.rst
+   intro-os-networking-overview.rst
+   intro-os-networking-service.rst
diff --git a/doc/networking-guide/source/intro_tunnel_technologies.rst b/doc/networking-guide/source/intro-tunnel-technologies.rst
similarity index 100%
rename from doc/networking-guide/source/intro_tunnel_technologies.rst
rename to doc/networking-guide/source/intro-tunnel-technologies.rst
diff --git a/doc/networking-guide/source/migration_legacy_to_dvr.rst b/doc/networking-guide/source/migration-classic-to-dvr.rst
similarity index 100%
rename from doc/networking-guide/source/migration_legacy_to_dvr.rst
rename to doc/networking-guide/source/migration-classic-to-dvr.rst
diff --git a/doc/networking-guide/source/migration_legacy_to_L3_HA.rst b/doc/networking-guide/source/migration-classic-to-l3ha.rst
similarity index 94%
rename from doc/networking-guide/source/migration_legacy_to_L3_HA.rst
rename to doc/networking-guide/source/migration-classic-to-l3ha.rst
index 18e08ab195..8ce9a6061e 100644
--- a/doc/networking-guide/source/migration_legacy_to_L3_HA.rst
+++ b/doc/networking-guide/source/migration-classic-to-l3ha.rst
@@ -2,10 +2,10 @@
 Legacy to L3 HA
 ===============
 
-This section describes the process of migrating from a legacy router to an L3
+This section describes the process of migrating from a classic router to an L3
 HA router, which is available starting from the Mitaka release.
 
-Similar to the legacy scenario, all network traffic on a project network that
+Similar to the classic scenario, all network traffic on a project network that
 requires routing actively traverses only one network node regardless of the
 quantity of network nodes providing HA for the router. Therefore, this
 high-availability implementation primarily addresses failure situations instead
@@ -13,8 +13,8 @@ of bandwidth constraints that limit performance. However, it supports random
 distribution of routers on different network nodes to reduce the chances of
 bandwidth constraints and to improve scaling.
 
-This section summarizes parts of :doc:`scenario_l3ha_ovs` and
-:doc:`scenario_l3ha_lb`. For details regarding needed infrastructure and
+This section summarizes parts of :ref:`scenario-l3ha-ovs` and
+:ref:`scenario-l3ha-lb`. For details regarding needed infrastructure and
 configuration to allow actual L3 HA deployment, read the relevant guide
 before continuing with the migration process.
 
@@ -100,8 +100,8 @@ Here is the router we have used in our demonstration:
 L3 HA to Legacy
 ~~~~~~~~~~~~~~~
 
-To return to legacy mode, you turn down the router again, turning off L3 HA and
-starting the router again
+To return to classic mode, you turn down the router again, turning off L3 HA
+and starting the router again
 
 .. warning::
 
diff --git a/doc/networking-guide/source/migration_nova_network_to_neutron.rst b/doc/networking-guide/source/migration-nova-network-to-neutron.rst
similarity index 100%
rename from doc/networking-guide/source/migration_nova_network_to_neutron.rst
rename to doc/networking-guide/source/migration-nova-network-to-neutron.rst
diff --git a/doc/networking-guide/source/migration.rst b/doc/networking-guide/source/migration.rst
index 1f84fa5533..4fe4625d6c 100644
--- a/doc/networking-guide/source/migration.rst
+++ b/doc/networking-guide/source/migration.rst
@@ -5,7 +5,7 @@ Migration
 .. toctree::
    :maxdepth: 2
 
-   migration_nova_network_to_neutron.rst
-   migration_legacy_to_dvr.rst
-   migration_legacy_to_L3_HA.rst
+   migration-nova-network-to-neutron.rst
+   migration-classic-to-dvr.rst
+   migration-classic-to-l3ha.rst
 
diff --git a/doc/networking-guide/source/misc_add_ha_for_DHCP.rst b/doc/networking-guide/source/misc-add-ha-for-dhcp.rst
similarity index 100%
rename from doc/networking-guide/source/misc_add_ha_for_DHCP.rst
rename to doc/networking-guide/source/misc-add-ha-for-dhcp.rst
diff --git a/doc/networking-guide/source/misc_libvirt.rst b/doc/networking-guide/source/misc-libvirt.rst
similarity index 100%
rename from doc/networking-guide/source/misc_libvirt.rst
rename to doc/networking-guide/source/misc-libvirt.rst
diff --git a/doc/networking-guide/source/miscellaneous.rst b/doc/networking-guide/source/miscellaneous.rst
index 1719edd42f..33983bc3b5 100644
--- a/doc/networking-guide/source/miscellaneous.rst
+++ b/doc/networking-guide/source/miscellaneous.rst
@@ -5,5 +5,5 @@ Miscellaneous
 .. toctree::
    :maxdepth: 2
 
-   misc_libvirt
-   misc_add_ha_for_DHCP.rst
+   misc-libvirt.rst
+   misc-add-ha-for-dhcp.rst
diff --git a/doc/networking-guide/source/scenario_legacy_lb.rst b/doc/networking-guide/source/scenario-classic-lb.rst
similarity index 97%
rename from doc/networking-guide/source/scenario_legacy_lb.rst
rename to doc/networking-guide/source/scenario-classic-lb.rst
index 37a384c57e..8c33d4c75b 100644
--- a/doc/networking-guide/source/scenario_legacy_lb.rst
+++ b/doc/networking-guide/source/scenario-classic-lb.rst
@@ -1,11 +1,13 @@
-==================================
-Scenario: Legacy with Linux Bridge
-==================================
+.. _scenario-classic-lb:
 
-This scenario describes a legacy (basic) implementation of the
-OpenStack Networking service using the ML2 plug-in with Linux bridge.
+===================================
+Scenario: Classic with Linux Bridge
+===================================
 
-The legacy implementation contributes the networking portion of self-service
+This scenario describes a classic implementation of the OpenStack
+Networking service using the ML2 plug-in with Linux bridge.
+
+The classic implementation contributes the networking portion of self-service
 virtual data center infrastructure by providing a method for regular
 (non-privileged) users to manage virtual networks within a project and
 includes the following components:
@@ -92,13 +94,13 @@ the tunnel network uses 10.0.1.0/24, and the external network uses
 203.0.113.0/24. The VLAN network does not require an IP address range
 because it only handles layer-2 connectivity.
 
-.. image:: figures/scenario-legacy-hw.png
+.. image:: figures/scenario-classic-hw.png
    :alt: Hardware layout
 
-.. image:: figures/scenario-legacy-networks.png
+.. image:: figures/scenario-classic-networks.png
    :alt: Network layout
 
-.. image:: figures/scenario-legacy-lb-services.png
+.. image:: figures/scenario-classic-lb-services.png
    :alt: Service layout
 
 .. note::
@@ -144,7 +146,7 @@ OpenStack services - compute nodes
 Architecture
 ~~~~~~~~~~~~
 
-The legacy architecture provides basic virtual networking components in
+The classic architecture provides basic virtual networking components in
 your environment. Routing among project and external networks resides
 completely on the network node. Although more simple to deploy than
 other architectures, performing all functions on the network node
@@ -153,7 +155,7 @@ Consider deploying DVR or L3 HA architectures in production environments
 to provide redundancy and increase performance. However, the DVR architecture
 requires Open vSwitch.
 
-.. image:: figures/scenario-legacy-general.png
+.. image:: figures/scenario-classic-general.png
    :alt: Architecture overview
 
 The network node contains the following network components:
@@ -169,10 +171,10 @@ The network node contains the following network components:
    metadata agent.
 #. Metadata agent handling metadata operations for instances.
 
-.. image:: figures/scenario-legacy-lb-network1.png
+.. image:: figures/scenario-classic-lb-network1.png
    :alt: Network node components - overview
 
-.. image:: figures/scenario-legacy-lb-network2.png
+.. image:: figures/scenario-classic-lb-network2.png
    :alt: Network node components - connectivity
 
 The compute nodes contain the following network components:
@@ -181,10 +183,10 @@ The compute nodes contain the following network components:
    them, and interaction via virtual ports with other network components
    such as namespaces, security groups, and underlying interfaces.
 
-.. image:: figures/scenario-legacy-lb-compute1.png
+.. image:: figures/scenario-classic-lb-compute1.png
    :alt: Compute node components - overview
 
-.. image:: figures/scenario-legacy-lb-compute2.png
+.. image:: figures/scenario-classic-lb-compute2.png
    :alt: Compute node components - connectivity
 
 Packet flow
@@ -291,7 +293,7 @@ The following steps involve the network node:
 
    Return traffic follows similar steps in reverse.
 
-.. image:: figures/scenario-legacy-lb-flowns1.png
+.. image:: figures/scenario-classic-lb-flowns1.png
    :alt: Network traffic flow - north/south with fixed IP address
 
 Case 2: North-south for instances with a floating IP address
@@ -384,7 +386,7 @@ The following steps involve compute node 1:
 
    Return traffic follows similar steps in reverse.
 
-.. image:: figures/scenario-legacy-lb-flowns2.png
+.. image:: figures/scenario-classic-lb-flowns2.png
    :alt: Network traffic flow - north/south with a floating IP address
 
 Case 3: East-west for instances on different networks
@@ -467,7 +469,7 @@ The following steps involve compute node 2:
 
    Return traffic follows similar steps in reverse.
 
-.. image:: figures/scenario-legacy-lb-flowew1.png
+.. image:: figures/scenario-classic-lb-flowew1.png
    :alt: Network traffic flow - east/west for instances on different networks
 
 Case 4: East-west for instances on the same network
@@ -524,7 +526,7 @@ The following steps involve compute node 2:
 
    Return traffic follows similar steps in reverse.
 
-.. image:: figures/scenario-legacy-lb-flowew2.png
+.. image:: figures/scenario-classic-lb-flowew2.png
    :alt: Network traffic flow - east/west for instances on the same network
 
 Example configuration
diff --git a/doc/networking-guide/source/scenario_legacy_ovs.rst b/doc/networking-guide/source/scenario-classic-ovs.rst
similarity index 97%
rename from doc/networking-guide/source/scenario_legacy_ovs.rst
rename to doc/networking-guide/source/scenario-classic-ovs.rst
index 3b896673a2..369b9a99ba 100644
--- a/doc/networking-guide/source/scenario_legacy_ovs.rst
+++ b/doc/networking-guide/source/scenario-classic-ovs.rst
@@ -1,11 +1,13 @@
-==================================
-Scenario: Legacy with Open vSwitch
-==================================
+.. _scenario-classic-ovs:
 
-This scenario describes a legacy (basic) implementation of the
-OpenStack Networking service using the ML2 plug-in with Open vSwitch (OVS).
+===================================
+Scenario: Classic with Open vSwitch
+===================================
 
-The legacy implementation contributes the networking portion of self-service
+This scenario describes a classic implementation of the OpenStack
+Networking service using the ML2 plug-in with Open vSwitch (OVS).
+
+The classic implementation contributes the networking portion of self-service
 virtual data center infrastructure by providing a method for regular
 (non-privileged) users to manage virtual networks within a project and
 includes the following components:
@@ -96,13 +98,13 @@ the tunnel network uses 10.0.1.0/24, and the external network uses
 203.0.113.0/24. The VLAN network does not require an IP address range
 because it only handles layer-2 connectivity.
 
-.. image:: figures/scenario-legacy-hw.png
+.. image:: figures/scenario-classic-hw.png
    :alt: Hardware layout
 
-.. image:: figures/scenario-legacy-networks.png
+.. image:: figures/scenario-classic-networks.png
    :alt: Network layout
 
-.. image:: figures/scenario-legacy-ovs-services.png
+.. image:: figures/scenario-classic-ovs-services.png
    :alt: Service layout
 
 .. note::
@@ -159,7 +161,7 @@ OpenStack services - compute nodes
 Architecture
 ~~~~~~~~~~~~
 
-The legacy architecture provides basic virtual networking components in
+The classic architecture provides basic virtual networking components in
 your environment. Routing among project and external networks resides
 completely on the network node. Although more simple to deploy than
 other architectures, performing all functions on the network node
@@ -167,7 +169,7 @@ creates a single point of failure and potential performance issues.
 Consider deploying DVR or L3 HA architectures in production environments
 to provide redundancy and increase performance.
 
-.. image:: figures/scenario-legacy-general.png
+.. image:: figures/scenario-classic-general.png
    :alt: Architecture overview
 
 The network node contains the following network components:
@@ -183,10 +185,10 @@ The network node contains the following network components:
    metadata agent.
 #. Metadata agent handling metadata operations for instances.
 
-.. image:: figures/scenario-legacy-ovs-network1.png
+.. image:: figures/scenario-classic-ovs-network1.png
    :alt: Network node components - overview
 
-.. image:: figures/scenario-legacy-ovs-network2.png
+.. image:: figures/scenario-classic-ovs-network2.png
    :alt: Network node components - connectivity
 
 The compute nodes contain the following network components:
@@ -198,10 +200,10 @@ The compute nodes contain the following network components:
    vSwitch and *iptables*, the Networking service uses a Linux bridge
    to manage security groups for instances.
 
-.. image:: figures/scenario-legacy-ovs-compute1.png
+.. image:: figures/scenario-classic-ovs-compute1.png
    :alt: Compute node components - overview
 
-.. image:: figures/scenario-legacy-ovs-compute2.png
+.. image:: figures/scenario-classic-ovs-compute2.png
    :alt: Compute node components - connectivity
 
 Packet flow
@@ -303,7 +305,7 @@ The following steps involve the network node:
 
    Return traffic follows similar steps in reverse.
 
-.. image:: figures/scenario-legacy-ovs-flowns1.png
+.. image:: figures/scenario-classic-ovs-flowns1.png
    :alt: Network traffic flow - north/south with fixed IP address
 
 Case 2: North-south for instances with a floating IP address
@@ -396,7 +398,7 @@ The following steps involve compute node 1:
 
    Return traffic follows similar steps in reverse.
 
-.. image:: figures/scenario-legacy-ovs-flowns2.png
+.. image:: figures/scenario-classic-ovs-flowns2.png
    :alt: Network traffic flow - north/south with floating IP address
 
 Case 3: East-west for instances on different networks
@@ -537,7 +539,7 @@ The following steps involve compute node 2:
 
    Return traffic follows similar steps in reverse.
 
-.. image:: figures/scenario-legacy-ovs-flowew1.png
+.. image:: figures/scenario-classic-ovs-flowew1.png
    :alt: Network traffic flow - east/west for instances on different networks
 
 Case 4: East-west for instances on the same network
@@ -625,7 +627,7 @@ The following steps involve compute node 2:
 
    Return traffic follows similar steps in reverse.
 
-.. image:: figures/scenario-legacy-ovs-flowew2.png
+.. image:: figures/scenario-classic-ovs-flowew2.png
    :alt: Network traffic flow - east/west for instances on the same network
 
 Example configuration
diff --git a/doc/networking-guide/source/scenario_dvr_ovs.rst b/doc/networking-guide/source/scenario-dvr-ovs.rst
similarity index 99%
rename from doc/networking-guide/source/scenario_dvr_ovs.rst
rename to doc/networking-guide/source/scenario-dvr-ovs.rst
index a33f5496c9..48be7d0dc5 100644
--- a/doc/networking-guide/source/scenario_dvr_ovs.rst
+++ b/doc/networking-guide/source/scenario-dvr-ovs.rst
@@ -1,3 +1,5 @@
+.. _scenario-dvr-ovs:
+
 ===================================================================
 Scenario: High Availability using Distributed Virtual Routing (DVR)
 ===================================================================
@@ -9,11 +11,11 @@ external network and one VXLAN project (tenant) network. However, This
 configuration also supports VLAN external networks, VLAN project networks,
 and GRE project networks.
 
-The DVR architecture augments the legacy architecture by providing direct
+The DVR architecture augments the classic architecture by providing direct
 connectivity to external networks on compute nodes. For instances with a
 floating IP address, routing between project and external networks resides
 completely on the compute nodes to eliminate single point of failure and
-performance issues with legacy network nodes. Routing also resides
+performance issues with classic network nodes. Routing also resides
 completely on the compute nodes for instances with a fixed or floating IP
 address using project networks on the same distributed virtual router.
 However, instances with a fixed IP address still rely on the network node for
@@ -139,16 +141,16 @@ The network node contains the following network components:
    provide DHCP services for instances using project networks.
 #. L3 agent managing the ``qrouter`` and ``snat`` namespaces.
 
-   #. For instances using project networks on legacy routers, the ``qrouter``
+   #. For instances using project networks on classic routers, the ``qrouter``
       namespaces route *north-south* and *east-west* network traffic and
-      perform DNAT/SNAT similar to the legacy scenarios. They also route
+      perform DNAT/SNAT similar to the classic scenarios. They also route
       metadata traffic between instances and the metadata agent.
    #. For instances with a fixed IP address using project networks on
       distributed routers, the ``snat`` namespaces perform SNAT for
       *north-south* network traffic.
 
 #. Metadata agent handling metadata operations for instances using project
-   networks on legacy routers.
+   networks on classic routers.
 
 .. image:: figures/scenario-dvr-network1.png
    :alt: Network node components - overview
diff --git a/doc/networking-guide/source/scenario_l3ha_lb.rst b/doc/networking-guide/source/scenario-l3ha-lb.rst
similarity index 99%
rename from doc/networking-guide/source/scenario_l3ha_lb.rst
rename to doc/networking-guide/source/scenario-l3ha-lb.rst
index 8eb31cfc3c..84f91247ca 100644
--- a/doc/networking-guide/source/scenario_l3ha_lb.rst
+++ b/doc/networking-guide/source/scenario-l3ha-lb.rst
@@ -1,3 +1,5 @@
+.. _scenario-l3ha-lb:
+
 ===============================================================
 Scenario: High Availability using VRRP (L3HA) with Linux Bridge
 ===============================================================
@@ -5,10 +7,10 @@ Scenario: High Availability using VRRP (L3HA) with Linux Bridge
 This scenario describes a high-availability implementation of the OpenStack
 Networking service using the ML2 plug-in and Linux bridge.
 
-This high-availability implementation augments the :doc:`scenario_legacy_lb`
+This high-availability implementation augments the :ref:`scenario-classic-lb`
 architecture with Virtual Router Redundancy Protocol (VRRP) using
 ``keepalived`` to provide quick failover of layer-3 services. See
-:ref:`scenario_l3ha_lb-packet_flow` for VRRP operation. Similar to the legacy
+:ref:`scenario_l3ha_lb-packet_flow` for VRRP operation. Similar to the classic
 scenario, all network traffic on a project network that requires routing
 actively traverses only one network node regardless of the quantity of network
 nodes providing HA for the router. Therefore, this high-availability
@@ -18,7 +20,7 @@ of routers on different network nodes to reduce the chances of bandwidth
 constraints and to improve scaling. Also, this implementation does not address
 situations where one or more layer-3 agents fail and the underlying virtual
 networks continue to operate normally. Consider deploying
-:doc:`scenario_dvr_ovs` to increase performance in addition to redundancy. As
+:ref:`scenario-dvr-ovs` to increase performance in addition to redundancy. As
 of the Liberty release, you cannot combine the DVR and L3HA mechanisms.
 
 .. note::
@@ -171,7 +173,7 @@ The compute nodes contain the following network components:
 Packet flow
 ~~~~~~~~~~~
 
-The L3HA mechanism simply augments :doc:`scenario_legacy_lb` with quick
+The L3HA mechanism simply augments :ref:`scenario-classic-lb` with quick
 failover of layer-3 services to another router if the master router
 fails.
 
diff --git a/doc/networking-guide/source/scenario_l3ha_ovs.rst b/doc/networking-guide/source/scenario-l3ha-ovs.rst
similarity index 99%
rename from doc/networking-guide/source/scenario_l3ha_ovs.rst
rename to doc/networking-guide/source/scenario-l3ha-ovs.rst
index c99ea8d06c..526d29ac0f 100644
--- a/doc/networking-guide/source/scenario_l3ha_ovs.rst
+++ b/doc/networking-guide/source/scenario-l3ha-ovs.rst
@@ -1,3 +1,5 @@
+.. _scenario-l3ha-ovs:
+
 ===============================================================
 Scenario: High Availability using VRRP (L3HA) with Open vSwitch
 ===============================================================
@@ -5,10 +7,10 @@ Scenario: High Availability using VRRP (L3HA) with Open vSwitch
 This scenario describes a high-availability implementation of the OpenStack
 Networking service using the ML2 plug-in and Open vSwitch (OVS).
 
-This high-availability implementation augments the :doc:`scenario_legacy_ovs`
+This high-availability implementation augments the :ref:`scenario-classic-ovs`
 architecture with Virtual Router Redundancy Protocol (VRRP) using
 ``keepalived`` to provide quick failover of layer-3 services. See
-:ref:`scenario_l3ha_ovs-packet_flow` for VRRP operation. Similar to the legacy
+:ref:`scenario_l3ha_ovs-packet_flow` for VRRP operation. Similar to the classic
 scenario, all network traffic on a project network that requires routing
 actively traverses only one network node regardless of the quantity of network
 nodes providing HA for the router. Therefore, this high-availability
@@ -18,7 +20,7 @@ of routers on different network nodes to reduce the chances of bandwidth
 constraints and to improve scaling. Also, this implementation does not address
 situations where one or more layer-3 agents fail and the underlying virtual
 networks continue to operate normally. Consider deploying
-:doc:`scenario_dvr_ovs` to increase performance in addition to redundancy. As
+ref:`scenario-dvr-ovs` to increase performance in addition to redundancy. As
 of the Liberty release, you cannot combine the DVR and L3HA mechanisms.
 
 .. note::
@@ -188,7 +190,7 @@ The compute nodes contain the following components:
 Packet flow
 ~~~~~~~~~~~
 
-The L3HA mechanism simply augments :doc:`scenario_legacy_ovs` with quick
+The L3HA mechanism simply augments :ref:`scenario-classic-ovs` with quick
 failover of layer-3 services to another router if the master router
 fails.
 
diff --git a/doc/networking-guide/source/scenario_provider_lb.rst b/doc/networking-guide/source/scenario-provider-lb.rst
similarity index 99%
rename from doc/networking-guide/source/scenario_provider_lb.rst
rename to doc/networking-guide/source/scenario-provider-lb.rst
index a815098b4f..23ce94227e 100644
--- a/doc/networking-guide/source/scenario_provider_lb.rst
+++ b/doc/networking-guide/source/scenario-provider-lb.rst
@@ -1,3 +1,5 @@
+.. _scenario-provider-lb:
+
 =============================================
 Scenario: Provider networks with Linux bridge
 =============================================
diff --git a/doc/networking-guide/source/scenario_provider_ovs.rst b/doc/networking-guide/source/scenario-provider-ovs.rst
similarity index 99%
rename from doc/networking-guide/source/scenario_provider_ovs.rst
rename to doc/networking-guide/source/scenario-provider-ovs.rst
index ada9c3819c..599d042f98 100644
--- a/doc/networking-guide/source/scenario_provider_ovs.rst
+++ b/doc/networking-guide/source/scenario-provider-ovs.rst
@@ -1,3 +1,5 @@
+.. _scenario_provider_ovs:
+
 =============================================
 Scenario: Provider networks with Open vSwitch
 =============================================
diff --git a/tox.ini b/tox.ini
index 44b28caa0d..78bd0e657a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -123,7 +123,7 @@ commands = {toxinidir}/tools/generatepot-rst.sh openstack-manuals 1 {posargs}
 # Settings for doc8:
 # Ignore target directories
 # TODO(samos123): remove sriov from ignore when fix for #1487302 is in doc8
-ignore-path = doc/*/target,doc/*/build*,doc/common-rst/glossary.rst,doc/networking-guide/source/adv_config_sriov.rst
+ignore-path = doc/*/target,doc/*/build*,doc/common-rst/glossary.rst,doc/networking-guide/source/adv-config-sriov.rst
 # File extensions to use
 extensions = .rst,.txt
 # Maximal line length should be 79 but we have some overlong lines.