Index: gnome/platform/gcr.xml
===================================================================
--- gnome/platform/gcr.xml	(revision f85f92983b31cce2e60eb6443491d675e18f8d4d)
+++ gnome/platform/gcr.xml	(revision f56d2e7eeb341097d07082da23820c84e30c9a3d)
@@ -90,7 +90,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <!--<xref linkend="gtk-doc"/> and-->
-      <xref linkend="valgrind"/> and
-      <ulink url="&gi-docgen-url;">gi-docgen</ulink>
+      <xref linkend="gi-docgen"/> and
+      <xref linkend="valgrind"/>
     </para>
 
Index: gnome/platform/gcr4.xml
===================================================================
--- gnome/platform/gcr4.xml	(revision f85f92983b31cce2e60eb6443491d675e18f8d4d)
+++ gnome/platform/gcr4.xml	(revision f56d2e7eeb341097d07082da23820c84e30c9a3d)
@@ -90,6 +90,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="valgrind"/> and
-      <ulink url="&gi-docgen-url;">gi-docgen</ulink>
+      <xref linkend="gi-docgen"/> and
+      <xref linkend="valgrind"/>
     </para>
 
Index: gnome/platform/libgweather.xml
===================================================================
--- gnome/platform/libgweather.xml	(revision f85f92983b31cce2e60eb6443491d675e18f8d4d)
+++ gnome/platform/libgweather.xml	(revision f56d2e7eeb341097d07082da23820c84e30c9a3d)
@@ -89,14 +89,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="llvm"/> (for clang-format),
-      <ulink url="&gi-docgen-url;">gi-docgen</ulink>,
-      <ulink url="https://pypi.org/project/pylint/">pylint</ulink>, and
-      for the bundled gi-docgen module:
-      <phrase revision="sysv"><xref linkend="Jinja2"/>,
-      <xref linkend="MarkupSafe"/>,</phrase>
-      <xref linkend="pygments"/>,
-      <ulink url="https://pypi.org/project/Markdown/">Markdown</ulink>,
-      <ulink url="https://pypi.org/project/toml/">toml</ulink>, and
-      <ulink url="https://pypi.org/project/typogrify/">typogrify</ulink>
+      <xref linkend="gi-docgen"/> (gi-docgen is also provided as a meson
+      subproject, which will be used if <option>-Dgtk_doc=false</option>
+      is not passed to <command>meson</command>),
+      <xref linkend="llvm"/> (for clang-format), and
+      <ulink url="https://pypi.org/project/pylint/">pylint</ulink>
     </para>
 
@@ -147,6 +142,6 @@
       <parameter>-Dgtk_doc=false</parameter>: allows building without using
       the bundled <application>gi-docgen</application> module. Remove this
-      switch if you have the needed dependencies, and you wish to rebuild
-      and install the API documentation.
+      switch if you have installed <xref linkend="gi-docgen"/>, and wish to
+      build and install the API documentation.
     </para>
 
Index: gnome/platform/libpeas.xml
===================================================================
--- gnome/platform/libpeas.xml	(revision f85f92983b31cce2e60eb6443491d675e18f8d4d)
+++ gnome/platform/libpeas.xml	(revision f56d2e7eeb341097d07082da23820c84e30c9a3d)
@@ -84,5 +84,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="&gi-docgen-url;">gi-docgen</ulink>,
+      <xref linkend="gi-docgen"/>,
       <ulink url="http://glade.gnome.org/">Glade</ulink>,
       <ulink url="https://pypi.org/project/embed">embed</ulink>,
@@ -149,5 +149,5 @@
       <option>-Dgtk_doc=true</option>: Add this switch if you wish to
       build the reference manual and you have
-      <ulink url="&gi-docgen-url;">gi-docgen</ulink> installed on your system.
+      <xref linkend="gi-docgen"/> installed on your system.
     </para>
 
Index: gnome/platform/libshumate.xml
===================================================================
--- gnome/platform/libshumate.xml	(revision f85f92983b31cce2e60eb6443491d675e18f8d4d)
+++ gnome/platform/libshumate.xml	(revision f56d2e7eeb341097d07082da23820c84e30c9a3d)
@@ -76,6 +76,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="&gi-docgen-url;">gi-docgen</ulink>
+      <xref linkend="gi-docgen"/> and
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -118,7 +118,7 @@
     <para>
       <parameter>-Dgtk_doc=false</parameter>: This switch disables documentation
-      generation because it requires 
-      <ulink url="&gi-docgen-url;">gi-docgen</ulink>. Remove this if you have
-      gi-docgen installed and wish to generate the API documentation.
+      generation. Remove this if you have both <xref linkend="gtk-doc"/> and
+      <xref linkend="gi-docgen"/> installed and wish to generate the API
+      documentation.
     </para>
   </sect2>
Index: gnome/platform/nautilus.xml
===================================================================
--- gnome/platform/nautilus.xml	(revision f85f92983b31cce2e60eb6443491d675e18f8d4d)
+++ gnome/platform/nautilus.xml	(revision f56d2e7eeb341097d07082da23820c84e30c9a3d)
@@ -96,5 +96,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="&gi-docgen-url;">gi-docgen</ulink>
+      <xref linkend="gi-docgen"/>
     </para>
 
Index: gnome/platform/rest.xml
===================================================================
--- gnome/platform/rest.xml	(revision f85f92983b31cce2e60eb6443491d675e18f8d4d)
+++ gnome/platform/rest.xml	(revision f56d2e7eeb341097d07082da23820c84e30c9a3d)
@@ -85,7 +85,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libadwaita1"/> (to build the demo),
-      <xref linkend="vala"/>, and
-      <ulink url="&gi-docgen-url;">gi-docgen</ulink>
+      <xref linkend="gi-docgen"/>,
+      <xref linkend="libadwaita1"/> (to build the demo), and
+      <xref linkend="vala"/>
     </para>
 
@@ -132,5 +132,5 @@
     <para>
       <parameter>-Dgtk_doc=false</parameter>: Remove this option if
-      <ulink url="&gi-docgen-url;">gi-docgen</ulink>
+      <xref linkend="gi-docgen"/>
       is installed and you wish to build and install the API documentation.
     </para>
