summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/documentation
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-11-11 13:33:16 +0100
committerAndrey Andreev <narf@devilix.net>2014-11-11 13:33:16 +0100
commit8f7d3d2fccc097c85cc403b58df6c5fc35418579 (patch)
tree5bc1ef2a75abb0d85a3ab2cece365eed9e516470 /user_guide_src/source/documentation
parent4f50256a84e8052fc3356683f28286d36f8a322c (diff)
parent81c934729d9fcbb294a8914608c315eed30ff9c4 (diff)
Fix merge conflicts
Diffstat (limited to 'user_guide_src/source/documentation')
-rw-r--r--user_guide_src/source/documentation/index.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide_src/source/documentation/index.rst b/user_guide_src/source/documentation/index.rst
index b080c0efa..38124f7f2 100644
--- a/user_guide_src/source/documentation/index.rst
+++ b/user_guide_src/source/documentation/index.rst
@@ -42,7 +42,7 @@ Pygments, so that code blocks can be properly highlighted.
.. code-block:: bash
- easy_install sphinx
+ easy_install "sphinx==1.2.3"
easy_install sphinxcontrib-phpdomain
Then follow the directions in the README file in the :samp:`cilexer` folder