diff --git a/doc/conf.py b/doc/conf.py
index 1e5a0227f1671b4097dfd3b92417b3c7729ac195..ac63d6cbeaf793d197dbfc821de4ffce568d4587 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -275,5 +275,7 @@ texinfo_documents = [
 #texinfo_no_detailmenu = False
 
 
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+intersphinx_mapping = {
+    'http://docs.python.org/': None,
+    'https://documen.tician.de/pyopencl': None
+}
diff --git a/meshmode/discretization/__init__.py b/meshmode/discretization/__init__.py
index 6ff44165a61c6f2574ffdd914fb474bf9de9731b..db3712ddb1de6075dd381513a069f7484fc388f9 100644
--- a/meshmode/discretization/__init__.py
+++ b/meshmode/discretization/__init__.py
@@ -68,12 +68,12 @@ class ElementGroupBase(object):
 
     .. method:: grad_basis()
 
-        :returns: a :class:`tuple` of functions, each of  which
-        accepts arrays of shape *(dims, npts)*
-        and returns a :class:`tuple` of length *dims* containing
-        the derivatives along each axis as an array of size *npts*.
-        'Scalar' evaluation, by passing just one vector of length *dims*,
-        is also supported.
+        :returns: a :class:`tuple` of functions, each of which
+            accepts arrays of shape *(dims, npts)* and returns a
+            :class:`tuple` of length *dims* containing the
+            derivatives along each axis as an array of size
+            *npts*.  'Scalar' evaluation, by passing just one
+            vector of length *dims*, is also supported.
 
     .. method:: diff_matrices()
 
@@ -162,6 +162,13 @@ class OrderBasedGroupFactory(ElementGroupFactory):
 class Discretization(object):
     """An unstructured composite discretization.
 
+    :param cl_ctx: A :class:`pyopencl.Context`
+    :param mesh: A :class:`meshmode.mesh.Mesh` over which the discretization is
+        built
+    :param group_factory: An :class:`ElementGroupFactory`
+    :param real_dtype: The :mod:`numpy` data type used for representing real
+        data, either :class:`numpy.float32` or :class:`numpy.float64`
+
     .. attribute:: real_dtype
 
     .. attribute:: complex_dtype
diff --git a/meshmode/discretization/connection/__init__.py b/meshmode/discretization/connection/__init__.py
index 8e217d139d5d37c7b27c6f6eff6470d2767d0c15..4a56722fc99adc7aac5ec661ad904b35b21f6805 100644
--- a/meshmode/discretization/connection/__init__.py
+++ b/meshmode/discretization/connection/__init__.py
@@ -60,8 +60,9 @@ __doc__ = """
 
 .. autofunction:: make_same_mesh_connection
 
-.. autofunction:: FRESTR_INTERIOR_FACES
-.. autofunction:: FRESTR_ALL_FACES
+.. autodata:: FRESTR_INTERIOR_FACES
+.. autodata:: FRESTR_ALL_FACES
+
 .. autofunction:: make_face_restriction
 .. autofunction:: make_face_to_all_faces_embedding