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 42a2a41b5ced32b8820ce423cc83bbc1a919b656..bb5a0bf90d07591f27846e9448a0675171833f95 100644
--- a/meshmode/discretization/connection/__init__.py
+++ b/meshmode/discretization/connection/__init__.py
@@ -62,6 +62,7 @@ __doc__ = """
 
 .. autofunction:: FACE_RESTR_INTERIOR
 .. autofunction:: FACE_RESTR_ALL
+
 .. autofunction:: make_face_restriction
 .. autofunction:: make_face_to_all_faces_embedding
 
diff --git a/meshmode/discretization/connection/face.py b/meshmode/discretization/connection/face.py
index d581c701ca47e9bdd7298dc1e394cc9f73346bea..18be95f396c6a7963979e51b11d407f806c03041 100644
--- a/meshmode/discretization/connection/face.py
+++ b/meshmode/discretization/connection/face.py
@@ -150,9 +150,9 @@ def _get_face_vertices(mesh, boundary_tag):
 
         # }}}
     else:
-        # For INTERIOR_FACES, this is likely every vertex in the book.
+        # For FRESTR_INTERIOR_FACES, this is likely every vertex in the book.
         # Don't ever bother trying to cut the list down.
-        # For ALL_FACES, it literally is every single vertex.
+        # For FRESTR_ALL_FACES, it literally is every single vertex.
 
         return np.arange(mesh.nvertices, dtype=np.intp)
 
@@ -167,9 +167,9 @@ def make_face_restriction(discr, group_factory, boundary_tag,
 
     :arg boundary_tag: The boundary tag for which to create a face
         restriction. May be
-        :class:`meshmode.discretization.connection.INTERIOR_FACES`
+        :class:`meshmode.discretization.connection.FRESTR_INTERIOR_FACES`
         to indicate interior faces, or
-        :class:`meshmode.discretization.connection.ALL_FACES`
+        :class:`meshmode.discretization.connection.FRESTR_ALL_FACES`
         to make a discretization consisting of all (interior and
         boundary) faces.
 
@@ -198,7 +198,7 @@ def make_face_restriction(discr, group_factory, boundary_tag,
         boundary_tag = FACE_RESTR_INTERIOR
         from warnings import warn
         warn("passing *None* for boundary_tag is deprecated--pass "
-                "INTERIOR_FACES instead",
+                "FRESTR_INTERIOR_FACES instead",
                 DeprecationWarning, stacklevel=2)
 
     logger.info("building face restriction: start")