diff --git a/README.rst b/README.rst index 86f6ba868fd..671d9543688 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: . 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 1960b5d70f0..809940722ec 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 `_ +Neutron can also be configured to create `provider networks `_ Further Reading --------------- -* `Packet Pushers - Neutron Network Implementation on Linux `_ -* `OpenStack Cloud Administrator Guide `_ +* `Packet Pushers - Neutron Network Implementation on Linux `_ +* `OpenStack Cloud Administrator Guide `_ * `Neutron - Layer 3 API extension usage guide `_ * `Darragh O'Reilly - The Quantum L3 router and floating IPs `_ diff --git a/doc/source/devref/linuxbridge_agent.rst b/doc/source/devref/linuxbridge_agent.rst index 8dbe1578833..ef21cf4a8ae 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 `_ 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 -`_ +`Networking Guide +`_ 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