diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 6e1033dc43..9438214a28 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -1323,7 +1323,7 @@ generating choices. See :ref:`iterating-relationship-choices` for details.
 .. class:: ModelMultipleChoiceField(**kwargs)
 
     * Default widget: :class:`SelectMultiple`
-    * Empty value: An empty ``QuerySet`` (self.queryset.none())
+    * Empty value: An empty ``QuerySet`` (``self.queryset.none()``)
     * Normalizes to: A ``QuerySet`` of model instances.
     * Validates that every id in the given list of values exists in the
       queryset.
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index 643e5c3957..4222979972 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -562,7 +562,7 @@ all of the model fields from being updated in the database. For example::
     product.save(update_fields=['name'])
 
 The ``update_fields`` argument can be any iterable containing strings. An
-empty ``update_fields`` iterable will skip the save. A value of None will
+empty ``update_fields`` iterable will skip the save. A value of ``None`` will
 perform an update on all fields.
 
 Specifying ``update_fields`` will force an update.
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 85c6bf6b17..70a6989306 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -864,8 +864,8 @@ ambiguous datetimes in daylight saving time. By default (when ``is_dst=None``),
 
 .. method:: none()
 
-Calling none() will create a queryset that never returns any objects and no
-query will be executed when accessing the results. A qs.none() queryset
+Calling ``none()`` will create a queryset that never returns any objects and no
+query will be executed when accessing the results. A ``qs.none()`` queryset
 is an instance of ``EmptyQuerySet``.
 
 Examples::
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 98f6578bba..6403ae0b51 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -127,7 +127,8 @@ composite keys in future releases of Django, the
 
 This method takes no arguments, and returns a tuple of four items:
 
-* ``name``: The field's attribute name on its parent model, or None if it is not part of a model
+* ``name``: The field's attribute name on its parent model, or ``None`` if it
+  is not part of a model
 * ``path``: A dotted, Python path to the class of this field, including the class name.
 * ``args``: Positional arguments, as a list
 * ``kwargs``: Keyword arguments, as a dict
diff --git a/docs/topics/checks.txt b/docs/topics/checks.txt
index f4cea90447..438139ad31 100644
--- a/docs/topics/checks.txt
+++ b/docs/topics/checks.txt
@@ -47,9 +47,9 @@ check function::
         return errors
 
 The check function *must* accept an ``app_configs`` argument; this argument is
-the list of applications that should be inspected. If None, the check must be
-run on *all* installed apps in the project. The ``**kwargs`` argument is required
-for future expansion.
+the list of applications that should be inspected. If ``None``, the check must
+be run on *all* installed apps in the project. The ``**kwargs`` argument is
+required for future expansion.
 
 Messages
 --------
diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt
index c92b8b0944..c3b7948caa 100644
--- a/docs/topics/db/queries.txt
+++ b/docs/topics/db/queries.txt
@@ -1254,7 +1254,8 @@ Things get more complicated if you use inheritance. Consider a subclass of
     django_blog = ThemeBlog(name='Django', tagline='Django is easy', theme='python')
     django_blog.save() # django_blog.pk == 3
 
-Due to how inheritance works, you have to set both ``pk`` and ``id`` to None::
+Due to how inheritance works, you have to set both ``pk`` and ``id`` to
+``None``::
 
     django_blog.pk = None
     django_blog.id = None
diff --git a/docs/topics/forms/formsets.txt b/docs/topics/forms/formsets.txt
index 64f740a997..d8316c913a 100644
--- a/docs/topics/forms/formsets.txt
+++ b/docs/topics/forms/formsets.txt
@@ -153,7 +153,7 @@ protects against memory exhaustion attacks using forged ``POST`` requests::
     >>> formset.non_form_errors()
     ['Please submit at most 1000 forms.']
 
-When ``absolute_max`` is None, it defaults to ``max_num + 1000``. (If
+When ``absolute_max`` is ``None``, it defaults to ``max_num + 1000``. (If
 ``max_num`` is ``None``, it defaults to ``2000``).
 
 If ``absolute_max`` is less than ``max_num``, a ``ValueError`` will be raised.