Tweak docsite re: resources/contrib page

docsite/rst/contrib.rst

@@ -3,10 +3,10 @@ Ansible Resources
 
 User contributed playbooks, modules, and articles. This is a small
 curated list, but growing. Everyone is encouraged to add to this
-document, just send in a pull request!
+document, just send in a github pull request to docsite/rst/contrib.rst!
 
 Ansible Modules
-===============
+```````````````
 
 Ansible modules are a way of adding new client-side logic to ansible.
 They can be written in any language.
@@ -29,7 +29,7 @@ Not all modules above yet take advantage of this feature. See the
 official documentation for more details.
 
 Selected Playbooks
-==================
+``````````````````
 
 `Playbooks <http://ansible.cc/docs/playbooks.html>`_ are Ansible's
 configuration management language. It should be easy to write your own
@@ -52,7 +52,7 @@ what others have done for reference.
    - `Fedora <http://fedoraproject.org>`_
 
 Callbacks and Plugins
-=====================
+`````````````````````
 
 The Ansible project has a whole repo devoted to extending ansible with
 new connection types, logging/event callbacks, and inventory data
@@ -62,71 +62,41 @@ even add sound effects.
 -  `Ansible-Plugins <https://github.com/ansible/ansible/tree/devel/plugins>`_
 
 Scripts And Misc
-================
+````````````````
 
 Ansible isn't just a program, it's also an API. Here's some examples of
 some clever integrations with the "Runner" and also Playbook APIs, and
 integrations with other interesting pieces of software.
 
--  `Ansible Vagrant
+-  `Ansible Vagrant plugin <https://github.com/dsander/vagrant-ansible>`_ - dsander
-   plugin <https://github.com/dsander/vagrant-ansible>`_ - dsander
+-  `Ansible+Vagrant Tutorial <https://github.com/mattupstate/vagrant-ansible-tutorial>`_ - mattupstate -
--  `Ansible+Vagrant
+-  `virt-install <http://fedorapeople.org/cgit/skvidal/public_git/scripts.git/tree/ansible/start-prov-boot.py>`_ - skvidal
-   Tutorial <https://github.com/mattupstate/vagrant-ansible-tutorial>`_
+-  `rebooting hosts <http://fedorapeople.org/cgit/skvidal/public_git/scripts.git/tree/ansible/host-reboot>`_ - skvidal
-   - mattupstate -
+-  `uptime (API demo) <https://github.com/ansible/ansible/blob/devel/examples/scripts/uptime.py>`_ - mpdehaan
--  `virt-install <http://fedorapeople.org/cgit/skvidal/public_git/scripts.git/tree/ansible/start-prov-boot.py>`_
-   - skvidal
--  `rebooting
-   hosts <http://fedorapeople.org/cgit/skvidal/public_git/scripts.git/tree/ansible/host-reboot>`_
-   - skvidal
--  `uptime (API
-   demo) <https://github.com/ansible/ansible/blob/devel/examples/scripts/uptime.py>`_
-   - mpdehaan
 
 Blogs & Articles
-================
+````````````````
 
--  `HighScalability.com <http://highscalability.com/blog/2012/4/18/ansible-a-simple-model-driven-configuration-management-and-c.html>`_
+-  `HighScalability.com <http://highscalability.com/blog/2012/4/18/ansible-a-simple-model-driven-configuration-management-and-c.html>`_ - mpdehaan
-   - mpdehaan
+-  `ColoAndCloud.com interview <http://www.coloandcloud.com/editorial/an-interview-with-ansible-author-michael-dehaan/>`_ - mpdehaan
--  `ColoAndCloud.com
+-  `dzone <http://server.dzone.com/articles/ansible-cm-deployment-and-ad>`_ - Mitch Pronschinske
-   interview <http://www.coloandcloud.com/editorial/an-interview-with-ansible-author-michael-dehaan/>`_
+-  `Configuration Management With Ansible <http://jpmens.net/2012/06/06/configuration-management-with-ansible/>`_ - jp\_mens
-   - mpdehaan
+-  `Shell Scripts As Ansible Modules <http://jpmens.net/2012/07/05/shell-scripts-as-ansible-modules/>`_ - jp\_mens
--  `dzone <http://server.dzone.com/articles/ansible-cm-deployment-and-ad>`_
+-  `Ansible Facts <http://jpmens.net/2012/07/15/ansible-it-s-a-fact/>`_ - jp\_mens
-   - Mitch Pronschinske
+-  `Infrastructure as Data <http://www.capsunlock.net/2012/04/ansible-infrastructure-as-data-not-infrastructure-as-code.html>`_ - cocoy
--  `Configuration Management With
+-  `Ansible Pull Mode <http://www.capsunlock.net/2012/05/using-ansible-pull-and-user-data-to-setup-ec2-or-openstack-servers.html>`_ - cocoy
-   Ansible <http://jpmens.net/2012/06/06/configuration-management-with-ansible/>`_
+-  `Exploring Configuration Management With Ansible <http://palominodb.com/blog/2012/08/01/exploring-configuration-management-ansible>`_ - Palamino DB
-   - jp\_mens
+-  `You Should Consider Using SSH Based Configuration Management <http://www.lshift.net/blog/2012/07/30/you-should-consider-using-ssh-based-configuration-management>`_ - LShift Ltd
--  `Shell Scripts As Ansible
+-  `Deploying Flask/uWSGI, Nginx, and Supervisorctl <http://mattupstate.github.com/python/devops/2012/08/07/flask-wsgi-application-deployment-with-ubuntu-ansible-nginx-supervisor-and-uwsgi.html>`_ - mattupstate
-   Modules <http://jpmens.net/2012/07/05/shell-scripts-as-ansible-modules/>`_
+-  `Infracoders Presentation <http://www.danielhall.me/2012/10/ansible-talk-infra-coders/>`_ - Daniel Hall
-   - jp\_mens
--  `Ansible Facts <http://jpmens.net/2012/07/15/ansible-it-s-a-fact/>`_
-   - jp\_mens
--  `Infrastructure as
-   Data <http://www.capsunlock.net/2012/04/ansible-infrastructure-as-data-not-infrastructure-as-code.html>`_
-   - cocoy
--  `Ansible Pull
-   Mode <http://www.capsunlock.net/2012/05/using-ansible-pull-and-user-data-to-setup-ec2-or-openstack-servers.html>`_
-   - cocoy
--  `Exploring Configuration Management With
-   Ansible <http://palominodb.com/blog/2012/08/01/exploring-configuration-management-ansible>`_
-   - Palamino DB
--  `You Should Consider Using SSH Based Configuration
-   Management <http://www.lshift.net/blog/2012/07/30/you-should-consider-using-ssh-based-configuration-management>`_
-   - LShift Ltd
--  `Deploying Flask/uWSGI, Nginx, and
-   Supervisorctl <http://mattupstate.github.com/python/devops/2012/08/07/flask-wsgi-application-deployment-with-ubuntu-ansible-nginx-supervisor-and-uwsgi.html>`_
-   - mattupstate
--  `Infracoders
-   Presentation <http://www.danielhall.me/2012/10/ansible-talk-infra-coders/>`_
-   - Daniel Hall
 
 Disclaimer
-==========
+``````````
 
 Modules and playbooks here may not be using the latest in Ansible
 features. When in doubt to the features of a particular version of
 Ansbile, always consult `ansible.cc <http://ansible.cc>`_ and in
-particular see `Best
+particular see `Best Practices <http://ansible.cc/docs/bestpractices.html>`_ for some tips
-Practices <http://ansible.cc/docs/bestpractices.html>`_ for some tips
 and tricks that may be useful.
 
 Ansible is (C) 2012, `Michael DeHaan <http://twitter.com/laserllama>`_

docsite/rst/index.rst

@@ -56,21 +56,15 @@ with other solutions in your environment.
    api
    moduledev
 
-Ansible Resources
-`````````````````
-
-.. toctree::
-   :maxdepth: 0
-
-   contrib
 
 Miscellaneous
 `````````````
 
-A list of some people using Ansible.
+A list of some people using Ansible, and some additional resources.
 
 .. toctree::
    :maxdepth: 1
 
    who_uses_ansible
+   contrib
 

docsite/rst/moduledev.rst

@@ -377,18 +377,6 @@ output formats available:
    validate it on the `YAML Lint <http://www.yamllint.com/>`_ website.
 
 
-Sharing Your Module
-```````````````````
-
-If you think your module is generally useful to others, a good place to share it
-is in `Ansible Resources <https://github.com/ansible/ansible/tree/devel/contrib>`_.  This is maintained
-as a simple repo with pointers to other github projects.
-
-Contrib modules here can be implemented in a variety of languages.
-We would like to build up as many of these as possible in as many languages as possible.
-
-`Ansible Mailing List <http://groups.google.com/group/ansible-project>`_
-
 Getting Your Module Into Core
 `````````````````````````````
 

docsite/rst/modules.rst

@@ -62,7 +62,7 @@ See :doc:`moduledev`.
 
 .. seealso::
 
-   `Ansible Resources (Contrib) <https://github.com/ansible/ansible-resources>`_
+   :doc:`contrib`
        User contributed playbooks, modules, and articles
    :doc:`examples`
        Examples of using modules in /usr/bin/ansible