Merge pull request #1010 from effigies/improved_docco_style

DOC: Use sphinxcontrib-apidoc and various cleanups

21 files changed, 32 insertions, 705 deletions

diff --git a/docs/apidocs/.gitignore b/docs/apidocs/.gitignore
new file mode 100644
index 00000000..89867378
--- /dev/null
+++ b/docs/apidocs/.gitignore
@@ -0,0 +1,2 @@
+modules.rst
+rdflib*.rst
diff --git a/docs/apidocs/modules.rst b/docs/apidocs/modules.rst
deleted file mode 100644
index 0b1fa9e2..00000000
--- a/docs/apidocs/modules.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-rdflib
-======
-
-.. toctree::
-   :maxdepth: 10
-
-   rdflib
diff --git a/docs/apidocs/rdflib.extras.rst b/docs/apidocs/rdflib.extras.rst
deleted file mode 100644
index 7cd472bb..00000000
--- a/docs/apidocs/rdflib.extras.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-rdflib.extras package
-=====================
-
-Submodules
-----------
-
-rdflib.extras.cmdlineutils module
----------------------------------
-
-.. automodule:: rdflib.extras.cmdlineutils
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.extras.describer module
-------------------------------
-
-.. automodule:: rdflib.extras.describer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.extras.external\_graph\_libs module
-------------------------------------------
-
-.. automodule:: rdflib.extras.external_graph_libs
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.extras.infixowl module
------------------------------
-
-.. automodule:: rdflib.extras.infixowl
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: rdflib.extras
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/apidocs/rdflib.plugins.parsers.rst b/docs/apidocs/rdflib.plugins.parsers.rst
deleted file mode 100644
index e3ba5ff3..00000000
--- a/docs/apidocs/rdflib.plugins.parsers.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-rdflib.plugins.parsers package
-==============================
-
-Submodules
-----------
-
-rdflib.plugins.parsers.notation3 module
----------------------------------------
-
-.. automodule:: rdflib.plugins.parsers.notation3
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.parsers.nquads module
-------------------------------------
-
-.. automodule:: rdflib.plugins.parsers.nquads
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.parsers.nt module
---------------------------------
-
-.. automodule:: rdflib.plugins.parsers.nt
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.parsers.ntriples module
---------------------------------------
-
-.. automodule:: rdflib.plugins.parsers.ntriples
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.parsers.rdfxml module
-------------------------------------
-
-.. automodule:: rdflib.plugins.parsers.rdfxml
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.parsers.trig module
-----------------------------------
-
-.. automodule:: rdflib.plugins.parsers.trig
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.parsers.trix module
-----------------------------------
-
-.. automodule:: rdflib.plugins.parsers.trix
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: rdflib.plugins.parsers
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/apidocs/rdflib.plugins.rst b/docs/apidocs/rdflib.plugins.rst
deleted file mode 100644
index aa93c1bd..00000000
--- a/docs/apidocs/rdflib.plugins.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-rdflib.plugins package
-======================
-
-Subpackages
------------
-
-.. toctree::
-
-   rdflib.plugins.parsers
-   rdflib.plugins.serializers
-   rdflib.plugins.sparql
-   rdflib.plugins.stores
-
-Submodules
-----------
-
-rdflib.plugins.memory module
-----------------------------
-
-.. automodule:: rdflib.plugins.memory
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sleepycat module
--------------------------------
-
-.. automodule:: rdflib.plugins.sleepycat
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: rdflib.plugins
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/apidocs/rdflib.plugins.serializers.rst b/docs/apidocs/rdflib.plugins.serializers.rst
deleted file mode 100644
index c5ce952c..00000000
--- a/docs/apidocs/rdflib.plugins.serializers.rst
+++ /dev/null
@@ -1,78 +0,0 @@
-rdflib.plugins.serializers package
-==================================
-
-Submodules
-----------
-
-rdflib.plugins.serializers.n3 module
-------------------------------------
-
-.. automodule:: rdflib.plugins.serializers.n3
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.serializers.nquads module
-----------------------------------------
-
-.. automodule:: rdflib.plugins.serializers.nquads
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.serializers.nt module
-------------------------------------
-
-.. automodule:: rdflib.plugins.serializers.nt
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.serializers.rdfxml module
-----------------------------------------
-
-.. automodule:: rdflib.plugins.serializers.rdfxml
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.serializers.trig module
---------------------------------------
-
-.. automodule:: rdflib.plugins.serializers.trig
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.serializers.trix module
---------------------------------------
-
-.. automodule:: rdflib.plugins.serializers.trix
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.serializers.turtle module
-----------------------------------------
-
-.. automodule:: rdflib.plugins.serializers.turtle
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.serializers.xmlwriter module
--------------------------------------------
-
-.. automodule:: rdflib.plugins.serializers.xmlwriter
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: rdflib.plugins.serializers
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/apidocs/rdflib.plugins.sparql.results.rst b/docs/apidocs/rdflib.plugins.sparql.results.rst
deleted file mode 100644
index b9ff9310..00000000
--- a/docs/apidocs/rdflib.plugins.sparql.results.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-rdflib.plugins.sparql.results package
-=====================================
-
-Submodules
-----------
-
-rdflib.plugins.sparql.results.csvresults module
------------------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.results.csvresults
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.results.graph module
-------------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.results.graph
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.results.jsonresults module
-------------------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.results.jsonresults
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.results.rdfresults module
------------------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.results.rdfresults
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.results.tsvresults module
------------------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.results.tsvresults
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.results.txtresults module
------------------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.results.txtresults
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.results.xmlresults module
------------------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.results.xmlresults
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: rdflib.plugins.sparql.results
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/apidocs/rdflib.plugins.sparql.rst b/docs/apidocs/rdflib.plugins.sparql.rst
deleted file mode 100644
index 768f4a1d..00000000
--- a/docs/apidocs/rdflib.plugins.sparql.rst
+++ /dev/null
@@ -1,109 +0,0 @@
-rdflib.plugins.sparql package
-=============================
-
-Subpackages
------------
-
-.. toctree::
-
-   rdflib.plugins.sparql.results
-
-Submodules
-----------
-
-rdflib.plugins.sparql.aggregates module
----------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.aggregates
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.algebra module
-------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.algebra
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.datatypes module
---------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.datatypes
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.evaluate module
--------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.evaluate
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.evalutils module
---------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.evalutils
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.operators module
---------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.operators
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.parser module
------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.parser
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.parserutils module
-----------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.parserutils
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.processor module
---------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.processor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.sparql module
------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.sparql
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.sparql.update module
------------------------------------
-
-.. automodule:: rdflib.plugins.sparql.update
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: rdflib.plugins.sparql
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/apidocs/rdflib.plugins.stores.rst b/docs/apidocs/rdflib.plugins.stores.rst
deleted file mode 100644
index 7367f47b..00000000
--- a/docs/apidocs/rdflib.plugins.stores.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-rdflib.plugins.stores package
-=============================
-
-Submodules
-----------
-
-rdflib.plugins.stores.auditable module
---------------------------------------
-
-.. automodule:: rdflib.plugins.stores.auditable
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.stores.concurrent module
----------------------------------------
-
-.. automodule:: rdflib.plugins.stores.concurrent
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.stores.regexmatching module
-------------------------------------------
-
-.. automodule:: rdflib.plugins.stores.regexmatching
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.stores.sparqlconnector module
---------------------------------------------
-
-.. automodule:: rdflib.plugins.stores.sparqlconnector
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugins.stores.sparqlstore module
-----------------------------------------
-
-.. automodule:: rdflib.plugins.stores.sparqlstore
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: rdflib.plugins.stores
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/apidocs/rdflib.rst b/docs/apidocs/rdflib.rst
deleted file mode 100644
index 99fa6132..00000000
--- a/docs/apidocs/rdflib.rst
+++ /dev/null
@@ -1,159 +0,0 @@
-rdflib package
-==============
-
-Subpackages
------------
-
-.. toctree::
-
-   rdflib.extras
-   rdflib.plugins
-   rdflib.tools
-
-Submodules
-----------
-
-rdflib.collection module
-------------------------
-
-.. automodule:: rdflib.collection
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.compare module
----------------------
-
-.. automodule:: rdflib.compare
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.compat module
---------------------
-
-.. automodule:: rdflib.compat
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.events module
---------------------
-
-.. automodule:: rdflib.events
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.exceptions module
-------------------------
-
-.. automodule:: rdflib.exceptions
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.graph module
--------------------
-
-.. automodule:: rdflib.graph
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.namespace module
------------------------
-
-.. automodule:: rdflib.namespace
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.parser module
---------------------
-
-.. automodule:: rdflib.parser
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.paths module
--------------------
-
-.. automodule:: rdflib.paths
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.plugin module
---------------------
-
-.. automodule:: rdflib.plugin
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.query module
--------------------
-
-.. automodule:: rdflib.query
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.resource module
-----------------------
-
-.. automodule:: rdflib.resource
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.serializer module
-------------------------
-
-.. automodule:: rdflib.serializer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.store module
--------------------
-
-.. automodule:: rdflib.store
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.term module
-------------------
-
-.. automodule:: rdflib.term
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.util module
-------------------
-
-.. automodule:: rdflib.util
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.void module
-------------------
-
-.. automodule:: rdflib.void
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: rdflib
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/apidocs/rdflib.tools.rst b/docs/apidocs/rdflib.tools.rst
deleted file mode 100644
index eaf8edf8..00000000
--- a/docs/apidocs/rdflib.tools.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-rdflib.tools package
-====================
-
-Submodules
-----------
-
-rdflib.tools.csv2rdf module
----------------------------
-
-.. automodule:: rdflib.tools.csv2rdf
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.tools.graphisomorphism module
-------------------------------------
-
-.. automodule:: rdflib.tools.graphisomorphism
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.tools.rdf2dot module
----------------------------
-
-.. automodule:: rdflib.tools.rdf2dot
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.tools.rdfpipe module
----------------------------
-
-.. automodule:: rdflib.tools.rdfpipe
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-rdflib.tools.rdfs2dot module
-----------------------------
-
-.. automodule:: rdflib.tools.rdfs2dot
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: rdflib.tools
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/conf.py b/docs/conf.py
index 47550ecb..6fe4ea70 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -27,6 +27,7 @@ sys.path.append(os.path.abspath(".."))
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 # extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.doctest']
 extensions = [
+    "sphinxcontrib.apidoc",
     "sphinx.ext.autodoc",
     #'sphinx.ext.autosummary',
     "sphinx.ext.doctest",
@@ -37,7 +38,9 @@ extensions = [
     "sphinx.ext.viewcode",
 ]
 
-autodoc_default_flags = ["special-members"]
+apidoc_module_dir = "../rdflib"
+apidoc_output_dir = "apidocs"
+autodoc_default_options = {"special-members": True}
 
 autosummary_generate = True
 
@@ -231,7 +234,7 @@ latex_documents = [
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    "python": ("http://docs.python.org/3.7", None),
+    "python": ("https://docs.python.org/3.7", None),
 }
 
 html_experimental_html5_writer = True
diff --git a/docs/index.rst b/docs/index.rst
index 07a9060a..892e370b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -100,7 +100,7 @@ and related packaged that you might also find useful.
 
 
 Further help
------------
+------------
 For asynchronous chat support, try our gitter channel at `<https://gitter.im/RDFLib/rdflib>`__
 
 If you would like more help with using rdflib, please post a question using the tag ``[rdflib]`` on StackOverflow. A list of
diff --git a/docs/intro_to_creating_rdf.rst b/docs/intro_to_creating_rdf.rst
index 3d279f99..d676a5d5 100644
--- a/docs/intro_to_creating_rdf.rst
+++ b/docs/intro_to_creating_rdf.rst
@@ -12,7 +12,7 @@ represented by the classes :class:`~rdflib.term.URIRef`, :class:`~rdflib.term.BN
 ``URIRefs`` and ``BNodes`` can both be thought of as resources, such a person, a company, a website, etc.
 
 * A ``BNode`` is a node where the exact URI is not known.
-* A ``URIRef`` is a node where the exact URI is knonw. ``URIRef``s are also used to represent the properties/predicates in the RDF graph.
+* A ``URIRef`` is a node where the exact URI is knonw. ``URIRef``\s are also used to represent the properties/predicates in the RDF graph.
 * ``Literals`` represent attribute values, such as a name, a date, a number, etc. The most common literal values are XML data types, e.g. string, int...
 
 
@@ -148,4 +148,4 @@ for ``foaf:member_name`` (a poor man's one-way
         g.add((s, FOAF['name'], o))
 
 Note that since rdflib 5.0.0, using ``foaf:member_name`` is somewhat prevented in rdflib since FOAF is declared as a :meth:`~rdflib.namespace.ClosedNamespace`
-class instance that has a closed set of members and ``foaf:member_name`` isnt one of them!
\ No newline at end of file
+class instance that has a closed set of members and ``foaf:member_name`` isnt one of them!
diff --git a/docs/intro_to_sparql.rst b/docs/intro_to_sparql.rst
index 31d1e7fa..5ab34287 100644
--- a/docs/intro_to_sparql.rst
+++ b/docs/intro_to_sparql.rst
@@ -65,7 +65,7 @@ equivalent.
 
 As an alternative to using ``PREFIX`` in the SPARQL query, namespace
 bindings can be passed in with the ``initNs`` kwarg, see
-:doc:`namespace_and_bindings`.
+:doc:`namespaces_and_bindings`.
 
 Variables can also be pre-bound, using ``initBindings`` kwarg can be
 used to pass in a ``dict`` of initial bindings, this is particularly
diff --git a/docs/sphinx-requirements.txt b/docs/sphinx-requirements.txt
index e69de29b..03f5a42c 100644
--- a/docs/sphinx-requirements.txt
+++ b/docs/sphinx-requirements.txt
@@ -0,0 +1,3 @@
+sphinx < 3
+sphinxcontrib-apidoc
+git+https://github.com/gniezen/n3pygments.git
diff --git a/docs/univrdfstore.rst b/docs/univrdfstore.rst
index 6d722724..f6822e5b 100644
--- a/docs/univrdfstore.rst
+++ b/docs/univrdfstore.rst
@@ -200,6 +200,7 @@ Triple Interfaces
 An RDF store could provide a standard set of interfaces for the manipulation, management, and/or retrieval of its contained triples (asserted or quoted):
 
 .. module:: rdflib.store
+    :noindex:
 
 .. automethod:: rdflib.store.Store.add
     :noindex:
diff --git a/rdflib/compat.py b/rdflib/compat.py
index bf6fa9bc..228c6a1c 100644
--- a/rdflib/compat.py
+++ b/rdflib/compat.py
@@ -136,7 +136,7 @@ def decodeStringEscape(s):
 def decodeUnicodeEscape(s):
     """
     s is a unicode string
-    replace \n and \\u00AC unicode escapes
+    replace ``\\n`` and ``\\u00AC`` unicode escapes
     """
     if not six.PY3:
         s = s.encode('utf-8').decode('string-escape')
diff --git a/rdflib/paths.py b/rdflib/paths.py
index 163f046f..6a8ee50e 100644
--- a/rdflib/paths.py
+++ b/rdflib/paths.py
@@ -32,18 +32,19 @@ In SPARQL the syntax is as follows:
 |                    | of the path by zero or one matches of elt.      |
 +--------------------+-------------------------------------------------+
 |!iri or             | Negated property set. An IRI which is not one of|
-|!(iri\ :sub:`1`\ |  | iri\ :sub:`1`...iri\ :sub:`n`.                  |
-|... |iri\ :sub:`n`) | !iri is short for !(iri).                       |
+|!(iri\ :sub:`1`\ \| | iri\ :sub:`1`...iri\ :sub:`n`.                  |
+|... \|iri\ :sub:`n`)| !iri is short for !(iri).                       |
 +--------------------+-------------------------------------------------+
 |!^iri or            | Negated property set where the excluded matches |
-|!(^iri\ :sub:`1`\ | | are based on reversed path. That is, not one of |
-|... |^iri\ :sub:`n`)| iri\ :sub:`1`...iri\ :sub:`n` as reverse paths. |
+|!(^iri\ :sub:`1`\ \|| are based on reversed path. That is, not one of |
+|...\|^iri\ :sub:`n`)| iri\ :sub:`1`...iri\ :sub:`n` as reverse paths. |
 |                    | !^iri is short for !(^iri).                     |
 +--------------------+-------------------------------------------------+
-|!(iri\ :sub:`1`\ |  | A combination of forward and reverse            |
-|...|iri\ :sub:`j`\ || properties in a negated property set.           |
-|^iri\ :sub:`j+1`\ | |                                                 |
-|... |^iri\ :sub:`n`)|                                                 |
+|!(iri\ :sub:`1`\ \| | A combination of forward and reverse            |
+|...\|iri\ :sub:`j`\ | properties in a negated property set.           |
+|\|^iri\ :sub:`j+1`\ |                                                 |
+|\|... \|^iri\       |                                                 |
+|:sub:`n`)|          |                                                 |
 +--------------------+-------------------------------------------------+
 |(elt)               | A group path elt, brackets control precedence.  |
 +--------------------+-------------------------------------------------+
diff --git a/rdflib/store.py b/rdflib/store.py
index 32c3f650..5d2d2f55 100644
--- a/rdflib/store.py
+++ b/rdflib/store.py
@@ -290,8 +290,8 @@ class Store(object):
         QuotedGraph, Date? DateRange?
 
         :param context: A conjunctive query can be indicated by either
-        providing a value of None, or a specific context can be
-        queries by passing a Graph instance (if store is context aware).
+                        providing a value of None, or a specific context can be
+                        queries by passing a Graph instance (if store is context aware).
         """
         subject, predicate, object = triple_pattern
 
diff --git a/setup.py b/setup.py
index 0203f299..d10513be 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,11 @@ kwargs = {}
 kwargs['install_requires'] = [ 'six', 'isodate', 'pyparsing']
 kwargs['tests_require'] = ['html5lib', 'networkx']
 kwargs['test_suite'] = "nose.collector"
-kwargs['extras_require'] = {'html': ['html5lib'], 'sparql': ['requests']}
+kwargs['extras_require'] = {
+    'html': ['html5lib'],
+    'sparql': ['requests'],
+    'docs': ['sphinx < 3', 'sphinxcontrib-apidoc']
+    }
 
 def find_version(filename):
     _version_re = re.compile(r'__version__ = "(.*)"')