diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 651356e9..b372d094 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -570,7 +570,7 @@ To access parameters submitted in the URL (``?key=value``) you can use the
     searchword = request.args.get('key', '')
 
 We recommend accessing URL parameters with `get` or by catching the
-`KeyError` because users might change the URL and presenting them a 400
+:exc:`KeyError` because users might change the URL and presenting them a 400
 bad request page in that case is not user friendly.
 
 For a full list of methods and attributes of the request object, head over
diff --git a/docs/upgrading.rst b/docs/upgrading.rst
index 2ec501a2..1bf896f5 100644
--- a/docs/upgrading.rst
+++ b/docs/upgrading.rst
@@ -92,7 +92,7 @@ If invalid JSON data was submitted Flask will now raise a
 default :exc:`ValueError` bubble up.  This has the advantage that you no
 longer have to handle that error to avoid an internal server error showing
 up for the user.  If you were catching this down explicitly in the past
-as `ValueError` you will need to change this.
+as :exc:`ValueError` you will need to change this.
 
 Due to a bug in the test client Flask 0.7 did not trigger teardown
 handlers when the test client was used in a with statement.  This was
diff --git a/flask/app.py b/flask/app.py
index 6b123245..7532b990 100644
--- a/flask/app.py
+++ b/flask/app.py
@@ -379,7 +379,7 @@ class Flask(_PackageBoundObject):
         #: A list of functions that are called when :meth:`url_for` raises a
         #: :exc:`~werkzeug.routing.BuildError`.  Each function registered here
         #: is called with `error`, `endpoint` and `values`.  If a function
-        #: returns ``None`` or raises a `BuildError` the next function is
+        #: returns ``None`` or raises a :exc:`BuildError` the next function is
         #: tried.
         #:
         #: .. versionadded:: 0.9
diff --git a/flask/helpers.py b/flask/helpers.py
index ff43ac27..37b6be8f 100644
--- a/flask/helpers.py
+++ b/flask/helpers.py
@@ -248,7 +248,7 @@ def url_for(endpoint, **values):
       address can be changed via ``SERVER_NAME`` configuration variable which
       defaults to `localhost`.
     :param _scheme: a string specifying the desired URL scheme. The `_external`
-      parameter must be set to ``True`` or a `ValueError` is raised. The default
+      parameter must be set to ``True`` or a :exc:`ValueError` is raised. The default
       behavior uses the same scheme as the current request, or
       ``PREFERRED_URL_SCHEME`` from the :ref:`app configuration <config>` if no
       request context is available. As of Werkzeug 0.10, this also can be set
diff --git a/flask/json.py b/flask/json.py
index c895a446..a5250521 100644
--- a/flask/json.py
+++ b/flask/json.py
@@ -60,7 +60,7 @@ class JSONEncoder(_json.JSONEncoder):
     def default(self, o):
         """Implement this method in a subclass such that it returns a
         serializable object for ``o``, or calls the base implementation (to
-        raise a ``TypeError``).
+        raise a :exc:`TypeError`).
 
         For example, to support arbitrary iterators, you could implement
         default like this::