Bump docs dependencies and move docs docs to README

CONTRIBUTING.md

@@ -21,6 +21,7 @@ Or `nix`:
 ./scripts/generate-nix-files.sh   # Get up-to-date shell.nix files
 ```
 
+To build the docs, see `doc/README.md`.
 
 ## General
 

doc/README.md

@@ -0,0 +1,8 @@
+To build the docs locally:
+
+    $ virtualenv venv
+    $ . ./venv/bin/activate
+    $ pip install -r requirements.txt
+    $ make html
+
+Docs will be built in _build/html/index.html .

doc/building-the-docs

@@ -1,8 +0,0 @@
-To build the docs locally:
-
-$ virtualenv venv
-$ . ./venv/bin/activate
-$ pip install -r requirements.txt
-$ make html
-
-Docs will be built in _build/html/index.html .

doc/conf.py

@@ -167,7 +167,6 @@ texinfo_documents = [
 # -- Markdown -------------------------------------------------------------
 
 source_parsers = {
-    '.md': CommonMarkParser,
     '.lhs': CommonMarkParser,
 }
 

doc/requirements.txt

@@ -1,3 +1,3 @@
-recommonmark==0.4.0
-Sphinx==1.7.5
-sphinx_rtd_theme>=0.4.0
+recommonmark==0.5.0
+Sphinx==1.8.4
+sphinx_rtd_theme>=0.4.2