Merge branch '2.2.2' into 2.0

doc/usage/restructuredtext/directives.rst

@@ -1017,7 +1017,7 @@ this reason, the following directive exists:
       cells.
 
       Sphinx's merged cells interact well with ``p{width}``, ``\X{a}{b}``,
-      ``Y{f}`` and tabulary's columns.
+      ``\Y{f}`` and tabulary's columns.
 
    .. note::
 

doc/usage/restructuredtext/domains.rst

@@ -1530,7 +1530,7 @@ These roles are provided to refer to the described objects:
 The Math Domain
 ---------------
 
-The math domain (name **math**) provides the following roles::
+The math domain (name **math**) provides the following roles:
 
 .. rst:role:: math:numref