Merge branch '2.9.x' into 2.10.x2.10.x

4 files changed, 17 insertions, 1 deletions

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 0000000..6cbcad7
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,14 @@
+version: 2
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
+python:
+  install:
+    - requirements: docs/requirements.txt
+    - method: pip
+      path: .
+    - requirements: docs/requirements-post.txt
+sphinx:
+  builder: dirhtml
+  fail_on_warning: false
diff --git a/docs/extensions.rst b/docs/extensions.rst
index 8211858..fde2ae4 100644
--- a/docs/extensions.rst
+++ b/docs/extensions.rst
@@ -132,7 +132,7 @@ extraction tools in case you are not using Babel's.
 
 What's the big difference between standard and newstyle gettext calls?  In
 general they are less to type and less error prone.  Also if they are used
-in an :ref:`autescaping` environment they better support automatic escaping.
+in an :ref:`autoescaping` environment they better support automatic escaping.
 Here are some common differences between old and new calls:
 
 standard gettext:
diff --git a/docs/requirements-post.txt b/docs/requirements-post.txt
new file mode 100644
index 0000000..44857c8
--- /dev/null
+++ b/docs/requirements-post.txt
@@ -0,0 +1 @@
+markupsafe<2
diff --git a/docs/requirements.txt b/docs/requirements.txt
index cfe1fd7..92d3efa 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -2,3 +2,4 @@ Sphinx~=2.1.2
 Pallets-Sphinx-Themes~=1.2.0
 sphinxcontrib-log-cabinet~=1.0.1
 sphinx-issues~=1.2.0
+markupsafe<2