+@@ -10258,7 +10257,7 @@
+ Special Characters} data category can be used.
+
+ To merge the translations, the @samp{msgfmt} program can be used with
+-the option @code{--xml}. @xref{msgfmt Invocation}, for more details
++the option @code{--xml}. @xref{msgfmt}, for more details
+ about how one calls the @samp{msgfmt} program. @samp{msgfmt}'s
+ @code{--xml} option doesn't perform character escaping, so translated
+ strings can have arbitrary XML constructs, such as elements for markup.
+@@ -10482,7 +10481,7 @@
+ @subsection XML files
+
+ See the section @ref{Preparing ITS Rules} and
+-@ref{msgfmt Invocation}, subsection ``XML mode operations''.
++@ref{msgfmt}, subsection ``XML mode operations''.
+
+ @node Conclusion
+ @chapter Concluding Remarks
+--- gettext-0.12.1/gettext-tools/doc/gettextize.texi.orig 2003-05-05 11:09:21.000000000 +0200
++++ gettext-0.12.1/gettext-tools/doc/gettextize.texi 2003-06-07 20:10:53.000000000 +0200
+@@ -177,4 +177,4 @@
+ of the GNU build system, in the sense that it should not be invoked
+ automatically, and not be invoked by someone who doesn't assume the
+ responsibilities of a package maintainer. For the latter purpose, a
+-separate tool is provided, see @ref{autopoint Invocation}.
++separate tool is provided, see @ref{autopoint}.
+--- gettext-0.21/gettext-tools/doc/lang-sh.texi.orig 2020-06-06 16:03:32.000000000 +0200
++++ gettext-0.21/gettext-tools/doc/lang-sh.texi 2020-10-11 19:27:53.682303742 +0200
+@@ -65,12 +65,12 @@