diff --git a/doc/source/devref/layer3.rst b/doc/source/devref/layer3.rst
index 58c36384acb..1edd8c8887f 100644
--- a/doc/source/devref/layer3.rst
+++ b/doc/source/devref/layer3.rst
@@ -73,9 +73,6 @@ Neutron logical network setup
 Neutron logical router setup
 ----------------------------
 
-* http://docs.openstack.org/networking-guide/scenario_legacy_ovs.html
-
-
 ::
 
         vagrant@precise64:~/devstack$ neutron router-list
@@ -103,6 +100,9 @@ Neutron logical router setup
         | 0ba8700e-da06-4318-8fe9-00676dd994b8 |      | fa:16:3e:78:43:5b | {"subnet_id": "1a2d26fb-b733-4ab3-992e-88554a87afa6", "ip_address": "10.0.0.1"} |
         +--------------------------------------+------+-------------------+---------------------------------------------------------------------------------+
 
+See the `Networking Guide <http://docs.openstack.org/networking-guide/deploy-ovs-selfservice.html#create-initial-networks/>`_
+for more detail on the creation of networks, subnets, and routers.
+
 Neutron Routers are realized in OpenVSwitch
 -------------------------------------------
 
diff --git a/doc/source/devref/linuxbridge_agent.rst b/doc/source/devref/linuxbridge_agent.rst
index e6a13716fe3..48c7a0c974a 100644
--- a/doc/source/devref/linuxbridge_agent.rst
+++ b/doc/source/devref/linuxbridge_agent.rst
@@ -29,7 +29,7 @@ This Agent uses the `Linux Bridge
 provide L2 connectivity for VM instances running on the compute node to the
 public network.  A graphical illustration of the deployment can be found in
 `Networking Guide
-<http://docs.openstack.org/networking-guide/scenario_legacy_lb.html>`_
+<http://docs.openstack.org/networking-guide/deploy-lb-provider.html#architecture>`_
 
 In most common deployments, there is a compute and a network node. On both the
 compute and the network node, the Linux Bridge Agent will manage virtual
@@ -39,11 +39,11 @@ on the compute node, the Linux Bridge Agent will manage security groups.
 
 Three use cases and their packet flow are documented as follows:
 
-1. `Legacy implementation with Linux Bridge
-   <http://docs.openstack.org/networking-guide/deploy_scenario1b.html>`_
+1. `Linux Bridge: Provider networks
+   <http://docs.openstack.org/networking-guide/deploy-lb-provider.html>`_
 
-2. `High Availability using L3HA with Linux Bridge
-   <http://docs.openstack.org/networking-guide/deploy_scenario3b.html>`_
+2. `Linux Bridge: Self-service networks
+   <http://docs.openstack.org/networking-guide/deploy-lb-selfservice.html>`_
 
-3. `Provider networks with Linux Bridge
-   <http://docs.openstack.org/networking-guide/deploy_scenario4b.html>`_
+3. `Linux Bridge: High availability using VRRP
+   <http://docs.openstack.org/networking-guide/deploy-lb-ha-vrrp.html>`_
diff --git a/doc/source/devref/template_model_sync_test.rst b/doc/source/devref/template_model_sync_test.rst
index 6c03ecdbdf4..de2ed89cdb9 100644
--- a/doc/source/devref/template_model_sync_test.rst
+++ b/doc/source/devref/template_model_sync_test.rst
@@ -34,7 +34,7 @@ What does the test do?
 
 This test compares models with the result of existing migrations. It is based on
 `ModelsMigrationsSync
-<http://docs.openstack.org/developer/oslo.db/api/sqlalchemy/test_migrations.html#oslo_db.sqlalchemy.test_migrations.ModelsMigrationsSync>`_
+<http://docs.openstack.org/developer/oslo.db/api/oslo_db.sqlalchemy.test_migrations.html>`_
 which is provided by oslo.db and was adapted for Neutron. It compares core
 Neutron models and vendor specific models with migrations from Neutron core and
 migrations from the driver/plugin repo. This test is functional - it runs against