diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index c66cc1c97..a4b71c8e5 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@@ -77,8 +77,7 @@
  * subclass #GDBusProxy, and have more natural properties and signals
  * in your derived class. See <xref linkend="gdbus-example-gdbus-codegen"/>
  * for how this can easily be done using the
- * <command><link linkend="gdbus-codegen">gdbus-codegen</link></command>
- * tool.
+ * <link linkend="gdbus-codegen">gdbus-codegen</link> tool.
  *
  * A #GDBusProxy instance can be used from multiple threads but note
  * that all signals (e.g. #GDBusProxy::g-signal, #GDBusProxy::g-properties-changed
diff --git a/gio/gresource.c b/gio/gresource.c
index 3af03485e..009da847d 100644
--- a/gio/gresource.c
+++ b/gio/gresource.c
@@ -66,12 +66,12 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref)
  * <literal>preprocess</literal> attribute to a comma-separated list of preprocessing options.
  * The only options currently supported are:
  *
- * <literal>xml-stripblanks</literal> which will use <command>xmllint</command> to strip
+ * <literal>xml-stripblanks</literal> which will use the xmllint command to strip
  * ignorable whitespace from the xml file. For this to work, the <envar>XMLLINT</envar>
  * environment variable must be set to the full path to the xmllint executable, or xmllint
  * must be in the PATH; otherwise the preprocessing step is skipped.
  *
- * <literal>to-pixdata</literal> which will use <command>gdk-pixbuf-pixdata</command> to convert
+ * <literal>to-pixdata</literal> which will use the gdk-pixbuf-pixdata command to convert
  * images to the GdkPixdata format, which allows you to create pixbufs directly using the data inside
  * the resource file, rather than an (uncompressed) copy if it. For this, the gdk-pixbuf-pixdata
  * program must be in the PATH, or the <envar>GDK_PIXBUF_PIXDATA</envar> environment variable must be
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index 067e67865..ba1420360 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
@@ -251,8 +251,8 @@ g_settings_schema_source_unref (GSettingsSchemaSource *source)
  * may be useful to authors of plugin management systems.
  *
  * The directory should contain a file called
- * <filename>gschemas.compiled</filename> as produced by
- * <command>glib-compile-schemas</command>.
+ * <filename>gschemas.compiled</filename> as produced by the
+ * <link linkend="glib-compile-schemas">glib-compile-schemas</link> tool.
  *
  * If @trusted is %TRUE then <filename>gschemas.compiled</filename> is
  * trusted not to be corrupted.  This assumption has a performance
diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index 9928c91b2..204507b59 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -90,10 +90,10 @@ volatile gboolean glib_on_error_halt = TRUE;
 
 /**
  * g_on_error_query:
- * @prg_name: the program name, needed by <command>gdb</command>
- *     for the [S]tack trace option. If @prg_name is %NULL, g_get_prgname()
- *     is called to get the program name (which will work correctly if
- *     gdk_init() or gtk_init() has been called)
+ * @prg_name: the program name, needed by gdb for the "[S]tack trace"
+ *     option. If @prg_name is %NULL, g_get_prgname() is called to get
+ *     the program name (which will work correctly if gdk_init() or
+ *     gtk_init() has been called)
  *
  * Prompts the user with
  * <literal>[E]xit, [H]alt, show [S]tack trace or [P]roceed</literal>.
@@ -127,14 +127,14 @@ volatile gboolean glib_on_error_halt = TRUE;
  *   ...
  * ]|
  *
- * If [E]xit is selected, the application terminates with a call
- * to <literal>_exit(0)</literal>.
+ * If "[E]xit" is selected, the application terminates with a call
+ * to _exit(0).
  *
- * If [S]tack trace is selected, g_on_error_stack_trace() is called.
- * This invokes <command>gdb</command>, which attaches to the current
- * process and shows a stack trace. The prompt is then shown again.
+ * If "[S]tack" trace is selected, g_on_error_stack_trace() is called.
+ * This invokes gdb, which attaches to the current process and shows
+ * a stack trace. The prompt is then shown again.
  *
- * If [P]roceed is selected, the function returns.
+ * If "[P]roceed" is selected, the function returns.
  *
  * This function may cause different actions on non-UNIX platforms.
  */
@@ -209,14 +209,14 @@ g_on_error_query (const gchar *prg_name)
 
 /**
  * g_on_error_stack_trace:
- * @prg_name: the program name, needed by <command>gdb</command>
- *     for the [S]tack trace option.
+ * @prg_name: the program name, needed by gdb for the "[S]tack trace"
+ *     option
  *
- * Invokes <command>gdb</command>, which attaches to the current
- * process and shows a stack trace. Called by g_on_error_query()
- * when the [S]tack trace option is selected. You can get the current
- * process's "program name" with g_get_prgname(), assuming that you
- * have called gtk_init() or gdk_init().
+ * Invokes gdb, which attaches to the current process and shows a
+ * stack trace. Called by g_on_error_query() when the "[S]tack trace"
+ * option is selected. You can get the current process's program name
+ * with g_get_prgname(), assuming that you have called gtk_init() or
+ * gdk_init().
  *
  * This function may cause different actions on non-UNIX platforms.
  */
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index 56c0e0f01..bacb2df5e 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -57,8 +57,7 @@
  * well as Windows platforms via DLLs.
  *
  * A program which wants to use these functions must be linked to the
- * libraries output by the command
- * <command>pkg-config --libs gmodule-2.0</command>.
+ * libraries output by the command <literal>pkg-config --libs gmodule-2.0</literal>.
  *
  * To use them you must first determine whether dynamic loading
  * is supported on the platform by calling g_module_supported().