Merge branch '2.10.x' into 2.11.x

.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

docs/faq.rst

@@ -95,7 +95,7 @@ means that you will less likely have an XSS problem it also causes a huge
 amount of extra processing in the template engine which can cause serious
 performance problems.  As Python doesn't provide a way to mark strings as
 unsafe Jinja has to hack around that limitation by providing a custom
-string class (the :class:`Markup` string) that safely interacts with safe
+string class (the :class:`~markupsafe.Markup` string) that safely interacts with safe
 and unsafe strings.
 
 With explicit escaping however the template engine doesn't have to perform

docs/requirements-post.txt

@@ -0,0 +1 @@
+markupsafe<2

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