diff --git a/docs/conf.py b/docs/conf.py
index e2d4e0de8..540ae20d8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -210,5 +210,5 @@
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     'http://docs.python.org/dev': None,
-    'http://www.sqlalchemy.org/docs/05': None
+    'http://docs.sqlalchemy.org/en/latest/': None
 }
diff --git a/docs/contrib/lint.rst b/docs/contrib/lint.rst
index 23905ddc5..fe3e015c2 100644
--- a/docs/contrib/lint.rst
+++ b/docs/contrib/lint.rst
@@ -2,6 +2,8 @@
 Lint Validation Middleware
 ==========================
 
+.. currentmodule:: werkzeug.contrib.lint
+
 .. automodule:: werkzeug.contrib.lint
 
 .. autoclass:: LintMiddleware
diff --git a/docs/debug.rst b/docs/debug.rst
index 980d79f36..78563e435 100644
--- a/docs/debug.rst
+++ b/docs/debug.rst
@@ -81,8 +81,9 @@ Pasting Errors
 ==============
 
 If you click on the `Traceback` title, the traceback switches over to a text
-based one.  The text based one can be pasted to `gist.github.com`_ with one
+based one.  The text based one can be pasted to `gist.github.com <https://gist.github.com>`_ with one
 click.
 
 
-.. _paste.pocoo.org: https://gist.github.com/
+.. _paste.pocoo.org: https://gist.github.com
+
diff --git a/werkzeug/contrib/lint.py b/werkzeug/contrib/lint.py
index 5bbab7490..7ec80ce99 100644
--- a/werkzeug/contrib/lint.py
+++ b/werkzeug/contrib/lint.py
@@ -19,7 +19,11 @@
     :copyright: (c) 2014 by the Werkzeug Team, see AUTHORS for more details.
     :license: BSD, see LICENSE for more details.
 """
-from urlparse import urlparse
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
+
 from warnings import warn
 
 from werkzeug.datastructures import Headers
diff --git a/werkzeug/wsgi.py b/werkzeug/wsgi.py
index 4b4fb5a86..e64d64a78 100644
--- a/werkzeug/wsgi.py
+++ b/werkzeug/wsgi.py
@@ -902,6 +902,9 @@ def make_line_iter(stream, limit=None, buffer_size=10 * 1024,
     .. versionadded:: 0.9
        added support for iterators as input stream.
 
+    .. versionadded:: 0.11.10
+       added support for the `cap_at_buffer` parameter.
+
     :param stream: the stream or iterate to iterate over.
     :param limit: the limit in bytes for the stream.  (Usually
                   content length.  Not necessary if the `stream`
@@ -911,8 +914,6 @@ def make_line_iter(stream, limit=None, buffer_size=10 * 1024,
                           than the buffer size.  Internally this is implemented
                           that the buffer size might be exhausted by a factor
                           of two however.
-    .. versionadded:: 0.11.10
-       added support for the `cap_at_buffer` parameter.
     """
     _iter = _make_chunk_iter(stream, limit, buffer_size)