diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index edb2c026dd..cf7ef92eae 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -84,9 +84,9 @@ objects are changed or none of them are.
 
 .. admonition:: This is database-level autocommit
 
-    This functionality is not the same as the
-    :ref:`topics-db-transactions-autocommit` decorator. That decorator
-    is a Django-level implementation that commits automatically after
+    This functionality is not the same as the :ref:`autocommit
+    <topics-db-transactions-autocommit>` decorator. That decorator is
+    a Django-level implementation that commits automatically after
     data changing operations. The feature enabled using the
     :setting:`OPTIONS` option provides autocommit behavior at the
     database adapter level. It commits after *every* operation.
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 4589084ac2..4bb61b80b7 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -435,8 +435,9 @@ If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
 value of the :setting:`MEDIA_URL` setting.
 
 .. versionchanged:: 1.3
-    This context processor has been moved to the new :ref:`staticfiles` app.
-    Please use the new ``django.contrib.staticfiles.context_processors.staticfiles``
+    This context processor has been moved to the new
+    :doc:`/ref/contrib/staticfiles` app. Please use the new
+    ``django.contrib.staticfiles.context_processors.staticfiles``
     context processor.
 
 django.core.context_processors.csrf