Add documentation and bug links
Change-Id: I9276bdc33930697577559650c2a1adbd05af23d8
Closes-Bug: #1583855
diff --git a/README.rst b/README.rst
index 0ad803b..eeafd73 100644
--- a/README.rst
+++ b/README.rst
@@ -2,14 +2,19 @@
Neutron Network Service
=======================
-Neutron is an OpenStack project to provide "networking as a service" between interface devices (e.g., vNICs) managed by other Openstack services (e.g., nova).
+Neutron is an OpenStack project to provide "networking as a service" between
+interface devices (e.g., vNICs) managed by other Openstack services (e.g.,
+nova).
-Starting in the Folsom release, Neutron is a core and supported part of the OpenStack platform (for Essex, we were an "incubated" project, which means use is suggested only for those who really know what they're doing with Neutron).
+Starting in the Folsom release, Neutron is a core and supported part of the
+OpenStack platform (for Essex, we were an "incubated" project, which means use
+is suggested only for those who really know what they're doing with Neutron).
Usage notes
===========
-For live migration to work, you have to set migration param on bridge and switch nodes.
+For live migration to work, you have to set migration param on bridge and
+switch nodes.
.. code-block:: yaml
@@ -192,17 +197,28 @@
neutron-db-manage --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini stamp havana
-Read more
-=========
+Documentation and Bugs
+============================
-* https://wiki.openstack.org/wiki/Neutron
-* http://docs.openstack.org/havana/install-guide/install/zypper/content/install-neutron.install-plugin.ovs.gre.html
-* http://docs.openstack.org/admin-guide-cloud/content//ch_networking.html
-* https://github.com/marafa/openstack/blob/master/openstack-outside.sh
-* http://techbackground.blogspot.ie/2013/06/metadata-via-quantum-router.html
-* http://techbackground.blogspot.ie/2013/06/metadata-via-dhcp-namespace.html
-* http://developer.rackspace.com/blog/neutron-networking-l3-agent.html
-* http://docs.openstack.org/grizzly/basic-install/apt/content/basic-install_network.html#configure-l3
-* ML2 plugin http://openstack.redhat.com/ML2_plugin
-* https://github.com/stackforge/fuel-library/tree/master/deployment/puppet/neutron/files
-* http://openstack.redhat.com/forum/discussion/972/stable-havana-2013-2-3-update/p1
+To learn how to deploy OpenStack Salt, consult the documentation available
+online at:
+
+ https://wiki.openstack.org/wiki/OpenStackSalt
+
+In the unfortunate event that bugs are discovered, they should be reported to
+the appropriate bug tracker. If you obtained the software from a 3rd party
+operating system vendor, it is often wise to use their own bug tracker for
+reporting problems. In all other cases use the master OpenStack bug tracker,
+available at:
+
+ http://bugs.launchpad.net/openstack-salt
+
+Developers wishing to work on the OpenStack Salt project should always base
+their work on the latest formulas code, available from the master GIT
+repository at:
+
+ https://git.openstack.org/cgit/openstack/salt-formula-neutron
+
+Developers should also join the discussion on the IRC list, at:
+
+ https://wiki.openstack.org/wiki/Meetings/openstack-salt