diff --git a/doc/changes.rst b/doc/changes.rst
index ffd2f317..878968f4 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -87,7 +87,7 @@ New features:
   characters as valid formula descriptions in
   the high-level formula API (:func:`dmatrix` and friends). This is
   intended as a convenience for people using Python 2 with ``from
-  __future__ import unicode_literals``. (See :ref:`py2-versus-py3`.)
+  __future__ import unicode_literals``.
 
 Bug fixes:
 
diff --git a/doc/conf.py b/doc/conf.py
index 2ad5d64b..f509ffed 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -75,9 +75,9 @@
 # Undocumented trick: if we def setup here in conf.py, it gets called just
 # like an extension's setup function.
 def setup(app):
-    app.add_javascript("show-code.js")
-    app.add_javascript("facebox.js")
-    app.add_stylesheet("facebox.css")
+    app.add_js_file("show-code.js")
+    app.add_js_file("facebox.js")
+    app.add_js_file("facebox.css")
 
 
 # Add any paths that contain templates here, relative to this directory.
@@ -240,9 +240,9 @@ def setup(app):
 autoclass_content = "both"
 
 intersphinx_mapping = {
-    "python": ("http://docs.python.org", None),
-    "numpy": ("http://docs.scipy.org/doc/numpy", None),
-    "pandas": ("http://pandas.pydata.org/pandas-docs/stable/", None),
+    "python": ("https://docs.python.org/3/", None),
+    "numpy": ("https://numpy.org/doc/stable/", None),
+    "pandas": ("https://pandas.pydata.org/pandas-docs/stable/", None),
 }
 
-autodoc_member_order = "source"
+autodoc_member_order = "bysource"
diff --git a/doc/index.rst b/doc/index.rst
index f4e591c3..84223741 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -4,38 +4,27 @@
    contain the root `toctree` directive.
 
 patsy - Describing statistical models in Python
-===================================================
+===============================================
+
+Patsy documentation
 
 Contents:
 
 .. toctree::
    :maxdepth: 2
 
-   overview.rst
-
-   quickstart.rst
-
-   formulas.rst
-
-   categorical-coding.rst
-
-   stateful-transforms.rst
-
-   spline-regression.rst
-
-   expert-model-specification.rst
-
-   library-developers.rst
-
-   R-comparison.rst
-
-   py2-versus-py3.rst
-
-   API-reference.rst
-
-   builtins-reference.rst
-
-   changes.rst
+   overview
+   quickstart
+   formulas
+   categorical-coding
+   stateful-transforms
+   spline-regression
+   expert-model-specification
+   library-developers
+   R-comparison
+   API-reference
+   builtins-reference
+   changes
 
 Indices and tables
 ==================
diff --git a/doc/spline-regression.rst b/doc/spline-regression.rst
index df0d2654..ae50247b 100644
--- a/doc/spline-regression.rst
+++ b/doc/spline-regression.rst
@@ -179,7 +179,7 @@ marginal spline bases patterns can be observed on the x and y contour projection
       ....:            {"x1": x1.ravel(), "x2": x2.ravel(), "df": df})
       ....:
 
-   In [80]: print y.shape
+   In [80]: print(y.shape)
 
    In [90]: fig = plt.figure()