From 73c23d9143ec73fd83923c9a0e144e3683f97452 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 5 Feb 2014 22:02:24 -0500
Subject: [PATCH] Use markdown for images

---
 gio/gmenumodel.c | 14 ++++++--------
 glib/gconvert.c  |  7 +++----
 glib/gmain.c     |  9 +++++----
 glib/gstrfuncs.c |  4 ++--
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/gio/gmenumodel.c b/gio/gmenumodel.c
index 6095ca492..61be14c3a 100644
--- a/gio/gmenumodel.c
+++ b/gio/gmenumodel.c
@@ -46,10 +46,9 @@
  * As an example, consider the visible portions of the menu in
  * <xref linkend="menu-example"/>.
  *
- * <figure id="menu-example">
- *   <title>An example menu</title>
- *   <graphic fileref="menu-example.png" format="PNG"></graphic>
- * </figure>
+ * ## An example menu # {#menu-example}
+ *
+ * ![](menu-example.png)
  *
  * There are 8 "menus" visible in the screenshot: one menubar, two
  * submenus and 5 sections:
@@ -68,10 +67,9 @@
  * smaller blocks within the large block represent items in that menu. Some
  * items contain references to other menus.
  *
- * <figure id="menu-model">
- *   <title>A menu model</title>
- *   <graphic fileref="menu-model.png" format="PNG"></graphic>
- * </figure>
+ * ## A menu example # {#menu-model}
+ *
+ * ![](menu-model.png)
  *
  * Notice that the separators visible in <xref linkend="menu-example"/>
  * appear nowhere in <xref linkend="menu-model"/>. This is because
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 62518c0f3..32a29bdd2 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -122,10 +122,9 @@
  * these functions are used to convert between UTF-8 and the
  * encoding for file names in the file system.
  *
- * <figure id="file-name-encodings-diagram">
- * <title>Conversion between File Name Encodings</title>
- * <graphic fileref="file-name-encodings.png" format="PNG"/>
- * </figure>
+ * ## Conversion between file name encodings # {#file-name-encodings-diagram)
+ *
+ * ![](file-name-encodings.png)
  *
  * ## Checklist for Application Writers
  *
diff --git a/glib/gmain.c b/glib/gmain.c
index 5606cccba..2ed34b927 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -168,11 +168,12 @@
  * g_main_context_prepare(), g_main_context_query(),
  * g_main_context_check() and g_main_context_dispatch().
  *
+ * ## State of a Main Context # {#mainloop-states}
+ *
  * The operation of these functions can best be seen in terms
- * of a state diagram, as shown in <xref linkend="mainloop-states"/>.
- * <figure id="mainloop-states"><title>States of a Main Context</title>
- * <graphic fileref="mainloop-states.gif" format="GIF"></graphic>
- * </figure>
+ * of a state diagram, as shown in this image.
+ *
+ * ![](mainloop-states.gif)
  *
  * On UNIX, the GLib mainloop is incompatible with fork(). Any program
  * using the mainloop must either exec() or exit() from the child
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 5cb22c627..a76449403 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -401,8 +401,8 @@ g_memdup (gconstpointer mem,
  * %NULL it returns %NULL. The returned value should be freed when no longer
  * needed.
  *
- * To copy a number of characters from a UTF-8 encoded string, use
- * g_utf8_strncpy() instead.
+ * To copy a number of characters from a UTF-8 encoded string,
+ * use g_utf8_strncpy() instead.
  *
  * Returns: a newly-allocated buffer containing the first @n bytes
  *     of @str, nul-terminated