From 05fbc0415edaa285b2c8b2573a72d2bd55925d81 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Mon, 24 Aug 2015 09:07:35 +0200
Subject: [PATCH] Update the URLs to the Cloud Admin Guide

The Cloud Admin Guide was converted to RST and the
URLs changed.

Also add the Networking Guide to the README file.

Change-Id: I485254db6d2264aaa80e4f7146cfc61c56b27b27
---
 README.rst                              |  5 ++++-
 doc/source/devref/layer3.rst            | 10 +++++-----
 doc/source/devref/linuxbridge_agent.rst |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index 86f6ba868..671d95436 100644
--- a/README.rst
+++ b/README.rst
@@ -15,7 +15,10 @@ The latest and most in-depth documentation on how to use Neutron is
 available at: <http://docs.openstack.org>. This includes:
 
 Neutron Administrator Guide
-   http://docs.openstack.org/admin-guide-cloud/content/ch_networking.html
+   http://docs.openstack.org/admin-guide-cloud/networking.html
+
+Networking Guide
+   http://docs.openstack.org/networking-guide/
 
 Neutron API Reference:
    http://docs.openstack.org/api/openstack-network/2.0/content/
diff --git a/doc/source/devref/layer3.rst b/doc/source/devref/layer3.rst
index 1960b5d70..809940722 100644
--- a/doc/source/devref/layer3.rst
+++ b/doc/source/devref/layer3.rst
@@ -50,7 +50,7 @@ Neutron logical network setup
 Neutron logical router setup
 ----------------------------
 
-* http://docs.openstack.org/admin-guide-cloud/content/ch_networking.html#under_the_hood_openvswitch_scenario1_network
+* http://docs.openstack.org/networking-guide/scenario_legacy_ovs.html
 
 
 ::
@@ -147,7 +147,7 @@ Neutron Routers are realized in OpenVSwitch
 Finding the router in ip/ipconfig
 ---------------------------------
 
-* http://docs.openstack.org/admin-guide-cloud/content/ch_networking.html
+* http://docs.openstack.org/admin-guide-cloud/networking.html
 
         The neutron-l3-agent uses the Linux IP stack and iptables to perform L3 forwarding and NAT.
         In order to support multiple routers with potentially overlapping IP addresses, neutron-l3-agent
@@ -189,11 +189,11 @@ For example::
 Provider Networking
 -------------------
 
-Neutron can also be configured to create `provider networks <http://docs.openstack.org/admin-guide-cloud/content/ch_networking.html#provider_terminology>`_
+Neutron can also be configured to create `provider networks <http://docs.openstack.org/admin-guide-cloud/networking_adv-features.html#provider-networks>`_
 
 Further Reading
 ---------------
-* `Packet Pushers - Neutron Network Implementation on Linux <http://packetpushers.net/openstack-neutron-network-implementation-in-linux/>`_
-* `OpenStack Cloud Administrator Guide <http://docs.openstack.org/admin-guide-cloud/content/ch_networking.html>`_
+* `Packet Pushers - Neutron Network Implementation on Linux <http://packetpushers.net/openstack-quantum-network-implementation-in-linux/>`_
+* `OpenStack Cloud Administrator Guide <http://docs.openstack.org/admin-guide-cloud/networking.html>`_
 * `Neutron - Layer 3 API extension usage guide <http://docs.openstack.org/api/openstack-network/2.0/content/router_ext.html>`_
 *  `Darragh O'Reilly -  The Quantum L3 router and floating IPs <http://techbackground.blogspot.com/2013/05/the-quantum-l3-router-and-floating-ips.html>`_
diff --git a/doc/source/devref/linuxbridge_agent.rst b/doc/source/devref/linuxbridge_agent.rst
index 8dbe15788..ef21cf4a8 100644
--- a/doc/source/devref/linuxbridge_agent.rst
+++ b/doc/source/devref/linuxbridge_agent.rst
@@ -6,8 +6,8 @@ This Agent uses the `Linux Bridge
 <http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge>`_ to
 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
-`OpenStack Admin Guide Linux Bridge
-<http://docs.openstack.org/admin-guide-cloud/content/under_the_hood_linuxbridge.html>`_
+`Networking Guide
+<http://docs.openstack.org/networking-guide/scenario_legacy_lb.html>`_
 
 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
-- 
2.45.2