Merge remote-tracking branch 'origin/master' into devdocs

This commit is contained in:
Peter Eckersley
2015-10-23 16:44:30 -07:00
6 changed files with 10 additions and 4 deletions
+2 -3
View File
@@ -324,9 +324,8 @@ Now run tests inside the Docker image:
tox -e py27
Notes on OS depedencies
=======================
Notes on OS dependencies
========================
OS level dependencies are managed by scripts in ``bootstrap``. Some notes
are provided here mainly for the :ref:`developers <hacking>` reference.