Merge branch 'sphinx-doc:4.x' into container-latex

2 files changed, 5 insertions, 2 deletions

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index a08d6568e..408a6c74c 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -966,7 +966,7 @@ class LaTeXTranslator(SphinxTranslator):
                     # insert suitable strut for equalizing row heights in given multirow
                     self.body.append(r'\sphinxtablestrut{%d}' % cell.cell_id)
                 else:  # use \multicolumn for wide multirow cell
-                    self.body.append(r'\multicolumn{%d}{|l|}\sphinxtablestrut{%d}}' %
+                    self.body.append(r'\multicolumn{%d}{|l|}{\sphinxtablestrut{%d}}' %
                                      (cell.width, cell.cell_id))
 
     def depart_row(self, node: Element) -> None:
diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py
index 3f0eea5eb..95e0f5658 100644
--- a/sphinx/writers/manpage.py
+++ b/sphinx/writers/manpage.py
@@ -59,13 +59,16 @@ class NestedInlineTransform:
         for node in self.document.traverse(matcher):  # type: TextElement
             if any(matcher(subnode) for subnode in node):
                 pos = node.parent.index(node)
-                for subnode in reversed(node[1:]):
+                for subnode in reversed(list(node)):
                     node.remove(subnode)
                     if matcher(subnode):
                         node.parent.insert(pos + 1, subnode)
                     else:
                         newnode = node.__class__('', '', subnode, **node.attributes)
                         node.parent.insert(pos + 1, newnode)
+                # move node if all children became siblings of the node
+                if not len(node):
+                    node.parent.remove(node)
 
 
 class ManualPageTranslator(SphinxTranslator, BaseTranslator):