diff --git a/docs/reference/gio/content-types.md b/docs/reference/gio/content-types.md
new file mode 100644
index 000000000..5f11b151b
--- /dev/null
+++ b/docs/reference/gio/content-types.md
@@ -0,0 +1,15 @@
+Title: Content Types
+SPDX-License-Identifier: LGPL-2.1-or-later
+SPDX-FileCopyrightText: 2006, 2007 Red Hat, Inc.
+SPDX-FileCopyrightText: 2007 Alexander Larsson
+
+# Content Types
+
+A content type is a platform specific string that defines the type of a file.
+On UNIX it is a [MIME type](http://www.wikipedia.org/wiki/Internet_media_type)
+like `text/plain` or `image/png`.
+On Win32 it is an extension string like `.doc`, `.txt` or a perceived
+string like `audio`. Such strings can be looked up in the registry at
+`HKEY_CLASSES_ROOT`.
+On macOS it is a [Uniform Type Identifier](https://en.wikipedia.org/wiki/Uniform_Type_Identifier)
+such as `com.apple.application`.
diff --git a/docs/reference/gio/gio.toml.in b/docs/reference/gio/gio.toml.in
index 7010ecc22..afedaa197 100644
--- a/docs/reference/gio/gio.toml.in
+++ b/docs/reference/gio/gio.toml.in
@@ -66,6 +66,8 @@ content_files = [
   "migrating-posix.md",
 
   "io-scheduler.md",
+
+  "content-types.md",
 ]
 content_images = [
   "gvfs-overview.png",
@@ -107,4 +109,4 @@ hidden = true
 
 [[function]]
 pattern = "win32_.+"
-hidden = true
\ No newline at end of file
+hidden = true
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index d2724565c..d79adb9a1 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -66,6 +66,7 @@ if get_option('documentation') and enable_gir
     'overview.md',
     'pollable-utils.md',
     'tls-overview.md',
+    'content-types.md',
   ]
   expand_content_unix_files = [
     'unix-mounts.md',
diff --git a/gio/gapplication.c b/gio/gapplication.c
index d649e4539..38f1241b8 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -2066,10 +2066,10 @@ g_application_get_resource_base_path (GApplication *application)
  *
  * Sets (or unsets) the base resource path of @application.
  *
- * The path is used to automatically load various [application
- * resources][gresource] such as menu layouts and action descriptions.
- * The various types of resources will be found at fixed names relative
- * to the given base path.
+ * The path is used to automatically load various
+ * [application resources][struct@Gio.Resource] such as menu layouts and
+ * action descriptions. The various types of resources will be found at
+ * fixed names relative to the given base path.
  *
  * By default, the resource base path is determined from the application
  * ID by prefixing '/' and replacing each '.' with '/'.  This is done at
diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c
index dcd3301d9..78db55b3a 100644
--- a/gio/gapplicationcommandline.c
+++ b/gio/gapplicationcommandline.c
@@ -57,7 +57,7 @@
  * The `GApplicationCommandLine` object can provide the @argc and @argv
  * parameters for use with the [struct@GLib.OptionContext] command-line parsing API,
  * with the [method@Gio.ApplicationCommandLine.get_arguments] function. See
- * [gapplication-example-cmdline3.c][gapplication-example-cmdline3]
+ * [gapplication-example-cmdline3.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-cmdline3.c)
  * for an example.
  *
  * The exit status of the originally-invoked process may be set and
diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
index aa8f4040a..15660d0da 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.c
@@ -27,19 +27,6 @@
 #include "gfile.h"
 
 
-/**
- * GContentType:
- *
- * A content type is a platform specific string that defines the type
- * of a file. On UNIX it is a
- * [MIME type](http://www.wikipedia.org/wiki/Internet_media_type)
- * like `text/plain` or `image/png`.
- * On Win32 it is an extension string like `.doc`, `.txt` or a perceived
- * string like `audio`. Such strings can be looked up in the registry at
- * `HKEY_CLASSES_ROOT`.
- * On macOS it is a [Uniform Type Identifier](https://en.wikipedia.org/wiki/Uniform_Type_Identifier)
- * such as `com.apple.application`.
- **/
 
 /**
  * g_content_type_set_mime_dirs:
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 75371dca0..a3b284732 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -1368,15 +1368,15 @@ flush_in_thread_func (GTask         *task,
  * @user_data: The data to pass to @callback
  *
  * Asynchronously flushes @connection, that is, writes all queued
- * outgoing message to the transport and then flushes the transport
+ * outgoing messages to the transport and then flushes the transport
  * (using g_output_stream_flush_async()). This is useful in programs
- * that wants to emit a D-Bus signal and then exit immediately. Without
- * flushing the connection, there is no guaranteed that the message has
+ * that want to emit a D-Bus signal and then exit immediately. Without
+ * flushing the connection, there is no guarantee that the message has
  * been sent to the networking buffers in the OS kernel.
  *
  * This is an asynchronous method. When the operation is finished,
- * @callback will be invoked in the
- * [thread-default main context][g-main-context-push-thread-default]
+ * @callback will be invoked in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this method from. You can
  * then call g_dbus_connection_flush_finish() to get the result of the
  * operation. See g_dbus_connection_flush_sync() for the synchronous
@@ -1561,13 +1561,13 @@ schedule_closed_unlocked (GDBusConnection *connection,
  * %G_IO_ERROR_CLOSED.
  *
  * When @connection has been closed, the #GDBusConnection::closed
- * signal is emitted in the
- * [thread-default main context][g-main-context-push-thread-default]
+ * signal is emitted in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * of the thread that @connection was constructed in.
  *
  * This is an asynchronous method. When the operation is finished,
- * @callback will be invoked in the 
- * [thread-default main context][g-main-context-push-thread-default]
+ * @callback will be invoked in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this method from. You can
  * then call g_dbus_connection_close_finish() to get the result of the
  * operation. See g_dbus_connection_close_sync() for the synchronous
@@ -1852,7 +1852,8 @@ g_dbus_connection_send_message_unlocked (GDBusConnection   *connection,
  * %G_IO_ERROR_CLOSED. If @message is not well-formed,
  * the operation fails with %G_IO_ERROR_INVALID_ARGUMENT.
  *
- * See this [server][gdbus-server] and [client][gdbus-unix-fd-client]
+ * See this [server][class@Gio.DBusConnection#an-example-d-bus-server]
+ * and [client][class@Gio.DBusConnection#an-example-for-file-descriptor-passing]
  * for an example of how to use this low-level API to send and receive
  * UNIX file descriptors.
  *
@@ -2138,8 +2139,8 @@ g_dbus_connection_send_message_with_reply_unlocked (GDBusConnection     *connect
  * the operation fails with %G_IO_ERROR_INVALID_ARGUMENT.
  *
  * This is an asynchronous method. When the operation is finished, @callback
- * will be invoked in the 
- * [thread-default main context][g-main-context-push-thread-default]
+ * will be invoked in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this method from. You can then call
  * g_dbus_connection_send_message_with_reply_finish() to get the result of the operation.
  * See g_dbus_connection_send_message_with_reply_sync() for the synchronous version.
@@ -2147,7 +2148,8 @@ g_dbus_connection_send_message_with_reply_unlocked (GDBusConnection     *connect
  * Note that @message must be unlocked, unless @flags contain the
  * %G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL flag.
  *
- * See this [server][gdbus-server] and [client][gdbus-unix-fd-client]
+ * See this [server][class@Gio.DBusConnection#an-example-d-bus-server]
+ * and [client][class@Gio.DBusConnection#an-example-for-file-descriptor-passing]
  * for an example of how to use this low-level API to send and receive
  * UNIX file descriptors.
  *
@@ -2194,7 +2196,8 @@ g_dbus_connection_send_message_with_reply (GDBusConnection       *connection,
  * be of type %G_DBUS_MESSAGE_TYPE_ERROR. Use
  * g_dbus_message_to_gerror() to transcode this to a #GError.
  *
- * See this [server][gdbus-server] and [client][gdbus-unix-fd-client]
+ * See this [server][class@Gio.DBusConnection#an-example-d-bus-server]
+ * and [client][class@Gio.DBusConnection#an-example-for-file-descriptor-passing]
  * for an example of how to use this low-level API to send and receive
  * UNIX file descriptors.
  *
@@ -2270,7 +2273,8 @@ send_message_with_reply_sync_cb (GDBusConnection *connection,
  * be of type %G_DBUS_MESSAGE_TYPE_ERROR. Use
  * g_dbus_message_to_gerror() to transcode this to a #GError.
  *
- * See this [server][gdbus-server] and [client][gdbus-unix-fd-client]
+ * See this [server][class@Gio.DBusConnection#an-example-d-bus-server]
+ * and [client][class@Gio.DBusConnection#an-example-for-file-descriptor-passing]
  * for an example of how to use this low-level API to send and receive
  * UNIX file descriptors.
  *
@@ -3795,8 +3799,8 @@ add_signal_data (GDBusConnection *connection,
  *     subscription is removed or %NULL
  *
  * Subscribes to signals on @connection and invokes @callback whenever
- * the signal is received. Note that @callback will be invoked in the 
- * [thread-default main context][g-main-context-push-thread-default]
+ * the signal is received. Note that @callback will be invoked in the
+ * thread-default main context (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this method from.
  *
  * If @connection is not a message bus connection, @sender must be
@@ -5710,8 +5714,8 @@ obj_message_func (GDBusConnection *connection,
  * D-Bus interface that is described in @interface_info.
  *
  * Calls to functions in @vtable (and @user_data_free_func) will happen
- * in the 
- * [thread-default main context][g-main-context-push-thread-default]
+ * in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this method from.
  *
  * Note that all #GVariant values passed to functions in @vtable will match
@@ -5743,7 +5747,8 @@ obj_message_func (GDBusConnection *connection,
  * reference count is -1, see g_dbus_interface_info_ref()) for as long
  * as the object is exported. Also note that @vtable will be copied.
  *
- * See this [server][gdbus-server] for an example of how to use this method.
+ * See this [server][class@Gio.DBusConnection#an-example-d-bus-server]
+ * for an example of how to use this method.
  *
  * Returns: 0 if @error is set, otherwise a registration id (never 0)
  *     that can be used with g_dbus_connection_unregister_object()
@@ -6701,8 +6706,8 @@ g_dbus_connection_call_sync_internal (GDBusConnection         *connection,
  * ]|
  *
  * This is an asynchronous method. When the operation is finished,
- * @callback will be invoked in the
- * [thread-default main context][g-main-context-push-thread-default]
+ * @callback will be invoked in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this method from. You can then call
  * g_dbus_connection_call_finish() to get the result of the operation.
  * See g_dbus_connection_call_sync() for the synchronous version of this
@@ -7412,8 +7417,8 @@ subtree_message_func (GDBusConnection *connection,
  * #gpointer will be used to call into the interface vtable for processing
  * the request.
  *
- * All calls into user-provided code will be invoked in the
- * [thread-default main context][g-main-context-push-thread-default]
+ * All calls into user-provided code will be invoked in the thread-default
+ * main context (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this method from.
  *
  * If an existing subtree is already registered at @object_path or
@@ -7429,8 +7434,8 @@ subtree_message_func (GDBusConnection *connection,
  * Note that @vtable will be copied so you cannot change it after
  * registration.
  *
- * See this [server][gdbus-subtree-server] for an example of how to use
- * this method.
+ * See this [server][class@Gio.DBusConnection#an-example-for-exporting-a-subtree]
+ * for an example of how to use this method.
  *
  * Returns: 0 if @error is set, otherwise a subtree registration ID (never 0)
  * that can be used with g_dbus_connection_unregister_subtree()
diff --git a/gio/gdbusinterfaceskeleton.c b/gio/gdbusinterfaceskeleton.c
index 5f9be9c5c..e4b370702 100644
--- a/gio/gdbusinterfaceskeleton.c
+++ b/gio/gdbusinterfaceskeleton.c
@@ -362,7 +362,7 @@ g_dbus_interface_skeleton_get_vtable (GDBusInterfaceSkeleton *interface_)
  * Gets all D-Bus properties for @interface_.
  *
  * Returns: (transfer full): A #GVariant of type
- * ['a{sv}'][G-VARIANT-TYPE-VARDICT:CAPS].
+ * ['a{sv}'](../glib/gvariant-text-format.html#dictionaries-and-dictionary-entries).
  * Free with g_variant_unref().
  *
  * Since: 2.30
diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
index 7dcd68f20..df5daa32c 100644
--- a/gio/gdbusintrospection.c
+++ b/gio/gdbusintrospection.c
@@ -1750,7 +1750,7 @@ parser_error (GMarkupParseContext *context,
  * `<node>` element.
  *
  * Note that this routine is using a
- * [GMarkup][glib-Simple-XML-Subset-Parser.description]-based
+ * [GMarkup](../glib/markup.html)-based
  * parser that only accepts a subset of valid XML documents.
  *
  * Returns: A #GDBusNodeInfo structure or %NULL if @error is set. Free
diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c
index 63236188b..d9afc039d 100644
--- a/gio/gdbusmethodinvocation.c
+++ b/gio/gdbusmethodinvocation.c
@@ -278,7 +278,8 @@ g_dbus_method_invocation_get_connection (GDBusMethodInvocation *invocation)
  * descriptor passing, that cannot be properly expressed in the
  * #GVariant API.
  *
- * See this [server][gdbus-server] and [client][gdbus-unix-fd-client]
+ * See this [server][class@Gio.DBusConnection#an-example-d-bus-server]
+ * and [client][class@Gio.DBusConnection#an-example-for-file-descriptor-passing]
  * for an example of how to use this low-level API to send and receive
  * UNIX file descriptors.
  *
diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c
index f45200ea2..ee0953d8e 100644
--- a/gio/gdbusnameowning.c
+++ b/gio/gdbusnameowning.c
@@ -580,8 +580,8 @@ g_bus_own_name_on_connection (GDBusConnection          *connection,
  *
  * Starts acquiring @name on the bus specified by @bus_type and calls
  * @name_acquired_handler and @name_lost_handler when the name is
- * acquired respectively lost. Callbacks will be invoked in the 
- * [thread-default main context][g-main-context-push-thread-default]
+ * acquired respectively lost. Callbacks will be invoked in the thread-default
+ * main context (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this function from.
  *
  * You are guaranteed that one of the @name_acquired_handler and @name_lost_handler
@@ -624,7 +624,7 @@ g_bus_own_name_on_connection (GDBusConnection          *connection,
  * before @name is requested from the bus.
  *
  * This behavior makes it very simple to write applications that wants
- * to [own names][gdbus-owning-names] and export objects.
+ * to [own names](dbus-name-owning.html#d-bus-name-owning) and export objects.
  * Simply register objects to be exported in @bus_acquired_handler and
  * unregister the objects (if any) in @name_lost_handler.
  *
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index 3a999f292..30404ee4c 100644
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.c
@@ -573,8 +573,8 @@ connection_get_cb (GObject      *source_object,
  * Starts watching @name on the bus specified by @bus_type and calls
  * @name_appeared_handler and @name_vanished_handler when the name is
  * known to have an owner respectively known to lose its
- * owner. Callbacks will be invoked in the
- * [thread-default main context][g-main-context-push-thread-default]
+ * owner. Callbacks will be invoked in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this function from.
  *
  * You are guaranteed that one of the handlers will be invoked after
@@ -595,7 +595,7 @@ connection_get_cb (GObject      *source_object,
  * will be @name_vanished_handler. The reverse is also true.
  *
  * This behavior makes it very simple to write applications that want
- * to take action when a certain [name exists][gdbus-watching-names].
+ * to take action when a certain [name exists](dbus-name-watching.html#d-bus-name-watching).
  * Basically, the application should create object proxies in
  * @name_appeared_handler and destroy them again (if any) in
  * @name_vanished_handler.
diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
index 25c8a4010..e21a64a52 100644
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.c
@@ -518,8 +518,8 @@ g_dbus_object_manager_client_class_init (GDBusObjectManagerClientClass *klass)
    * This signal exists purely as a convenience to avoid having to
    * connect signals to all interface proxies managed by @manager.
    *
-   * This signal is emitted in the
-   * [thread-default main context][g-main-context-push-thread-default]
+   * This signal is emitted in the thread-default main context
+   * (see [method@GLib.MainContext.push_thread_default])
    * that @manager was constructed in.
    *
    * Since: 2.30
@@ -560,8 +560,8 @@ g_dbus_object_manager_client_class_init (GDBusObjectManagerClientClass *klass)
    * This signal exists purely as a convenience to avoid having to
    * connect signals to all interface proxies managed by @manager.
    *
-   * This signal is emitted in the
-   * [thread-default main context][g-main-context-push-thread-default]
+   * This signal is emitted in the thread-default main context
+   * (see [method@GLib.MainContext.push_thread_default])
    * that @manager was constructed in.
    *
    * Since: 2.30
@@ -675,10 +675,10 @@ g_dbus_object_manager_client_new_sync (GDBusConnection               *connection
  * Asynchronously creates a new #GDBusObjectManagerClient object.
  *
  * This is an asynchronous failable constructor. When the result is
- * ready, @callback will be invoked in the
- * [thread-default main context][g-main-context-push-thread-default]
- * of the thread you are calling this method from. You can
- * then call g_dbus_object_manager_client_new_finish() to get the result. See
+ * ready, @callback will be invoked in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
+ * of the thread you are calling this method from. You can then call
+ * g_dbus_object_manager_client_new_finish() to get the result. See
  * g_dbus_object_manager_client_new_sync() for the synchronous version.
  *
  * Since: 2.30
@@ -828,8 +828,8 @@ g_dbus_object_manager_client_new_for_bus_sync (GBusType                       bu
  * #GDBusConnection.
  *
  * This is an asynchronous failable constructor. When the result is
- * ready, @callback will be invoked in the
- * [thread-default main loop][g-main-context-push-thread-default]
+ * ready, @callback will be invoked in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this method from. You can
  * then call g_dbus_object_manager_client_new_for_bus_finish() to get the result. See
  * g_dbus_object_manager_client_new_for_bus_sync() for the synchronous version.
diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index 02d6fb75d..4d806cc67 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@@ -93,6 +93,8 @@
  * context (see [method@GLib.MainContext.push_thread_default]) of the thread
  * where the instance was constructed.
  *
+ *
+ * ## A watch proxy example
  * An example using a proxy for a well-known name can be found in
  * [`gdbus-example-watch-proxy.c`](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-watch-proxy.c).
  *
@@ -1958,7 +1960,7 @@ initable_iface_init (GInitableIface *initable_iface)
  *
  * See g_dbus_proxy_new_sync() and for a synchronous version of this constructor.
  *
- * #GDBusProxy is used in this [example][gdbus-wellknown-proxy].
+ * #GDBusProxy is used in this [example][class@Gio.DBusProxy#a-watch-proxy-example].
  *
  * Since: 2.26
  */
@@ -2059,7 +2061,7 @@ g_dbus_proxy_new_finish (GAsyncResult  *res,
  * This is a synchronous failable constructor. See g_dbus_proxy_new()
  * and g_dbus_proxy_new_finish() for the asynchronous version.
  *
- * #GDBusProxy is used in this [example][gdbus-wellknown-proxy].
+ * #GDBusProxy is used in this [example][class@Gio.DBusProxy#a-watch-proxy-example].
  *
  * Returns: (transfer full): A #GDBusProxy or %NULL if error is set.
  *    Free with g_object_unref().
@@ -2116,7 +2118,7 @@ g_dbus_proxy_new_sync (GDBusConnection     *connection,
  *
  * Like g_dbus_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
  *
- * #GDBusProxy is used in this [example][gdbus-wellknown-proxy].
+ * #GDBusProxy is used in this [example][class@Gio.DBusProxy#a-watch-proxy-example].
  *
  * Since: 2.26
  */
@@ -2184,7 +2186,7 @@ g_dbus_proxy_new_for_bus_finish (GAsyncResult  *res,
  *
  * Like g_dbus_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
  *
- * #GDBusProxy is used in this [example][gdbus-wellknown-proxy].
+ * #GDBusProxy is used in this [example][class@Gio.DBusProxy#a-watch-proxy-example].
  *
  * Returns: (transfer full): A #GDBusProxy or %NULL if error is set.
  *    Free with g_object_unref().
@@ -2914,8 +2916,8 @@ g_dbus_proxy_call_sync_internal (GDBusProxy      *proxy,
  * then the return value is checked against the return type.
  *
  * This is an asynchronous method. When the operation is finished,
- * @callback will be invoked in the
- * [thread-default main context][g-main-context-push-thread-default]
+ * @callback will be invoked in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * of the thread you are calling this method from.
  * You can then call g_dbus_proxy_call_finish() to get the result of
  * the operation. See g_dbus_proxy_call_sync() for the synchronous
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index 4e23e52e4..e4ef69df0 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -414,8 +414,8 @@ g_dbus_server_class_init (GDBusServerClass *klass)
    *
    * If #GDBusServer:flags contains %G_DBUS_SERVER_FLAGS_RUN_IN_THREAD
    * then the signal is emitted in a new thread dedicated to the
-   * connection. Otherwise the signal is emitted in the
-   * [thread-default main context][g-main-context-push-thread-default]
+   * connection. Otherwise the signal is emitted in the thread-default
+   * main context (see [method@GLib.MainContext.push_thread_default])
    * of the thread that @server was constructed in.
    *
    * You are guaranteed that signal handlers for this signal runs
@@ -480,7 +480,7 @@ on_run (GSocketService    *service,
  * The returned #GDBusServer isn't active - you have to start it with
  * g_dbus_server_start().
  *
- * #GDBusServer is used in this [example][gdbus-peer-to-peer].
+ * #GDBusServer is used in this [example](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-peer.c).
  *
  * This is a synchronous failable constructor. There is currently no
  * asynchronous version.
diff --git a/gio/gdebugcontroller.h b/gio/gdebugcontroller.h
index b89ce060b..6acfc39a6 100644
--- a/gio/gdebugcontroller.h
+++ b/gio/gdebugcontroller.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
  * G_DEBUG_CONTROLLER_EXTENSION_POINT_NAME:
  *
  * Extension point for debug control functionality.
- * See [Extending GIO][extending-gio].
+ * See [Extending GIO](overview.html#extending-gio).
  *
  * Since: 2.72
  */
diff --git a/gio/gdesktopappinfo.h b/gio/gdesktopappinfo.h
index 1ca7d51ba..7981a026f 100644
--- a/gio/gdesktopappinfo.h
+++ b/gio/gdesktopappinfo.h
@@ -117,7 +117,7 @@ gchar *                 g_desktop_app_info_get_action_name              (GDeskto
  * G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME:
  *
  * Extension point for default handler to URI association. See
- * [Extending GIO][extending-gio].
+ * [Extending GIO](overview.html#extending-gio).
  *
  * Deprecated: 2.28: The #GDesktopAppInfoLookup interface is deprecated and
  *    unused by GIO.
diff --git a/gio/gfile.c b/gio/gfile.c
index 4cdc51c99..a8983184d 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -9412,8 +9412,8 @@ g_file_poll_mountable_finish (GFile         *file,
  * g_file_supports_thread_contexts:
  * @file: a #GFile
  *
- * Checks if @file supports
- * [thread-default contexts][g-main-context-push-thread-default-context].
+ * Checks if @file supports thread-default main contexts
+ * (see [method@GLib.MainContext.push_thread_default])
  * If this returns %FALSE, you cannot perform asynchronous operations on
  * @file in a thread that has a thread-default context.
  *
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index 72d457d09..ecf0e3033 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -395,8 +395,8 @@ g_file_info_new (void)
  * @src_info: source to copy attributes from.
  * @dest_info: destination to copy attributes to.
  *
- * First clears all of the [GFileAttribute][gio-GFileAttribute] of @dest_info,
- * and then copies all of the file attributes from @src_info to @dest_info.
+ * First clears all of the [GFileAttribute](file-attributes.html#file-attributes) of
+ * @dest_info, and then copies all of the file attributes from @src_info to @dest_info.
  **/
 void
 g_file_info_copy_into (GFileInfo *src_info,
@@ -2066,7 +2066,7 @@ g_file_info_get_symlink_target (GFileInfo *info)
  * g_file_info_get_etag:
  * @info: a #GFileInfo.
  *
- * Gets the [entity tag](iface.File.html#entity-tags) for a given
+ * Gets the [entity tag][iface@Gio.File#entity-tags] for a given
  * #GFileInfo. See %G_FILE_ATTRIBUTE_ETAG_VALUE.
  *
  * It is an error to call this if the #GFileInfo does not contain
@@ -2319,7 +2319,7 @@ g_file_info_set_symbolic_icon (GFileInfo *info,
 /**
  * g_file_info_set_content_type:
  * @info: a #GFileInfo.
- * @content_type: a content type. See [GContentType][gio-GContentType]
+ * @content_type: a [content type](content-types.html#content-types).
  *
  * Sets the content type attribute for a given #GFileInfo.
  * See %G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE.
diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c
index 6e26c8d5c..bcfa3636f 100644
--- a/gio/gfilemonitor.c
+++ b/gio/gfilemonitor.c
@@ -280,8 +280,8 @@ g_file_monitor_set_rate_limit (GFileMonitor *monitor,
  * implementations only.
  *
  * Implementations are responsible to call this method from the
- * [thread-default main context][g-main-context-push-thread-default] of the
- * thread that the monitor was created in.
+ * thread-default main context (see [method@GLib.MainContext.push_thread_default])
+ * of the thread that the monitor was created in.
  **/
 void
 g_file_monitor_emit_event (GFileMonitor      *monitor,
diff --git a/gio/ginitable.c b/gio/ginitable.c
index 6dd09a904..bbe20cee5 100644
--- a/gio/ginitable.c
+++ b/gio/ginitable.c
@@ -89,7 +89,7 @@ g_initable_default_init (GInitableInterface *iface)
  * If the object is not initialized, or initialization returns with an
  * error, then all operations on the object except g_object_ref() and
  * g_object_unref() are considered to be invalid, and have undefined
- * behaviour. See the [introduction][ginitable] for more details.
+ * behaviour. See the [description][iface@Gio.Initable#description] for more details.
  *
  * Callers should not assume that a class which implements #GInitable can be
  * initialized multiple times, unless the class explicitly documents itself as
diff --git a/gio/giotypes.h b/gio/giotypes.h
index 98143ba93..e6e67c5c2 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -177,8 +177,8 @@ typedef struct _GVolumeMonitor                GVolumeMonitor;
  * Type definition for a function that will be called back when an asynchronous
  * operation within GIO has been completed. #GAsyncReadyCallback
  * callbacks from #GTask are guaranteed to be invoked in a later
- * iteration of the
- * [thread-default main context][g-main-context-push-thread-default]
+ * iteration of the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * where the #GTask was created. All other users of
  * #GAsyncReadyCallback must likewise call it asynchronously in a
  * later iteration of the main context.
@@ -532,8 +532,8 @@ typedef struct _GDBusObjectManagerServer    GDBusObjectManagerServer;
  * use for an interface proxy (if @interface_name is not %NULL) or
  * object proxy (if @interface_name is %NULL).
  *
- * This function is called in the
- * [thread-default main loop][g-main-context-push-thread-default]
+ * This function is called in the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * that @manager was constructed in.
  *
  * Returns: A #GType to use for the remote object. The returned type
diff --git a/gio/gmemorymonitor.h b/gio/gmemorymonitor.h
index 83c28b919..2a4052671 100644
--- a/gio/gmemorymonitor.h
+++ b/gio/gmemorymonitor.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
  * G_MEMORY_MONITOR_EXTENSION_POINT_NAME:
  *
  * Extension point for memory usage monitoring functionality.
- * See [Extending GIO][extending-gio].
+ * See [Extending GIO](overview.html#extending-gio).
  *
  * Since: 2.64
  */
diff --git a/gio/gnetworkmonitor.h b/gio/gnetworkmonitor.h
index 8e6e90386..387c04529 100644
--- a/gio/gnetworkmonitor.h
+++ b/gio/gnetworkmonitor.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
  * G_NETWORK_MONITOR_EXTENSION_POINT_NAME:
  *
  * Extension point for network status monitoring functionality.
- * See [Extending GIO][extending-gio].
+ * See [Extending GIO](overview.html#extending-gio).
  *
  * Since: 2.30
  */
diff --git a/gio/gpowerprofilemonitor.h b/gio/gpowerprofilemonitor.h
index e2c6aa75f..049f2c5db 100644
--- a/gio/gpowerprofilemonitor.h
+++ b/gio/gpowerprofilemonitor.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
  * G_POWER_PROFILE_MONITOR_EXTENSION_POINT_NAME:
  *
  * Extension point for power profile usage monitoring functionality.
- * See [Extending GIO][extending-gio].
+ * See [Extending GIO](overview.html#extending-gio).
  *
  * Since: 2.70
  */
diff --git a/gio/gproxy.h b/gio/gproxy.h
index 9fcf7cc01..6acecbccf 100644
--- a/gio/gproxy.h
+++ b/gio/gproxy.h
@@ -42,7 +42,7 @@ G_BEGIN_DECLS
  * G_PROXY_EXTENSION_POINT_NAME:
  *
  * Extension point for proxy functionality.
- * See [Extending GIO][extending-gio].
+ * See [Extending GIO](overview.html#extending-gio).
  *
  * Since: 2.26
  */
diff --git a/gio/gproxyresolver.h b/gio/gproxyresolver.h
index d564c990b..9e7644204 100644
--- a/gio/gproxyresolver.h
+++ b/gio/gproxyresolver.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
  * G_PROXY_RESOLVER_EXTENSION_POINT_NAME:
  *
  * Extension point for proxy resolving functionality.
- * See [Extending GIO][extending-gio].
+ * See [Extending GIO](overview.html#extending-gio).
  */
 #define G_PROXY_RESOLVER_EXTENSION_POINT_NAME "gio-proxy-resolver"
 
diff --git a/gio/gsimpleasyncresult.c b/gio/gsimpleasyncresult.c
index ef5492f8e..f1608159e 100644
--- a/gio/gsimpleasyncresult.c
+++ b/gio/gsimpleasyncresult.c
@@ -821,7 +821,7 @@ complete_in_idle_cb (gpointer data)
  * @simple: a #GSimpleAsyncResult.
  *
  * Completes an asynchronous function in an idle handler in the
- * [thread-default main context][g-main-context-push-thread-default]
+ * thread-default main context (see [method@GLib.MainContext.push_thread_default])
  * of the thread that @simple was initially created in
  * (and re-pushes that context around the invocation of the callback).
  *
diff --git a/gio/gtask.c b/gio/gtask.c
index d202e397b..ef539cd54 100644
--- a/gio/gtask.c
+++ b/gio/gtask.c
@@ -303,9 +303,9 @@
  *
  * You can use [method@Gio.Task.run_in_thread] to turn a synchronous
  * operation into an asynchronous one, by running it in a thread.
- * When it completes, the result will be dispatched to the thread-default main
- * context (see [method@GLib.MainContext.push_thread_default]) where the `GTask`
- * was created.
+ * When it completes, the result will be dispatched to the thread-default
+ * main context (see [method@GLib.MainContext.push_thread_default])
+ * where the `GTask` was created.
  *
  * Running a task in a thread:
  * ```c
@@ -796,8 +796,8 @@ g_task_finalize (GObject *object)
  * @callback_data: user data passed to @callback.
  *
  * Creates a #GTask acting on @source_object, which will eventually be
- * used to invoke @callback in the current
- * [thread-default main context][g-main-context-push-thread-default].
+ * used to invoke @callback in the current thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default]).
  *
  * Call this in the "start" method of your asynchronous method, and
  * pass the #GTask around throughout the asynchronous operation. You
@@ -1242,8 +1242,8 @@ g_task_get_priority (GTask *task)
  * @task: a #GTask
  *
  * Gets the #GMainContext that @task will return its result in (that
- * is, the context that was the
- * [thread-default main context][g-main-context-push-thread-default]
+ * is, the context that was the thread-default main context
+ * (see [method@GLib.MainContext.push_thread_default])
  * at the point when @task was created).
  *
  * This will always return a non-%NULL value, even if the task's
diff --git a/gio/gtlsbackend.h b/gio/gtlsbackend.h
index dc51b230a..2ad24f6fc 100644
--- a/gio/gtlsbackend.h
+++ b/gio/gtlsbackend.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
  * G_TLS_BACKEND_EXTENSION_POINT_NAME:
  *
  * Extension point for TLS functionality via #GTlsBackend.
- * See [Extending GIO][extending-gio].
+ * See [Extending GIO](overview.html#extending-gio).
  */
 #define G_TLS_BACKEND_EXTENSION_POINT_NAME "gio-tls-backend"
 
diff --git a/gio/gvfs.h b/gio/gvfs.h
index 5fe3c76f7..18909c6b2 100644
--- a/gio/gvfs.h
+++ b/gio/gvfs.h
@@ -64,7 +64,7 @@ typedef GFile * (* GVfsFileLookupFunc) (GVfs       *vfs,
  * G_VFS_EXTENSION_POINT_NAME:
  *
  * Extension point for #GVfs functionality.
- * See [Extending GIO][extending-gio].
+ * See [Extending GIO](overview.html#extending-gio).
  */
 #define G_VFS_EXTENSION_POINT_NAME "gio-vfs"
 
diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h
index 7ef917a7b..4edb6ce11 100644
--- a/gio/gvolumemonitor.h
+++ b/gio/gvolumemonitor.h
@@ -45,7 +45,7 @@ G_BEGIN_DECLS
  * G_VOLUME_MONITOR_EXTENSION_POINT_NAME:
  *
  * Extension point for volume monitor functionality.
- * See [Extending GIO][extending-gio].
+ * See [Extending GIO](overview.html#extending-gio).
  */
 #define G_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-volume-monitor"
 
diff --git a/glib/gcharset.c b/glib/gcharset.c
index 040b499d9..b0a4b9cc0 100644
--- a/glib/gcharset.c
+++ b/glib/gcharset.c
@@ -175,8 +175,8 @@ charset_cache_free (gpointer data)
  * @charset: (out) (optional) (transfer none): return location for character set
  *   name, or %NULL.
  *
- * Obtains the character set for the [current locale][setlocale]; you
- * might use this character set as an argument to g_convert(), to convert
+ * Obtains the character set for the [current locale](running.html#locale);
+ * you might use this character set as an argument to g_convert(), to convert
  * from the current locale's encoding to some other encoding. (Frequently
  * g_locale_to_utf8() and g_locale_from_utf8() are nice shortcuts, though.)
  *
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 6fa5a0ff0..55cc3d5bd 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -895,7 +895,7 @@ convert_checked (const gchar      *string,
  * 
  * Converts a string which is in the encoding used for strings by
  * the C runtime (usually the same as that used by the operating
- * system) in the [current locale][setlocale] into a UTF-8 string.
+ * system) in the [current locale](running.html#locale) into a UTF-8 string.
  *
  * If the source encoding is not UTF-8 and the conversion output contains a
  * nul character, the error %G_CONVERT_ERROR_EMBEDDED_NUL is set and the
@@ -990,8 +990,8 @@ _g_ctype_locale_to_utf8 (const gchar *opsysstring,
  * 
  * Converts a string from UTF-8 to the encoding used for strings by
  * the C runtime (usually the same as that used by the operating
- * system) in the [current locale][setlocale]. On Windows this means
- * the system codepage.
+ * system) in the [current locale](running.html#locale).
+ * On Windows this means the system codepage.
  *
  * The input string shall not contain nul characters even if the @len
  * argument is positive. A nul character found inside the string will result
@@ -1054,8 +1054,8 @@ filename_charset_cache_free (gpointer data)
  * and said environment variables have no effect.
  *
  * `G_FILENAME_ENCODING` may be set to a comma-separated list of
- * character set names. The special token "\@locale" is taken
- * to  mean the character set for the [current locale][setlocale].
+ * character set names. The special token `@locale` is taken to mean the
+ * character set for the [current locale](running.html#locale).
  * If `G_FILENAME_ENCODING` is not set, but `G_BROKEN_FILENAMES` is,
  * the character set of the current locale is taken as the filename
  * encoding. If neither environment variable  is set, UTF-8 is taken
@@ -1200,7 +1200,7 @@ get_filename_charset (const gchar **filename_charset)
  * Converts a string which is in the encoding used by GLib for
  * filenames into a UTF-8 string. Note that on Windows GLib uses UTF-8
  * for filenames; on other platforms, this function indirectly depends on 
- * the [current locale][setlocale].
+ * the [current locale](running.html#locale).
  *
  * The input string shall not contain nul characters even if the @len
  * argument is positive. A nul character found inside the string will result
@@ -1253,7 +1253,7 @@ g_filename_to_utf8 (const gchar *opsysstring,
  * Converts a string from UTF-8 to the encoding GLib uses for
  * filenames. Note that on Windows GLib uses UTF-8 for filenames;
  * on other platforms, this function indirectly depends on the 
- * [current locale][setlocale].
+ * [current locale](running.html#locale).
  *
  * The input string shall not contain nul characters even if the @len
  * argument is positive. A nul character found inside the string will result
diff --git a/glib/gdate.c b/glib/gdate.c
index c7c929ac3..ffc21f1b9 100644
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -1228,10 +1228,10 @@ convert_twodigit_year (guint y)
  * @str: string to parse
  *
  * Parses a user-inputted string @str, and try to figure out what date it
- * represents, taking the [current locale][setlocale] into account. If the
- * string is successfully parsed, the date will be valid after the call.
- * Otherwise, it will be invalid. You should check using g_date_valid()
- * to see whether the parsing succeeded.
+ * represents, taking the [current locale](running.html#locale)
+ * into account. If the string is successfully parsed, the date will be
+ * valid after the call. Otherwise, it will be invalid. You should check
+ * using g_date_valid() to see whether the parsing succeeded.
  *
  * This function is not appropriate for file formats and the like; it
  * isn't very precise, and its exact behavior varies with the locale.
@@ -2630,7 +2630,7 @@ win32_strftime_helper (const GDate     *d,
  * @date: valid #GDate
  *
  * Generates a printed representation of the date, in a
- * [locale][setlocale]-specific way.
+ * [locale](running.html#locale)-specific way.
  * Works just like the platform's C library strftime() function,
  * but only accepts date-related formats; time-related formats
  * give undefined results. Date must be valid. Unlike strftime()
diff --git a/glib/gerror.h b/glib/gerror.h
index 1aebfbeb9..2d5527cc1 100644
--- a/glib/gerror.h
+++ b/glib/gerror.h
@@ -67,7 +67,7 @@ struct _GError
  * respectively, but they should receive the private data type instead
  * of #GError.
  *
- * See [Extended #GError Domains][gerror-extended-domains] for an example.
+ * See [Extended #GError Domains](error-reporting.html#extended-gerror-domains) for an example.
  *
  * Since: 2.68
  */
diff --git a/glib/ghash.c b/glib/ghash.c
index 29d05038c..d8e81b22a 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -67,7 +67,7 @@
  * GHashTable:
  *
  * The #GHashTable struct is an opaque data structure to represent a
- * [Hash Table][glib-Hash-Tables]. It should only be accessed via the
+ * [Hash Table](data-structures.html#hash-tables). It should only be accessed via the
  * following functions.
  */
 
diff --git a/glib/glist.c b/glib/glist.c
index d56ff7ceb..9bc7b4c9a 100644
--- a/glib/glist.c
+++ b/glib/glist.c
@@ -39,8 +39,8 @@
 /**
  * GList:
  * @data: holds the element's data, which can be a pointer to any kind
- *        of data, or any integer value using the 
- *        [Type Conversion Macros][glib-Type-Conversion-Macros]
+ *        of data, or any integer value using the
+ *        [Type Conversion Macros](conversion-macros.html#conversion-macros)
  * @next: contains the link to the next element in the list
  * @prev: contains the link to the previous element in the list
  *
diff --git a/glib/gmain.c b/glib/gmain.c
index 775b55c0a..73b4ed93b 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -742,7 +742,7 @@ static GPrivate thread_context_stack = G_PRIVATE_INIT (free_context_stack);
  *
  * Acquires @context and sets it as the thread-default context for the
  * current thread. This will cause certain asynchronous operations
- * (such as most [gio][gio]-based I/O) which are
+ * (such as most [Gio](../gio/index.html)-based I/O) which are
  * started in this thread to run under @context and deliver their
  * results to its main loop, rather than running under the global
  * default main context in the main thread. Note that calling this function
diff --git a/glib/gnode.c b/glib/gnode.c
index e8025bd68..8026b876a 100644
--- a/glib/gnode.c
+++ b/glib/gnode.c
@@ -51,7 +51,7 @@
  *            children are accessed by using the @next pointer of each
  *            child.
  *
- * The #GNode struct represents one node in a [n-ary tree][glib-N-ary-Trees].
+ * The #GNode struct represents one node in a [n-ary tree](data-structures.html#n-ary-trees).
  **/
 
 #define g_node_alloc0()         g_slice_new0 (GNode)
@@ -786,16 +786,16 @@ g_node_depth_traverse_level (GNode             *node,
 
 /**
  * GTraverseType:
- * @G_IN_ORDER: vists a node's left child first, then the node itself,
+ * @G_IN_ORDER: visits a node's left child first, then the node itself,
  *              then its right child. This is the one to use if you
  *              want the output sorted according to the compare
  *              function.
  * @G_PRE_ORDER: visits a node, then its children.
  * @G_POST_ORDER: visits the node's children, then the node itself.
  * @G_LEVEL_ORDER: is not implemented for
- *              [balanced binary trees][glib-Balanced-Binary-Trees].
- *              For [n-ary trees][glib-N-ary-Trees], it
- *              vists the root node first, then its children, then
+ *              [balanced binary trees](data-structures.html#binary-trees).
+ *              For [n-ary trees](data-structures.html#n-ary-trees), it
+ *              visits the root node first, then its children, then
  *              its grandchildren, and so on. Note that this is less
  *              efficient than the other orders.
  *
diff --git a/glib/goption.c b/glib/goption.c
index 1447ad3cb..bb2de6f77 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -1795,9 +1795,9 @@ platform_get_argv0 (void)
  * this function will produce help output to stdout and
  * call `exit (0)`.
  *
- * Note that function depends on the [current locale][setlocale] for
- * automatic character set conversion of string and filename
- * arguments.
+ * Note that function depends on the
+ * [current locale](running.html#locale) for automatic
+ * character set conversion of string and filename arguments.
  *
  * Returns: %TRUE if the parsing was successful,
  *               %FALSE if an error occurred
diff --git a/glib/gqueue.h b/glib/gqueue.h
index c3a28c843..5b0113b54 100644
--- a/glib/gqueue.h
+++ b/glib/gqueue.h
@@ -44,7 +44,7 @@ typedef struct _GQueue GQueue;
  * @length: the number of elements in the queue
  *
  * Contains the public fields of a
- * [Queue][glib-Double-ended-Queues].
+ * [Queue](data-structures.html#double-ended-queues).
  */
 struct _GQueue
 {
diff --git a/glib/gsequence.c b/glib/gsequence.c
index 46a87febd..eb1c702e2 100644
--- a/glib/gsequence.c
+++ b/glib/gsequence.c
@@ -53,7 +53,7 @@ typedef struct _GSequenceNode GSequenceNode;
  * GSequence:
  *
  * The #GSequence struct is an opaque data type representing a
- * [sequence][glib-Sequences] data type.
+ * [sequence](data-structures.html#scalable-lists) data type.
  */
 struct _GSequence
 {
diff --git a/glib/gslice.c b/glib/gslice.c
index 83b6708a0..9fa7d92ad 100644
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -137,7 +137,7 @@ g_slice_get_config_state (GSliceConfig ckey,
  * It calls g_slice_free1() using `sizeof (type)`
  * as the block size.
  * Note that the exact release behaviour can be changed with the
- * [`G_DEBUG=gc-friendly`][G_DEBUG] environment variable.
+ * [`G_DEBUG=gc-friendly`](running.html#environment-variables) environment variable.
  *
  * If @mem is %NULL, this macro does nothing.
  *
@@ -159,7 +159,7 @@ g_slice_get_config_state (GSliceConfig ckey,
  * a @next pointer (similar to #GSList). The name of the
  * @next field in @type is passed as third argument.
  * Note that the exact release behaviour can be changed with the
- * [`G_DEBUG=gc-friendly`][G_DEBUG] environment variable.
+ * [`G_DEBUG=gc-friendly`](running.html#environment-variables) environment variable.
  *
  * If @mem_chain is %NULL, this function does nothing.
  *
@@ -258,7 +258,7 @@ g_slice_copy (gsize         mem_size,
  * The memory must have been allocated via g_slice_alloc() or
  * g_slice_alloc0() and the @block_size has to match the size
  * specified upon allocation. Note that the exact release behaviour
- * can be changed with the [`G_DEBUG=gc-friendly`][G_DEBUG] environment
+ * can be changed with the [`G_DEBUG=gc-friendly`](running.html#environment-variables) environment
  * variable.
  *
  * If @mem_block is %NULL, this function does nothing.
@@ -291,7 +291,7 @@ g_slice_free1 (gsize    mem_size,
  * @next pointer (similar to #GSList). The offset of the @next
  * field in each block is passed as third argument.
  * Note that the exact release behaviour can be changed with the
- * [`G_DEBUG=gc-friendly`][G_DEBUG] environment variable.
+ * [`G_DEBUG=gc-friendly`](running.html#environment-variables) environment variable.
  *
  * If @mem_chain is %NULL, this function does nothing.
  *
diff --git a/glib/gslist.c b/glib/gslist.c
index 68c0e4074..56222255e 100644
--- a/glib/gslist.c
+++ b/glib/gslist.c
@@ -39,7 +39,7 @@
  * GSList:
  * @data: holds the element's data, which can be a pointer to any kind
  *        of data, or any integer value using the
- *        [Type Conversion Macros][glib-Type-Conversion-Macros]
+ *        [Type Conversion Macros](conversion-macros.html#conversion-macros)
  * @next: contains the link to the next element in the list.
  *
  * The #GSList struct is used for each element in the singly-linked
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 47bb9c66a..6867640f8 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -241,7 +241,7 @@
 
 /**
  * g_test_trap_assert_stdout:
- * @soutpattern: a glob-style [pattern][glib-Glob-style-pattern-matching]
+ * @soutpattern: a string that follows glob-style [pattern][struct@PatternSpec] rules
  *
  * Assert that the stdout output of the last test subprocess matches
  * @soutpattern.
@@ -253,7 +253,7 @@
 
 /**
  * g_test_trap_assert_stdout_unmatched:
- * @soutpattern: a glob-style [pattern][glib-Glob-style-pattern-matching]
+ * @soutpattern: a string that follows glob-style [pattern][struct@PatternSpec] rules
  *
  * Assert that the stdout output of the last test subprocess
  * does not match @soutpattern.
@@ -265,7 +265,7 @@
 
 /**
  * g_test_trap_assert_stderr:
- * @serrpattern: a glob-style [pattern][glib-Glob-style-pattern-matching]
+ * @serrpattern: a string that follows glob-style [pattern][struct@PatternSpec] rules
  *
  * Assert that the stderr output of the last test subprocess
  * matches @serrpattern.
@@ -284,7 +284,7 @@
 
 /**
  * g_test_trap_assert_stderr_unmatched:
- * @serrpattern: a glob-style [pattern][glib-Glob-style-pattern-matching]
+ * @serrpattern: a string that follows glob-style [pattern][struct@PatternSpec] rules
  *
  * Assert that the stderr output of the last test subprocess
  * does not match @serrpattern.
diff --git a/glib/gtree.c b/glib/gtree.c
index b8d387737..087094bc2 100644
--- a/glib/gtree.c
+++ b/glib/gtree.c
@@ -44,7 +44,7 @@ G_STATIC_ASSERT ((G_GUINT64_CONSTANT (1) << (MAX_GTREE_HEIGHT - 2)) >= G_MAXUINT
  * GTree:
  *
  * The GTree struct is an opaque data structure representing a
- * [balanced binary tree][glib-Balanced-Binary-Trees]. It should be
+ * [balanced binary tree](data-structures.html#binary-trees). It should be
  * accessed only by using the following functions.
  */
 struct _GTree
@@ -1197,7 +1197,7 @@ g_tree_foreach_node (GTree             *tree,
  * Deprecated:2.2: The order of a balanced tree is somewhat arbitrary.
  *     If you just want to visit all nodes in sorted order, use
  *     g_tree_foreach() instead. If you really need to visit nodes in
- *     a different order, consider using an [n-ary tree][glib-N-ary-Trees].
+ *     a different order, consider using an [n-ary tree](data-structures.html#n-ary-trees).
  */
 /**
  * GTraverseFunc:
diff --git a/glib/gunicollate.c b/glib/gunicollate.c
index 3ec254d65..d594677c2 100644
--- a/glib/gunicollate.c
+++ b/glib/gunicollate.c
@@ -67,7 +67,7 @@ msc_strxfrm_wrapper (char       *string1,
  * @str2: a UTF-8 encoded string
  * 
  * Compares two strings for ordering using the linguistically
- * correct rules for the [current locale][setlocale].
+ * correct rules for the [current locale](running.html#locale).
  * When sorting a large number of strings, it will be significantly 
  * faster to obtain collation keys with g_utf8_collate_key() and 
  * compare the keys with strcmp() when sorting instead of sorting 
@@ -373,7 +373,7 @@ carbon_collate_key_for_filename (const gchar *str,
  * with strcmp() will always be the same as comparing the two 
  * original keys with g_utf8_collate().
  *
- * Note that this function depends on the [current locale][setlocale].
+ * Note that this function depends on the [current locale](running.html#locale).
  *
  * Note that the returned string is not guaranteed to be in any
  * encoding, especially UTF-8. The returned value is meant to be
@@ -507,7 +507,7 @@ g_utf8_collate_key (const gchar *str,
  * would like to treat numbers intelligently so that "file1" "file10" "file5"
  * is sorted as "file1" "file5" "file10".
  * 
- * Note that this function depends on the [current locale][setlocale].
+ * Note that this function depends on the [current locale](running.html#locale).
  *
  * Note that the returned string is not guaranteed to be in any
  * encoding, especially UTF-8. The returned value is meant to be
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index 1e6c634d9..f0ba81b2e 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -57,7 +57,7 @@
  * GModule:
  *
  * The #GModule struct is an opaque data structure to represent a
- * [dynamically-loaded module][glib-Dynamic-Loading-of-Modules].
+ * [dynamically-loaded module](modules.html#dynamic-loading-of-modules).
  * It should only be accessed via the following functions.
  */