diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 26f5378e1c8ccd2ad869b188f3e6882339eddef7..0000000000000000000000000000000000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,156 +0,0 @@
-Support schedule
-================
-
-We adhere to [Semantic Versioning][]:
-
-> Given a version number MAJOR.MINOR.PATCH, increment the:
->
-> * MAJOR version when you make incompatible API changes,
-> * MINOR version when you add functionality in a backwards-compatible manner, and
-> * PATCH version when you make backwards-compatible bug fixes.
->
-> Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format.
-
-[Semantic Versioning]: http://semver.org/
-
-The 2.0.x branch is featured in Debian Jessie and Ubuntu Xenial and is
-therefore be maintained for security fixes for the lifetime of those
-releases or of any other distribution that picks it up.
-
-Most development and major bug fixes are done directly in the 2.x
-branch and published as part of minor releases, which in turn become
-supported branches.
-
-Major, API-changing development will happen on the 3.x branch.
-
-Those [milestones][] are collaboratively tracked on 0xACAB.
-
- [milestones]: https://0xacab.org/monkeysphere/monkeysign/milestones
-
-Bug reports
-===========
-
-We want you to report bugs you find in Monkeysign. It's an important
-part of contributing to a project, and all bug reports will be read
-and replied to politely and professionally.
-
-Bugs used to be tracked with the [bugs-everywhere][] package, but this
-has proven to be too difficult to use and not transparent enough to
-most users, so we are now using [Gitlab][], where new bug reports
-should be sent.
-
- [bugs-everywhere]: http://bugseverywhere.org/
- [Gitlab]: https://0xacab.org/monkeysphere/monkeysign/issues
-
-Debian BTS
-----------
-
-You can also report bugs by email over the [Debian BTS][], even if you
-are not using Debian. Use the `reportbug` package to report a bug if
-you run Debian (or Ubuntu), otherwise send an email to
-`submit@bugs.debian.org`, with content like this:
-
- To: submit@bugs.debian.org
- From: you@example.com
- Subject: fails to frobnicate
-
- Package: monkeysign
- Version: 1.0
-
- Monkeysign fails to frobnicate.
-
- I tried to do...
-
- I was expecting...
-
- And instead I had this backtrace...
-
- I am running Arch Linux 2013.07.01, Python 2.7.5-1 under a amd64
- architecture.
-
-See also the [complete instructions][] for more information on how to
-use the Debian bugtracker. You can also
-browse the existing bug reports in the [Debian BTS for Monkeysign][] there.
-
- [Debian BTS]: http://bugs.debian.org/
- [complete instructions]: http://www.debian.org/Bugs/Reporting
- [Debian BTS for Monkeysign]: http://bugs.debian.org/monkeysign
-
-Bug triage
-----------
-
-Bug triage is a very useful contribution as well. You can review the
-[issues on 0xACAB][] or in the [Debian BTS for Monkeysign][]. What
-needs to be done is, for every issue:
-
-* try to reproduce the bug, if it is not reproducible, tag it with
- `unreproducible`
-* if information is missing, tag it with `moreinfo`
-* if a patch is provided, tag it with `patch` and test it
-* if the patch is incomplete, tag it with `help` (this is often the
- case when unit tests are missing)
-* if the patch is not working, remove the `patch` tag
-* if the patch gets merged into the git repository, tag it with
- `pending`
-* if the feature request is not within the scope of the project or
- should be refused for other reasons, use the `wontfix` tag and close
- the bug (with the `close` command or by CC'ing
- `NNNN-done@bugs.debian.org`)
-* feature requests should have a `wishlist` severity
-
-Those directives apply mostly to the Debian BTS, but some tags are
-also useful in the 0xACAB site. See also the more
-[complete directives on how to use the Debian BTS](https://www.debian.org/Bugs/Developer).
-
-[issues on 0xACAB]: https://0xacab.org/monkeysphere/monkeysign/issues
-
-Patches
-=======
-
-Patches can be submitted through [merge requests][] on the
-[Gitlab site][].
-
-[Gitlab site]: https://0xacab.org/monkeysphere/monkeysign/
-[merge requests]: https://0xacab.org/monkeysphere/monkeysign/merge_requests
-
-If you prefer old school, offline email systems, you can also use the
-Debian BTS, as described above, or send patches to the mailing list
-for discussion.
-
-Unit tests
-==========
-
-Unit tests should be ran before sending patches. They can be ran with
-`./test.py`. They expect a unicode locale, so if you do not have that
-configured already, do set one like this:
-
- export LANG=C.UTF-8
- ./test.py
-
-It is possible that some keys used in the tests expire. The built-in
-keys do not have specific expiry dates, but some keys are provided to
-test some corner cases and *those* keys may have new expiration dates.
-
-To renew the keys, try:
-
- mkdir ~/.gpg-tmp
- chmod 700 ~/.gpg-tmp
- gpg --homedir ~/.gpg-tmp --import 7B75921E.asc
- gpg --homedir ~/.gpg-tmp --refresh-keys 8DC901CE64146C048AD50FBB792152527B75921E
- gpg --homedir ~/.gpg-tmp --export-options export-minimal --armor --export 8DC901CE64146C048AD50FBB792152527B75921E > 7B75921E.asc
-
-It is also possible the key is just expired and there is no
-replacement. In this case the solution is to try and find a similar
-test case and replace the key, or simply disable that test.
-
-Release process
-===============
-
- * make sure tests pass (`./test.py`)
- * update version in `monkeysign/__init__.py` and run `dch -i -D unstable`
- * signed and annotated tag (`git tag -s -u keyid x.y`)
- * build Debian package (`git-buildpackage`)
- * install and test Debian package (`dpkg -i ../build-area/monkeysign_*.deb`)
- * upload Debian package
- * push commits and tags to the git repository
- * add announcement on website and mailing list <monkeysphere@lists.riseup.net>
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
new file mode 100644
index 0000000000000000000000000000000000000000..f7ddb854ff0fcdb397bde0ad1c5eb77cdad43502
--- /dev/null
+++ b/CONTRIBUTING.rst
@@ -0,0 +1,185 @@
+Contributing to Monkeysign
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Documentation
+=============
+
+We love documentation!
+
+We maintain the documentation in the Git repository, in `RST`_
+format. Documentation can be `edited directly on the website`_ and
+built locally with `Sphinx`_ with::
+
+ cd doc ; make html
+
+The Sphinx project has a `good tutorial`_ on RST online. Documentation
+is `automatically generated on RTD.io`_.
+
+.. _RST: https://en.wikipedia.org/wiki/ReStructuredText
+.. _edited directly on the website: https://0xacab.org/monkeysphere/monkeysign/tree/HEAD
+.. _Sphinx: http://www.sphinx-doc.org/
+.. _good tutorial: http://www.sphinx-doc.org/en/stable/rest.html
+.. _automatically generated on RTD.io: https://monkeysign.readthedocs.io/
+
+Support schedule
+================
+
+We adhere to `Semantic Versioning <http://semver.org/>`__:
+
+ Given a version number MAJOR.MINOR.PATCH, increment the:
+
+ - MAJOR version when you make incompatible API changes,
+ - MINOR version when you add functionality in a
+ backwards-compatible manner, and
+ - PATCH version when you make backwards-compatible bug fixes.
+
+ Additional labels for pre-release and build metadata are available
+ as extensions to the MAJOR.MINOR.PATCH format.
+
+The 2.0.x branch is featured in Debian Jessie and Ubuntu Xenial and is
+therefore be maintained for security fixes for the lifetime of those
+releases or of any other distribution that picks it up.
+
+Most development and major bug fixes are done directly in the 2.x branch
+and published as part of minor releases, which in turn become supported
+branches.
+
+Major, API-changing development will happen on the 3.x branch.
+
+Those
+`milestones <https://0xacab.org/monkeysphere/monkeysign/milestones>`__
+are collaboratively tracked on 0xACAB.
+
+Bug reports
+===========
+
+We want you to report bugs you find in Monkeysign. It's an important
+part of contributing to a project, and all bug reports will be read and
+replied to politely and professionally.
+
+Bugs used to be tracked with the
+`bugs-everywhere <http://bugseverywhere.org/>`__ package, but this has
+proven to be too difficult to use and not transparent enough to most
+users, so we are now using
+`Gitlab <https://0xacab.org/monkeysphere/monkeysign/issues>`__, where
+new bug reports should be sent.
+
+Debian BTS
+----------
+
+You can also report bugs by email over the `Debian
+BTS <http://bugs.debian.org/>`__, even if you are not using Debian. Use
+the ``reportbug`` package to report a bug if you run Debian (or Ubuntu),
+otherwise send an email to ``submit@bugs.debian.org``, with content like
+this:
+
+::
+
+ To: submit@bugs.debian.org
+ From: you@example.com
+ Subject: fails to frobnicate
+
+ Package: monkeysign
+ Version: 1.0
+
+ Monkeysign fails to frobnicate.
+
+ I tried to do...
+
+ I was expecting...
+
+ And instead I had this backtrace...
+
+ I am running Arch Linux 2013.07.01, Python 2.7.5-1 under a amd64
+ architecture.
+
+See also the `complete
+instructions <http://www.debian.org/Bugs/Reporting>`__ for more
+information on how to use the Debian bugtracker. You can also browse the
+existing bug reports in the `Debian BTS for
+Monkeysign <http://bugs.debian.org/monkeysign>`__ there.
+
+Bug triage
+----------
+
+Bug triage is a very useful contribution as well. You can review the
+`issues on 0xACAB <https://0xacab.org/monkeysphere/monkeysign/issues>`__
+or in the `Debian BTS for
+Monkeysign <http://bugs.debian.org/monkeysign>`__. What needs to be done
+is, for every issue:
+
+- try to reproduce the bug, if it is not reproducible, tag it with
+ ``unreproducible``
+- if information is missing, tag it with ``moreinfo``
+- if a patch is provided, tag it with ``patch`` and test it
+- if the patch is incomplete, tag it with ``help`` (this is often the
+ case when unit tests are missing)
+- if the patch is not working, remove the ``patch`` tag
+- if the patch gets merged into the git repository, tag it with
+ ``pending``
+- if the feature request is not within the scope of the project or
+ should be refused for other reasons, use the ``wontfix`` tag and
+ close the bug (with the ``close`` command or by CC'ing
+ ``NNNN-done@bugs.debian.org``)
+- feature requests should have a ``wishlist`` severity
+
+Those directives apply mostly to the Debian BTS, but some tags are also
+useful in the 0xACAB site. See also the more `complete directives on how
+to use the Debian BTS <https://www.debian.org/Bugs/Developer>`__.
+
+Patches
+=======
+
+Patches can be submitted through `merge
+requests <https://0xacab.org/monkeysphere/monkeysign/merge_requests>`__
+on the `Gitlab site <https://0xacab.org/monkeysphere/monkeysign/>`__.
+
+If you prefer old school, offline email systems, you can also use the
+Debian BTS, as described above, or send patches to the mailing list for
+discussion.
+
+Unit tests
+==========
+
+Unit tests should be ran before sending patches. They can be ran with
+``./test.py``. They expect a unicode locale, so if you do not have that
+configured already, do set one like this:
+
+::
+
+ export LANG=C.UTF-8
+ ./test.py
+
+It is possible that some keys used in the tests expire. The built-in
+keys do not have specific expiry dates, but some keys are provided to
+test some corner cases and *those* keys may have new expiration dates.
+
+To renew the keys, try:
+
+::
+
+ mkdir ~/.gpg-tmp
+ chmod 700 ~/.gpg-tmp
+ gpg --homedir ~/.gpg-tmp --import 7B75921E.asc
+ gpg --homedir ~/.gpg-tmp --refresh-keys 8DC901CE64146C048AD50FBB792152527B75921E
+ gpg --homedir ~/.gpg-tmp --export-options export-minimal --armor --export 8DC901CE64146C048AD50FBB792152527B75921E > 7B75921E.asc
+
+It is also possible the key is just expired and there is no replacement.
+In this case the solution is to try and find a similar test case and
+replace the key, or simply disable that test.
+
+Release process
+===============
+
+- make sure tests pass (``./test.py``)
+- update version in ``monkeysign/__init__.py`` and run
+ ``dch -i -D unstable``
+- signed and annotated tag (``git tag -s -u keyid x.y``)
+- build Debian package (``git-buildpackage``)
+- install and test Debian package
+ (``dpkg -i ../build-area/monkeysign_*.deb``)
+- upload Debian package
+- push commits and tags to the git repository
+- add announcement on website and mailing list
+ monkeysphere@lists.riseup.net
+
diff --git a/README.md b/README.md
deleted file mode 100644
index f3af740d4c9f2a48c7aa8d11597ca78079ed96ae..0000000000000000000000000000000000000000
--- a/README.md
+++ /dev/null
@@ -1,167 +0,0 @@
-Monkeysign: OpenPGP Key Exchange for Humans
-===========================================
-
-monkeysign is a tool to overhaul the OpenPGP keysigning experience and
-bring it closer to something that most primates can understand.
-
-The project makes use of cheap digital cameras and the type of bar
-code known as a QRcode to provide a human-friendly yet still-secure
-keysigning experience.
-
-No more reciting tedious strings of hexadecimal characters. And, you
-can build a little rogue's gallery of the people that you have met and
-exchanged keys with! (Well, not yet, but it's part of the plan.)
-
-Monkeysign also features a user-friendly commandline tool, similar to
-`caff`, to sign OpenGPG keys following the current best practices.
-
-Monkeysign was written by Jerome Charaoui and Antoine Beaupré and is
-licensed under GPLv3.
-
-Features
----------
-
- * commandline and GUI interface
- * GUI supports exchanging fingerprints with qrcodes
- * print your OpenPGP fingerprint on a QRcode
- * key signature done on a separate keyring
- * signature sent in a crypted email to ensure:
- 1. the signee controls the signed email
- 2. the signee controls the private key
- 3. the signee decides what to do with the signature
- * local ("non-exportable") signatures
- * send through local email server, arbitrary SMTP server or other
- programs
-
-Installing
-----------
-
-Monkeysign should be available in Debian and Ubuntu, but can also
-easily be installed from source.
-
-### Requirements
-
-The following Python packages are required for the GUI to work.
-
- python-qrencode python-gtk2 python-zbar python-zbarpygtk
-
-If they are not available, the commandline signing tool should still
-work but doesn't recognize QR codes.
-
-Of course, all this depends on the GnuPG program.
-
-### In Debian / Ubuntu
-
-Monkeysign is now in Debian, since Jessie (and backported to Wheezy)
-and Ubuntu (since Trusty 14.04LTS). To install it, just run:
-
- apt-get install monkeysign
-
-### From git
-
-You can fetch monkeysign with git:
-
- git clone git://git.monkeysphere.info/monkeysign
-
-### From source
-
-The source tarball is also available directly from the Debian mirrors
-here:
-
- http://cdn.debian.net/debian/pool/main/m/monkeysign/
-
-The `.tar.gz` file has a checksum, cryptographically signed, in the
-`.dsc` file.
-
-### Installing from source
-
-To install monkeysign, run:
-
- sudo ./setup.py install --record=install.log
-
-Running
--------
-
-The graphical interface should be self-explanatory, it should be in
-your menus or call it with:
-
- monkeyscan
-
-The commandline interface should provide you with a complete help file
-when called with `--help`:
-
- monkeysign --help
-
-For example, to sign a given fingerprint:
-
- monkeysign 90ABCDEF1234567890ABCDEF1234567890ABCDEF
-
-This will fetch the key from your keyring (or a keyserver) and sign it
-in a temporary keyring, then encrypt the signature and send it in an
-email to the owner of the key.
-
-Caveats
--------
-
- * There are numerous bugs with odd keys and GnuPG corner cases. Most
- of them should be documented on the Debian BTS here:
- https://bugs.debian.org/monkeysign
-
- * Running monkeysign in `--debug` mode and sending the output to a
- public forum may leak public or even private key material in some
- circumstances. Special efforts have been made so that private key
- material is never output to the screen, but you can never be too
- careful: look at the output before you send it.
-
- * The graphical interface isn't as complete as the commandline. A few
- features are missing and it is mostly a proof of concept at this
- point which works, but has a few rough edges. In particular, if you
- have a high resolution camera, the camera window may fill your
- screen completely, in which case you may want to change the
- resolution beforehand using the following commands:
-
- sudo apt-get install v4l-utils
- v4l2-ctl --set-fmt-video=width=640,height=480,pixelformat=1
-
- See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=723154 for
- more information about this specific problem.
-
- * Both the graphical and commandline interface assume you are fairly
- familiar with SMTP configuration or had an administrator setup a
- mailserver on your machine for email delivery.
-
-Support
--------
-
-Discussions, questions and issues can be brought up on the mailing
-list, <monkeysphere@lists.riseup.net>. See the [CONTRIBUTING.md][]
-file for more information about how to file bugs.
-
-[CONTRIBUTING.md]: CONTRIBUTING.md
-
-Similar projects
-----------------
-
- * [OpenKeychain][], a fork of [APG][], has support for exporting and
- importing fingerprints in QRcode and NFC. It uses similar strings
- for QRcodes exchanges and is compatible with
- Monkeysign. ([Github project][2])
-
- [OpenKeychain]: https://www.openkeychain.org/
- [APG]: http://www.thialfihar.org/projects/apg/
- [2]: https://github.com/open-keychain/open-keychain
-
- * [GPG for Android][] (of the [Guardian project][]) will import
- public keys in your device's keyring when they are found in
- QRcodes, so it should be able to talk with Monkeysign, but this
- remains to be tested. ([Github project][])
-
- [GPG for Android]: https://guardianproject.info/code/gnupg/
- [Guardian project]: https://guardianproject.info/
- [Github project]: https://github.com/guardianproject/gnupg-for-android
-
- * [Gibberbot][] (also of the [Guardian project][]) can exchange OTR
- fingerprints using QRcodes. ([Github project][3])
-
- [Gibberbot]: https://guardianproject.info/apps/gibber/
- [3]: https://github.com/guardianproject/Gibberbot
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000000000000000000000000000000000000..999a4a2b68dad614568e36f3c2cb96b40e3ec2c7
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,186 @@
+Monkeysign: OpenPGP Key Exchange for Humans
+===========================================
+
+monkeysign is a tool to overhaul the OpenPGP keysigning experience and
+bring it closer to something that most primates can understand.
+
+The project makes use of cheap digital cameras and the type of bar code
+known as a QRcode to provide a human-friendly yet still-secure
+keysigning experience.
+
+No more reciting tedious strings of hexadecimal characters. And, you can
+build a little rogue's gallery of the people that you have met and
+exchanged keys with! (Well, not yet, but it's part of the plan.)
+
+Monkeysign also features a user-friendly commandline tool, similar to
+``caff``, to sign OpenGPG keys following the current best practices.
+
+Monkeysign was written by Jerome Charaoui and Antoine Beaupré and is
+licensed under GPLv3.
+
+Features
+--------
+
+- commandline and GUI interface
+- GUI supports exchanging fingerprints with qrcodes
+- print your OpenPGP fingerprint on a QRcode
+- key signature done on a separate keyring
+- signature sent in a crypted email to ensure:
+
+ 1. the signee controls the signed email
+ 2. the signee controls the private key
+ 3. the signee decides what to do with the signature
+
+- local ("non-exportable") signatures
+- send through local email server, arbitrary SMTP server or other
+ programs
+
+Installing
+----------
+
+Monkeysign should be available in Debian and Ubuntu, but can also easily
+be installed from source.
+
+Requirements
+~~~~~~~~~~~~
+
+The following Python packages are required for the GUI to work.
+
+::
+
+ python-qrencode python-gtk2 python-zbar python-zbarpygtk
+
+If they are not available, the commandline signing tool should still
+work but doesn't recognize QR codes.
+
+Of course, all this depends on the GnuPG program.
+
+In Debian / Ubuntu
+~~~~~~~~~~~~~~~~~~
+
+Monkeysign is now in Debian, since Jessie (and backported to Wheezy) and
+Ubuntu (since Trusty 14.04LTS). To install it, just run:
+
+::
+
+ apt-get install monkeysign
+
+From git
+~~~~~~~~
+
+You can fetch monkeysign with git:
+
+::
+
+ git clone git://git.monkeysphere.info/monkeysign
+
+From source
+~~~~~~~~~~~
+
+The source tarball is also available directly from the Debian mirrors
+here:
+
+::
+
+ http://cdn.debian.net/debian/pool/main/m/monkeysign/
+
+The ``.tar.gz`` file has a checksum, cryptographically signed, in the
+``.dsc`` file.
+
+Installing from source
+~~~~~~~~~~~~~~~~~~~~~~
+
+To install monkeysign, run:
+
+::
+
+ sudo ./setup.py install --record=install.log
+
+Running
+-------
+
+The graphical interface should be self-explanatory, it should be in your
+menus or call it with:
+
+::
+
+ monkeyscan
+
+The commandline interface should provide you with a complete help file
+when called with ``--help``:
+
+::
+
+ monkeysign --help
+
+For example, to sign a given fingerprint:
+
+::
+
+ monkeysign 90ABCDEF1234567890ABCDEF1234567890ABCDEF
+
+This will fetch the key from your keyring (or a keyserver) and sign it
+in a temporary keyring, then encrypt the signature and send it in an
+email to the owner of the key.
+
+Caveats
+-------
+
+- There are numerous bugs with odd keys and GnuPG corner cases. Most of
+ them should be documented on the Debian BTS here:
+ https://bugs.debian.org/monkeysign
+
+- Running monkeysign in ``--debug`` mode and sending the output to a
+ public forum may leak public or even private key material in some
+ circumstances. Special efforts have been made so that private key
+ material is never output to the screen, but you can never be too
+ careful: look at the output before you send it.
+
+- The graphical interface isn't as complete as the commandline. A few
+ features are missing and it is mostly a proof of concept at this
+ point which works, but has a few rough edges. In particular, if you
+ have a high resolution camera, the camera window may fill your screen
+ completely, in which case you may want to change the resolution
+ beforehand using the following commands:
+
+ ::
+
+ sudo apt-get install v4l-utils
+ v4l2-ctl --set-fmt-video=width=640,height=480,pixelformat=1
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=723154 for more
+information about this specific problem.
+
+- Both the graphical and commandline interface assume you are fairly
+ familiar with SMTP configuration or had an administrator setup a
+ mailserver on your machine for email delivery.
+
+Support
+-------
+
+Discussions, questions and issues can be brought up on the mailing
+list, monkeysphere@lists.riseup.net. See the :doc:`CONTRIBUTING`
+document for more information about how to file bugs.
+
+Similar projects
+----------------
+
+- `OpenKeychain <https://www.openkeychain.org/>`__, a fork of
+ `APG <http://www.thialfihar.org/projects/apg/>`__, has support for
+ exporting and importing fingerprints in QRcode and NFC. It uses
+ similar strings for QRcodes exchanges and is compatible with
+ Monkeysign. (`Github
+ project <https://github.com/open-keychain/open-keychain>`__)
+
+- `GPG for Android <https://guardianproject.info/code/gnupg/>`__ (of
+ the `Guardian project <https://guardianproject.info/>`__) will import
+ public keys in your device's keyring when they are found in QRcodes,
+ so it should be able to talk with Monkeysign, but this remains to be
+ tested. (`Github
+ project <https://github.com/guardianproject/gnupg-for-android>`__)
+
+- `Gibberbot <https://guardianproject.info/apps/gibber/>`__ (also of
+ the `Guardian project <https://guardianproject.info/>`__) can
+ exchange OTR fingerprints using QRcodes. (`Github
+ project <https://github.com/guardianproject/Gibberbot>`__)
+
diff --git a/debian/docs b/debian/docs
index 693b6e0037f4823c4645d757635d33f311095cf9..448d4c729dae6872d308ec788583d8dfb55c2cd0 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,4 @@
-README.mdwn
-HACKING.mdwn
+README.rst
+HACKING.rst
doc/presentation*
doc/ui/
diff --git a/doc/CONTRIBUTING.rst b/doc/CONTRIBUTING.rst
new file mode 120000
index 0000000000000000000000000000000000000000..798f2aa2fc57c79fd95b7e8315dc0e7254a59bfd
--- /dev/null
+++ b/doc/CONTRIBUTING.rst
@@ -0,0 +1 @@
+../CONTRIBUTING.rst
\ No newline at end of file
diff --git a/doc/conf.py b/doc/conf.py
index 4675d8fdb8d6e1c600de3605bd43ef5e6a112f97..00eab4a4a93b05811e70c8965fb65e6ea10621be 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -33,18 +33,6 @@ templates_path = ['_templates']
# The suffix of source filenames.
source_suffix = '.rst'
-# markdown support: http://blog.readthedocs.com/adding-markdown-support/
-try:
- from recommonmark.parser import CommonMarkParser
- source_parsers = {'.md': CommonMarkParser}
- import sphinx
- if sphinx.__version__.startswith('1.3'):
- source_suffix = ['.rst', '.md']
- else:
- print "WARNING: can't set source_suffix as you are running an older Sphinx version (< 1.3)"
-except ImportError:
- print "WARNING: no markdown support found, bits of documentation will be missing"
-
# The encoding of source files.
#source_encoding = 'utf-8-sig'
diff --git a/doc/index.rst b/doc/index.rst
index 2fbc7cba7498e5f69e2edc550f1fcdd9bea15831..a5b7deea0546ea63a76417b3136378ae78e35db0 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -3,7 +3,7 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
-.. include:: ../README.md
+.. include:: ../README.rst
Other documentation
===================