mesocentrefc · boegel · Jul 15, 2015 · Jul 15, 2015 · Jul 15, 2015 · Jul 15, 2015
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,21 +1,21 @@
 We'd love you to contribute back to EasyBuild, and here's how you can do it: the branch - hack - pull request cycle.
 
 # License
-Contributions can be made under the MIT or 
+Contributions can be made under the MIT or
 BSD licenses (in the three-clause and two-clause forms, though not the original four-clause form).
 
 Or alteratively the contributor must agree with following contributor agreement:
 
 ## Contributor Agreement.
-In this case the contributor must agree that Ghent University shall have the irrevocable and perpetual right to make and 
+In this case the contributor must agree that Ghent University shall have the irrevocable and perpetual right to make and
 distribute copies of any Contribution, as well as to create and distribute collective works and derivative works of
-any Contribution, under the Initial License or under any other open source license. 
+any Contribution, under the Initial License or under any other open source license.
 (as defined by The Open Source Initiative (OSI) http://opensource.org/).
-Contributor shall identify each Contribution by placing the following notice in its source code adjacent to 
-Contributor's valid copyright notice: "Licensed to Ghent University under a Contributor Agreement." 
+Contributor shall identify each Contribution by placing the following notice in its source code adjacent to
+Contributor's valid copyright notice: "Licensed to Ghent University under a Contributor Agreement."
 The currently acceptable license is GPLv2 or any other GPLv2 compatible license.
 
-Ghent University understands and agrees that Contributor retains copyright in its Contributions. 
+Ghent University understands and agrees that Contributor retains copyright in its Contributions.
 Nothing in this Contributor Agreement shall be interpreted to prohibit Contributor from licensing its Contributions
 under different terms from the Initial License or this Contributor Agreement.
 
@@ -31,7 +31,7 @@ You should also register an SSH public key, so you can easily clone, push to and
 
 ### Clone the easybuild-framework repository
 
-Clone your fork of the easybuild-framework repository to your favorite workstation. 
+Clone your fork of the easybuild-framework repository to your favorite workstation.
 
 ```bash
 git clone [email protected]:YOUR\_GITHUB\_LOGIN/easybuild-framework.git
@@ -51,7 +51,7 @@ git pull github_hpcugent develop
 
 ### Keep develop up-to-date
 
-The _develop_ branch hosts the latest bleeding-edge version of easybuild-framework, and is merged into _master_ regularly (after thorough testing). 
+The _develop_ branch hosts the latest bleeding-edge version of easybuild-framework, and is merged into _master_ regularly (after thorough testing).
 
 Make sure you update it every time you create a feature branch (see below):
 
@@ -82,7 +82,7 @@ git checkout <BRANCH_NAME>
 
 Make sure to always base your features branches on _develop_, not on _master_!
 
- 
+
 
 ## Hack
 
@@ -108,7 +108,7 @@ When you've finished the implementation of a particular contribution, here's how
 ### Push your branch
 
 Push your branch to your easybuild-framework repository on GitHub:
- 
+
 ```bash
 git push origin <BRANCH_NAME>
 ```
@@ -127,7 +127,7 @@ Issue a pull request for your branch into the mair easybuild-framework repositor
 ### Issue pull request for existing ticket (from command line)
 
 If you're contributing code to an existing issue you can also convert the issue to a pull request by running
-``` 
+```
 GITHUBUSER=your_username && PASSWD=your_password && BRANCH=branch_name && ISSUE=issue_number && \
 curl --user "$GITHUBUSER:$PASSWD" --request POST \
 --data "{\"issue\": \"$ISSUE\", \"head\": \"$GITHUBUSER:$BRANCH\", \"base\": \"develop\"}" \
@@ -138,7 +138,7 @@ You might also want to look into [hub](https://github.com/defunkt/hub) for more
 
 ### Review process
 
-A member of the EasyBuild team will then review your pull request, paying attention to what you're contributing, how you implemented it and [code style](Code style).
+A member of the EasyBuild team will then review your pull request, paying attention to what you're contributing, how you implemented it and [code style](http://easybuild.readthedocs.org/en/latest/Code_style.html).
 
 Most likely, some remarks will be made on your pull request. Note that this is nothing personal, we're just trying to keep the EasyBuild codebase as high quality as possible. Even when an EasyBuild team member makes changes, the same public review process is followed.
 

diff --git a/README.rst b/README.rst
@@ -1,54 +1,57 @@
-Build status - *master branch (Python 2.4, Python 2.6, Python 2.7)*
-
-.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master-python24/badge/icon
-    :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master-python24/
-.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master/badge/icon
-    :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master/  
-.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master-python27/badge/icon
-    :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master-python27/ 
-
-Build status - *develop branch (Python 2.4, Python 2.6, Python 2.7)*
-
-.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop-python24/badge/icon
-    :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop-python24/  
-.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop/badge/icon
-    :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop/  
-.. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop-python27/badge/icon
-    :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop-python27/
-
-EasyBuild: building software with ease
---------------------------------------
-
-The easybuild-framework package is the basis for EasyBuild
-(http://hpcugent.github.com/easybuild), a software build and
-installation framework written in Python that allows you to install
-software in a structured, repeatable and robust way.
-
-This package contains the EasyBuild framework that supports the
-implementation and use of so-called easyblocks, that implement the
-software install procedure for a particular (group of) software
+.. image:: http://hpcugent.github.io/easybuild/images/easybuild_logo_small.png
+   :align: center
+
+`EasyBuild <https://hpcugent.github.io/easybuild>`_ is a software build
+and installation framework that allows you to manage (scientific) software
+on High Performance Computing (HPC) systems in an efficient way.
+
+The **easybuild-framework** package is the core of EasyBuild. It
+supports the implementation and use of so-called easyblocks which
+implement the software install procedure for a particular (group of) software
 package(s).
 
-The code of the easybuild-framework package is hosted on GitHub, along
+The EasyBuild documentation is available at http://easybuild.readthedocs.org/.
+
+The EasyBuild framework source code is hosted on GitHub, along
 with an issue tracker for bug reports and feature requests, see
 http://github.com/hpcugent/easybuild-framework.
 
-The EasyBuild documentation is available on the GitHub wiki of the
-easybuild meta-package, see
-http://github.com/hpcugent/easybuild/wiki/Home.
-
-Related packages: 
-- easybuild-easyblocks
-(http://pypi.python.org/pypi/easybuild-easyblocks): a collection of
-easyblocks that implement support for building and installing (groups
-of) software packages.
-
-- easybuild-easyconfigs
-(http://pypi.python.org/pypi/easybuild-easyconfigs): a collection of
-example easyconfig files that specify which software to build, and using
-which build options; these easyconfigs will be well tested with the
-latest compatible versions of the easybuild-framework and
-easybuild-easyblocks packages.
-
-The code in the vsc directory originally comes from VSC-tools
-(https://github.com/hpcugent/VSC-tools).
+Related Python packages:
+
+* **easybuild-easyblocks**
+
+  * a collection of easyblocks that implement support for building and installing (groups of) software packages
+  * GitHub repository: http://github.com/hpcugent/easybuild-easyblocks
+  * package on PyPi: https://pypi.python.org/pypi/easybuild-easyblocks
+
+* **easybuild-easyconfigs**
+
+  * a collection of example easyconfig files that specify which software to build,
+    and using which build options; these easyconfigs will be well tested
+    with the latest compatible versions of the easybuild-framework and easybuild-easyblocks packages
+  * GitHub repository: http://github.com/hpcugent/easybuild-easyconfigs
+  * PyPi: https://pypi.python.org/pypi/easybuild-easyconfigs
+
+The code in the ``vsc`` directory originally comes from the *vsc-base* package
+(https://github.com/hpcugent/vsc-base).
+
+
+*Build status overview:*
+
+* **master** branch *(Python 2.4, Python 2.6, Python 2.7)*
+
+  .. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master-python24/badge/icon
+      :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master-python24/
+  .. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master/badge/icon
+      :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master/
+  .. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master-python27/badge/icon
+      :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_master-python27/
+
+* **develop** branch *(Python 2.4, Python 2.6, Python 2.7)*
+
+  .. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop-python24/badge/icon
+      :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop-python24/
+  .. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop/badge/icon
+      :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop/
+  .. image:: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop-python27/badge/icon
+      :target: https://jenkins1.ugent.be/view/EasyBuild/job/easybuild-framework_unit-test_hpcugent_develop-python27/