diff --git a/docs/hunspell/libtorrent.dic b/docs/hunspell/libtorrent.dic
index 0deb2c63e..baec672f6 100644
--- a/docs/hunspell/libtorrent.dic
+++ b/docs/hunspell/libtorrent.dic
@@ -505,3 +505,8 @@ anonymization
 Tribler
 gzipped
 processes'
+versioning
+cstdint
+cloneable
+inline
+chrono
diff --git a/docs/makefile b/docs/makefile
index af598c08a..789f7eb3d 100644
--- a/docs/makefile
+++ b/docs/makefile
@@ -107,8 +107,10 @@ $(REFERENCE_TARGETS:=.rst) plain_text_out.txt:gen_reference_doc.py ../include/li
 spell-check:plain_text_out.txt $(MANUAL_TARGETS:=.html) manual.rst settings.rst
 	python filter-rst.py manual.rst >manual-plain.txt
 	python filter-rst.py settings.rst >settings-plain.txt
+	python filter-rst.py upgrade_to_1.2.rst >upgrade-1_2-plain.txt
 	hunspell -d hunspell/en_US -p hunspell/libtorrent.dic -l plain_text_out.txt >hunspell-report.txt
 	hunspell -d hunspell/en_US -p hunspell/libtorrent.dic -l manual-plain.txt >hunspell-report.txt
+	hunspell -d hunspell/en_US -p hunspell/libtorrent.dic -l upgrade-1_2-plain.txt >hunspell-report.txt
 #	hunspell -d hunspell/en_US -p hunspell/settings.dic -l settings-plain.txt >hunspell-report.txt
 	hunspell -d hunspell/en_US -p hunspell/libtorrent.dic -H -l $(MANUAL_TARGETS:=.html) >>hunspell-report.txt
 	@if [ -s hunspell-report.txt ]; then echo 'spellcheck failed, fix words or add to dictionary:'; cat hunspell-report.txt; false; fi;
diff --git a/docs/upgrade_to_1.2.rst b/docs/upgrade_to_1.2.rst
index 6458cf22d..c0d550558 100644
--- a/docs/upgrade_to_1.2.rst
+++ b/docs/upgrade_to_1.2.rst
@@ -19,13 +19,27 @@ of at least C++11 to build libtorrent.
 
 This also means libtorrent types now support move.
 
+listen interfaces
+=================
+
+There's a subtle change in how the ``listen_interfaces`` setting is interpreted
+in 1.2 compared to 1.1.
+
+In libtorrent-1.1, if you listen to ``0.0.0.0:6881`` (which was the default),
+not only would an IPv4 listen socket be opened (bound to INADDR_ANY) but also an
+IPv6 socket would be opened.
+
+In libtorrent-1.2, if you listen to ``0.0.0.0:6881`` only the IPv4 INADDR_ANY is
+opened as a listen socket. If you want to listen to both IPv4 and IPv6, you need
+to listen to ``0.0.0.0:6881,[::]:6881``.
+
 forward declaring libtorrent types deprecated
 =============================================
 
 Clients are discouraged from forward declaring types from libtorrent.
 Instead, include the <libtorrent/fwd.hpp> header.
 
-A future release will intrduce ABI versioning using an inline namespace, which will break any forward declarations by clients.
+A future release will introduce ABI versioning using an inline namespace, which will break any forward declarations by clients.
 
 There is a new namespace alias, ``lt`` which is shorthand for ``libtorrent``.
 In the future, ``libtorrent`` will be the alias and ``lt`` the namespace name.
@@ -88,7 +102,7 @@ boost replaced by std
 
 ``boost::shared_ptr`` has been replaced by ``std::shared_ptr`` in the libtorrent API.
 The same goes for ``<cstdint>`` types, instead of ``boost::int64_t``, libtorrent now uses ``std::int64_t``.
-Instead of ``boost::array``, ``std::array`` is used, and ``boost::function`` has been replaced by ``std::fuction``.
+Instead of ``boost::array``, ``std::array`` is used, and ``boost::function`` has been replaced by ``std::function``.
 
 strong typedefs
 ===============