diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index d5281243be..d3232d8235 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -653,7 +653,7 @@ drop-in replacement for the :func:`~django.shortcuts.render` function. However,
 it had a slight incompatibility, in that for ``TemplateResponse``, context data
 from the passed in context dictionary could be shadowed by context data returned
 from context processors, whereas for ``render`` it was the other way
-around. This was a bug, and the behaviour of ``render`` is more appropriate,
+around. This was a bug, and the behavior of ``render`` is more appropriate,
 since it allows the globally defined context processors to be overridden locally
 in the view. If you were relying on the fact context data in a
 ``TemplateResponse`` could be overridden using a context processor, you will
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index 46099e9c8e..5dc12d25b6 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -267,6 +267,7 @@ Honza
 hostname
 hostnames
 howto
+hstore
 html
 http
 https
diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt
index 473285d37e..4625bd3149 100644
--- a/docs/topics/forms/index.txt
+++ b/docs/topics/forms/index.txt
@@ -591,7 +591,7 @@ errors. For example, ``{{ form.non_field_errors }}`` would look like:
 
 .. versionchanged:: 1.8
 
-    The "nonfield" class as described in the example above was added.
+    The ``nonfield`` class as described in the example above was added.
 
 See :doc:`/ref/forms/api` for more on errors, styling, and working with form
 attributes in templates.