diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8d2faf2708..07bd607970 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1558,7 +1558,7 @@ Changelog
  * Fix: The wagtailimages module is now compatible with remote storage backends that do not allow reopening closed files
  * Fix: Search no longer crashes when auto-indexing a model that doesn't have an id field (Scot Hacker)
  * Fix: The `wagtailfrontendcache` module's HTTP backend has been rewritten to reliably direct requests to the configured cache hostname
- * Fix: Resizing single pixel images with the "fill" filter no longer raises "ZeroDivisionError" or "tile cannot extend outside image"
+ * Fix: Resizing single pixel images with the "fill" filter no longer raises `ZeroDivisionError` or "tile cannot extend outside image"
  * Fix: The queryset returned from `search` operations when using the database search backend now correctly preserves additional properties of the original query, such as `prefetch_related` / `select_related`
  * Fix: Responses from the external image URL generator are correctly marked as streaming and will no longer fail when used with Django's cache middleware
  * Fix: Page copy now works with pages that use multiple inheritance (Jordi Joan)
@@ -1632,7 +1632,7 @@ Changelog
 ~~~~~~~~~~~~~~~~~~~
 * Fix: When copying a page, IDs of child objects within page revision records were not remapped to the new objects; this would cause those objects to be lost from the original page when editing the new one
 * Fix: Search no longer crashes when auto-indexing a model that doesn't have an id field (Scot Hacker)
-* Fix: Resizing single pixel images with the "fill" filter no longer raises "ZeroDivisionError" or "tile cannot extend outside image"
+* Fix: Resizing single pixel images with the "fill" filter no longer raises `ZeroDivisionError` or "tile cannot extend outside image"
 
 
 0.8.9 (16.09.2015)
@@ -1848,7 +1848,7 @@ Changelog
  * Added a new datetime picker widget
  * Added styleguide (mainly for wagtail developers)
  * Aesthetic improvements to preview experience
- * 'image' tag now accepts extra keyword arguments to be output as attributes on the img tag
+ * 'image' tag now accepts extra keyword arguments to be output as attributes on the `<img>` tag
  * Login screen redirects to dashboard if user is already logged in
  * Renamed some template tag libraries
  * Any extra arguments given to serve are now passed through to get_context and get_template
diff --git a/docs/reference/contrib/modeladmin/indexview.rst b/docs/reference/contrib/modeladmin/indexview.rst
index 15d4d8c40c..9cba1c598a 100644
--- a/docs/reference/contrib/modeladmin/indexview.rst
+++ b/docs/reference/contrib/modeladmin/indexview.rst
@@ -687,10 +687,10 @@ change a few attributes to change the thumbnail to your liking, like so:
         # Optionally override the filter spec used to create each thumb
         thumb_image_filter_spec = 'fill-100x100' # this is the default
 
-        # Optionally override the 'width' attribute value added to each img tag
+        # Optionally override the 'width' attribute value added to each `<img>` tag
         thumb_image_width = 50 # this is the default
 
-        # Optionally override the class name added to each img tag
+        # Optionally override the class name added to each `<img>` tag
         thumb_classname = 'admin-thumb' # this is the default
 
         # Optionally override the text that appears in the column header
diff --git a/docs/releases/0.8.10.rst b/docs/releases/0.8.10.rst
index abc70b52f9..0c94689422 100644
--- a/docs/releases/0.8.10.rst
+++ b/docs/releases/0.8.10.rst
@@ -14,4 +14,4 @@ Bug fixes
 
  * When copying a page, IDs of child objects within page revision records were not remapped to the new objects; this would cause those objects to be lost from the original page when editing the new one
  * Search no longer crashes when auto-indexing a model that doesn't have an id field (Scot Hacker)
- * Resizing single pixel images with the "fill" filter no longer raises "ZeroDivisionError" or "tile cannot extend outside image"
+ * Resizing single pixel images with the "fill" filter no longer raises ``ZeroDivisionError`` or "tile cannot extend outside image"
diff --git a/docs/releases/1.1.rst b/docs/releases/1.1.rst
index 4c9a00d843..5589edb991 100644
--- a/docs/releases/1.1.rst
+++ b/docs/releases/1.1.rst
@@ -85,7 +85,7 @@ Bug fixes
  * The ``wagtailimages`` module is now compatible with remote storage backends that do not allow reopening closed files
  * Search no longer crashes when auto-indexing a model that doesn't have an ``id`` field
  * The ``wagtailfrontendcache`` module's HTTP backend has been rewritten to reliably direct requests to the configured cache hostname
- * Resizing single pixel images with the "fill" filter no longer raises "ZeroDivisionError" or "tile cannot extend outside image"
+ * Resizing single pixel images with the "fill" filter no longer raises ``ZeroDivisionError`` or "tile cannot extend outside image"
  * The QuerySet returned from ``search`` operations when using the database search backend now correctly preserves additional properties of the original query, such as ``prefetch_related`` / ``select_related``
  * Responses from the external image URL generator are correctly marked as streaming and will no longer fail when used with Django's cache middleware
  * Page copy now works with pages that use multiple inheritance