WIP

CONTRIBUTING.rst

@@ -1,15 +1,8 @@
-============
 Contributing
 ============
-There is no formal process for contributions. Feel free to submit an issue or a
-pull request if you so desire. These will be reviewed by Brad, Josh or Kit.
-We'll either accept, close or offer feedback (or some combination).
-
-Code should pass all tests.
 
-For more detail see README.developerguide.rst in the docs directory
+Please see the `developer guide <https://faucet.readthedocs.io/en/latest/developer_guide.html>`_
 
-=========
 Licensing
 =========
 This got a bit messy, so in the interest of clarifying things and tidying this

README.rst

@@ -6,7 +6,6 @@
 .. meta::
    :keywords: OpenFlow, Ryu, Faucet, VLAN, SDN
 
-======
 Faucet
 ======
 
@@ -24,12 +23,10 @@ It supports:
 - Controller health and statistics via Prometheus
 - Unit and systems tests run under Travis based on mininet and OVS
 
-
-====================================
 Hardware and software switch support
-====================================
+------------------------------------
 
-Detailed guides for some switches are available in `docs/vendors <docs/vendors>`_.
+Detailed guides for some switches are available on `readthedocs <https://faucet.readthedocs.io/en/latest/vendors/index.html>`_.
 
 FAUCET has been tested against the following switches (see also SUPPORTED_HARDWARE in `faucet/valve.py <faucet/valve.py>`_):
 
@@ -45,52 +42,38 @@ Faucet's design principle is to be as hardware agnostic as possible and not requ
 
 If you are a hardware vendor wanting to support FAUCET, you need to support all the matches in `faucet/valve.py <faucet/valve.py>`_ valve_in_match() and pass all tests.
 
-
-============
 Installation
-============
+------------
 
-Please see `docs/README_install.rst <docs/README_install.rst>`_
+Please see the `installation guide <https://faucet.readthedocs.io/en/latest/installation.html>`_
 
-
-=============
 Configuration
-=============
-
-Please see `docs/README_config.rst <docs/README_config.rst>`_
+-------------
 
+Please see the `configuration guide <https://faucet.readthedocs.io/en/latest/configuration.html>`_
+for documentation regarding the general configuration of faucet and the
+`configuration recipe book <https://faucet.readthedocs.io/en/latest/recipe_book/index.html>`_
+for configuration snippets for common use cases.
 
-=======================
 Development and testing
-=======================
+-----------------------
 
-Please see `docs/README.developerguide.rst <docs/README.developerguide.rst>`_
+Please see the `developer guide <https://faucet.readthedocs.io/en/latest/developer_guide.html>`_
 
-
-=======
 Support
-=======
+-------
 
 We run a number of mailing lists for communication between users and developers of Faucet, as well as a low traffic mailing list for announcements of new versions:
 
 - https://list.waikato.ac.nz/mailman/listinfo/faucet-announce
 - https://list.waikato.ac.nz/mailman/listinfo/faucet-dev
 - https://lists.geant.org/sympa/info/faucet-users
 
-Additional documentation is available under the `docs <docs>`_ directory.
-
 Faucet blog by Josh Bailey available at http://faucet-sdn.blogspot.co.nz.
 
 To create a issue, use `GitHub Issues <https://github.com/faucetsdn/faucet/issues>`_.
 
-
-==================================
 Faucet deployment around the world
-==================================
-   https://www.google.com/maps/d/u/0/viewer?mid=1MZ0M9ZtZOp2yHWS0S-BQH0d3e4s&hl=en
-
-.. raw:: html
+----------------------------------
 
-  <div class="figure">
-  <iframe src="https://www.google.com/maps/d/u/0/embed?mid=1MZ0M9ZtZOp2yHWS0S-BQH0d3e4s" width="640" height="480"></iframe>
-  </div>
+`Faucet deployment map <https://www.google.com/maps/d/u/0/viewer?mid=1MZ0M9ZtZOp2yHWS0S-BQH0d3e4s&hl=en>`_