diff --git a/gdk/gdk.c b/gdk/gdk.c
index 3bc27f5ef2..664b011223 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -502,7 +502,7 @@ gdk_init (int *argc, char ***argv)
  *
  * A minimal main program for a threaded GTK+ application
  * looks like:
- * |[
+ * |[<!-- language="C" -->
  * int
  * main (int argc, char *argv[])
  * {
@@ -532,7 +532,7 @@ gdk_init (int *argc, char ***argv)
  *
  * Erik Mouw contributed the following code example to
  * illustrate how to use threads within GTK+ programs.
- * |[
+ * |[<!-- language="C" -->
  * /<!---->*-------------------------------------------------------------------------
  *  * Filename:      gtk-thread.c
  *  * Version:       0.99.1
@@ -843,7 +843,7 @@ gdk_threads_dispatch_free (gpointer data)
  * running in thread A and accessing @self after it has been finalized
  * in thread B:
  *
- * |[
+ * |[<!-- language="C" -->
  * static gboolean
  * idle_callback (gpointer data)
  * {
@@ -949,7 +949,7 @@ gdk_threads_add_idle (GSourceFunc    function,
  * This variant of g_timeout_add_full() can be thought of a MT-safe version 
  * for GTK+ widgets for the following use case:
  *
- * |[
+ * |[<!-- language="C" -->
  * static gboolean timeout_callback (gpointer data)
  * {
  *    SomeWidget *self = data;
diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index bfad9ba28a..e91cb05bf3 100644
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -36,7 +36,7 @@
  * screen or workspace.
  * <example>
  * <title>Launching an application</title>
- * |[
+ * |[<!-- language="C" -->
  * GdkAppLaunchContext *context;
  *
  * context = gdk_display_get_app_launch_context (display);
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index a29c1061da..8acc312b90 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -2115,7 +2115,7 @@ static GQueue gdk_error_traps = G_QUEUE_INIT;
  *
 * <example>
  * <title>Trapping an X error</title>
- * |[
+ * |[<!-- language="C" -->
  * gdk_error_trap_push (<!-- -->);
  *
  *  // ... Call the X function which may cause an error here ...
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 2262722d31..e53556a303 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -87,7 +87,7 @@
  *
  * <example id="backend-specific">
  * <title>Backend-specific code</title>
- * |[
+ * |[<!-- language="C" -->
  * #ifdef GDK_WINDOWING_X11
  *   if (GDK_IS_X11_DISPLAY (display))
  *     {
@@ -225,7 +225,7 @@ static const gchar *allowed_backends;
  * By default, GDK tries all included backends.
  *
  * For example,
- * |[
+ * |[<!-- language="C" -->
  * gdk_set_allowed_backends ("wayland,quartz,*");
  * ]|
  * instructs GDK to try the Wayland backend first,
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 0398b32291..a569d6d3d3 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -1676,7 +1676,7 @@ gdk_event_get_source_device (const GdkEvent *event)
  * core pointer. Coordinate extraction, processing and requesting more
  * motion events from a %GDK_MOTION_NOTIFY event usually works like this:
  *
- * |[
+ * |[<!-- language="C" -->
  * {
  *   /&ast; motion_event handler &ast;/
  *   x = motion_event->x;
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index d3209b7a75..8df160bd70 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -1142,7 +1142,7 @@ struct _GdkEventDND {
  * The event type is always the first field in all of the event types, and
  * can always be accessed with the following code, no matter what type of
  * event it is:
- * |[
+ * |[<!-- language="C" -->
  *   GdkEvent *event;
  *   GdkEventType type;
  *
@@ -1153,14 +1153,14 @@ struct _GdkEventDND {
  * can be cast to the appropriate event type, or the union member
  * name can be used. For example if the event type is %GDK_BUTTON_PRESS
  * then the x coordinate of the button press can be accessed with:
- * |[
+ * |[<!-- language="C" -->
  *   GdkEvent *event;
  *   gdouble x;
  *
  *   x = ((GdkEventButton*)event)->x;
  * ]|
  * or:
- * |[
+ * |[<!-- language="C" -->
  *   GdkEvent *event;
  *   gdouble x;
  *
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index 1573f9204a..6d0555f70b 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -503,7 +503,7 @@ gdk_keymap_lookup_key (GdkKeymap          *keymap,
  * <literal>&lt;Control&gt;plus</literal> accelerator &lt;Shift&gt; should
  * be masked out.
  * </para>
- * |[
+ * |[<!-- language="C" -->
  * &sol;* We want to ignore irrelevant modifiers like ScrollLock *&sol;
  * &num;define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)
  * gdk_keymap_translate_keyboard_state (keymap, event->hardware_keycode,
@@ -518,7 +518,7 @@ gdk_keymap_lookup_key (GdkKeymap          *keymap,
  * all modifiers that might affect the translation of the key;
  * this allowed accelerators to be stored with irrelevant consumed
  * modifiers, by doing:</para>
- * |[
+ * |[<!-- language="C" -->
  * &sol;* XXX Don't do this XXX *&sol;
  * if (keyval == accel_keyval &&
  *     (event->state &amp; ~consumed &amp; ALL_ACCELS_MASK) == (accel_mods &amp; ~consumed))
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 68a21cb9e0..9b2b8542cd 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -53,7 +53,7 @@
  * <title>Draw transformed text with Pango and cairo</title>
  * <!-- Note that this example is basically the same as
  *      demos/gtk-demo/rotated_text.c -->
- * |[
+ * |[<!-- language="C" -->
  * #define RADIUS 100
  * #define N_WORDS 10
  * #define FONT "Sans Bold 18"
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index adf2d42df9..268dba528f 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -421,7 +421,7 @@ struct _GdkWindowAttr
  * Here's an example of how the terminal example would be implemented, assuming
  * a terminal area widget called "terminal" and a toplevel window "toplevel":
  *
- * |[
+ * |[<!-- language="C" -->
  * 	GdkGeometry hints;
  *
  * 	hints.base_width = terminal->char_width;
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 0e0c33e9ab..64224b16ec 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -49,7 +49,7 @@
  * calls by an ifdef as follows. Since GDK may be built with multiple
  * backends, you should also check for the backend that is in use (e.g. by
  * using the GDK_IS_WAYLAND_DISPLAY() macro).
- * |[
+ * |[<!-- language="C" -->
  * #ifdef GDK_WINDOWING_WAYLAND
  *   if (GDK_IS_WAYLAND_DISPLAY (display))
  *     {
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 9ebb3b3933..13293bd4d6 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -2275,7 +2275,7 @@ gdk_wayland_window_get_wl_surface (GdkWindow *window)
  * This function should be called before a #GdkWindow is shown. This is
  * best done by connecting to the #GtkWidget::realize signal:
  *
- * |[
+ * |[<!-- language="C" -->
  *   static void
  *   widget_realize_cb (GtkWidget *widget)
  *   {
diff --git a/gtk/deprecated/gtkactivatable.c b/gtk/deprecated/gtkactivatable.c
index 1a8fc80666..c14a7242e3 100644
--- a/gtk/deprecated/gtkactivatable.c
+++ b/gtk/deprecated/gtkactivatable.c
@@ -41,7 +41,7 @@
  * </para>
  * <example>
  * <title>A class fragment implementing #GtkActivatable</title>
- * |[
+ * |[<!-- language="C" -->
  *
  * enum {
  * ...
diff --git a/gtk/deprecated/gtkradioaction.c b/gtk/deprecated/gtkradioaction.c
index 94bb219cf6..b0db5dd8fe 100644
--- a/gtk/deprecated/gtkradioaction.c
+++ b/gtk/deprecated/gtkradioaction.c
@@ -402,7 +402,7 @@ create_menu_item (GtkAction *action)
  * to the group. 
  *
  * A common way to set up a group of radio group is the following:
- * |[
+ * |[<!-- language="C" -->
  *   GSList *group = NULL;
  *   GtkRadioAction *action;
  *  
@@ -492,7 +492,7 @@ gtk_radio_action_set_group (GtkRadioAction *action,
  * and gtk_radio_action_set_group() methods
  *
  * A common way to set up a group of radio actions is the following:
- * |[
+ * |[<!-- language="C" -->
  *   GtkRadioAction *action;
  *   GtkRadioAction *last_action;
  *  
diff --git a/gtk/deprecated/gtkrc.c b/gtk/deprecated/gtkrc.c
index b763a1b050..8c7dc83927 100644
--- a/gtk/deprecated/gtkrc.c
+++ b/gtk/deprecated/gtkrc.c
@@ -607,7 +607,7 @@
  * <literal>*</literal>. So for example, the following specifies different icons to
  * use for left-to-right and right-to-left languages:
  *
- * |[
+ * |[<!-- language="C" -->
  * stock["my-stock-item"] =
  * {
  *   { "itemltr.png", LTR, *, * },
@@ -617,7 +617,7 @@
  *
  * This could be abbreviated as follows:
  *
- * |[
+ * |[<!-- language="C" -->
  * stock["my-stock-item"] =
  * {
  *   { "itemltr.png", LTR },
@@ -627,7 +627,7 @@
  *
  * You can specify custom icons for specific sizes, as follows:
  *
- * |[
+ * |[<!-- language="C" -->
  * stock["my-stock-item"] =
  * {
  *   { "itemmenusize.png", *, *, "gtk-menu" },
@@ -643,7 +643,7 @@
  *
  * It's also possible to use custom icons for a given state, for example:
  *
- * |[
+ * |[<!-- language="C" -->
  * stock["my-stock-item"] =
  * {
  *   { "itemprelight.png", *, PRELIGHT },
@@ -1499,7 +1499,7 @@ gtk_rc_get_style (GtkWidget *widget)
  * would be items inside a GNOME canvas widget.
  *
  * The action of gtk_rc_get_style() is similar to:
- * |[
+ * |[<!-- language="C" -->
  *  gtk_widget_path (widget, NULL, &path, NULL);
  *  gtk_widget_class_path (widget, NULL, &class_path, NULL);
  *  gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget),
diff --git a/gtk/deprecated/gtkstock.c b/gtk/deprecated/gtkstock.c
index c6bb3dc609..65c609c59d 100644
--- a/gtk/deprecated/gtkstock.c
+++ b/gtk/deprecated/gtkstock.c
@@ -483,7 +483,7 @@ static const GtkStockItem builtin_items [] =
  * the correct domain when calling dgettext(). This can be useful, e.g.
  * when dealing with message contexts:
  *
- * |[
+ * |[<!-- language="C" -->
  * GtkStockItem items[] = { 
  *  { MY_ITEM1, NC_("odd items", "Item 1"), 0, 0, "odd-item-domain" },
  *  { MY_ITEM2, NC_("even items", "Item 2"), 0, 0, "even-item-domain" },
diff --git a/gtk/deprecated/gtkuimanager.c b/gtk/deprecated/gtkuimanager.c
index 207d019da9..0b8df582b1 100644
--- a/gtk/deprecated/gtkuimanager.c
+++ b/gtk/deprecated/gtkuimanager.c
@@ -3190,7 +3190,7 @@ queue_update (GtkUIManager *manager)
  * UI in an idle function. A typical example where this function is
  * useful is to enforce that the menubar and toolbar have been added to 
  * the main window before showing it:
- * |[
+ * |[<!-- language="C" -->
  * gtk_container_add (GTK_CONTAINER (window), vbox); 
  * g_signal_connect (merge, "add-widget", 
  *                   G_CALLBACK (add_widget), vbox);
diff --git a/gtk/deprecated/gtkvbox.c b/gtk/deprecated/gtkvbox.c
index 7745045f9a..6a95410ae8 100644
--- a/gtk/deprecated/gtkvbox.c
+++ b/gtk/deprecated/gtkvbox.c
@@ -51,7 +51,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  * from #GtkBox, and set the #GtkOrientable:orientation property to
  * %GTK_ORIENTATION_VERTICAL in your instance init function, with a
  * call like:
- * |[
+ * |[<!-- language="C" -->
  *   gtk_orientable_set_orientation (GTK_ORIENTABLE (object),
  *                                   GTK_ORIENTATION_VERTICAL);
  * ]|
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 1348ff9f2c..ab5b4af3dd 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -84,7 +84,7 @@
  * application, but in order to ensure proper translation of the title,
  * applications should set the title property explicitly when constructing
  * a GtkAboutDialog, as shown in the following example:
- * |[
+ * |[<!-- language="C" -->
  * gtk_show_about_dialog (NULL,
  *                        "program-name", "ExampleCode",
  *                        "logo", example_logo,
@@ -1653,7 +1653,7 @@ gtk_about_dialog_get_translator_credits (GtkAboutDialog *about)
  * of the language which is currently used in the user interface.
  * Using gettext(), a simple way to achieve that is to mark the
  * string for translation:
- * |[
+ * |[<!-- language="C" -->
  *  gtk_about_dialog_set_translator_credits (about, _("translator-credits"));
  * ]|
  * It is a good idea to use the customary msgid "translator-credits" for this
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index e4c9c2fd3a..5be7750a08 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -67,7 +67,7 @@
  * though it is almost always used to display just one accelerator key.
  * <example>
  * <title>Creating a simple menu item with an accelerator key.</title>
- * |[
+ * |[<!-- language="C" -->
  *   GtkWidget *save_item;
  *   GtkAccelGroup *accel_group;
  *
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 38163ed8f6..242cccb403 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -94,7 +94,7 @@
  * </figure>
  *
  * <example id="gtkapplication"><title>A simple application</title>
- * |[
+ * |[<!-- language="C" -->
  * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/bloatpad.c">
  *  <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
  * </xi:include>
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index 3396de208e..9b795d12a2 100644
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -79,7 +79,7 @@
  * using gtk_header_bar_set_show_close_button().
  *
  * <example><title>A GtkApplicationWindow with a menubar</title>
- * |[
+ * |[<!-- language="C" -->
  * app = gtk_application_new ();
  *
  * builder = gtk_builder_new ();
@@ -103,7 +103,7 @@
  * </example>
  *
  * <example><title>Handling fallback yourself</title>
- * |[
+ * |[<!-- language="C" -->
  * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/sunny.c">
  *  <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
  * </xi:include>
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index 583072fd66..ae19c18020 100644
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -74,7 +74,7 @@
  * of a #GtkTreeModel one would do the following:
  * <example>
  *   <title>Requesting the width of a handful of GtkTreeModel rows</title>
- *   |[
+ *   |[<!-- language="C" -->
  * GtkTreeIter iter;
  * gint        minimum_width;
  * gint        natural_width;
@@ -110,7 +110,7 @@
  * take up the full width of the layouting widget would look like:
  * <example>
  *   <title>A typical get_preferred_width(<!-- -->) implementation</title>
- *   |[
+ *   |[<!-- language="C" -->
  * static void
  * foo_get_preferred_width (GtkWidget       *widget,
  *                          gint            *minimum_size,
@@ -142,7 +142,7 @@
  * root level of a #GtkTreeModel one would do the following:
  * <example>
  *   <title>Requesting the height for width of a handful of GtkTreeModel rows</title>
- *   |[
+ *   |[<!-- language="C" -->
  * GtkTreeIter iter;
  * gint        minimum_height;
  * gint        natural_height;
@@ -199,7 +199,7 @@
  * runs as follows:
  * <example>
  *   <title>Requesting the width of a handful of GtkTreeModel rows</title>
- *   |[
+ *   |[<!-- language="C" -->
  * GtkAllocation allocation;
  * GdkRectangle  cell_area = { 0, };
  * GtkTreeIter   iter;
@@ -264,7 +264,7 @@
  * should be implemented:
  * <example>
  *   <title>Implementing keyboard focus navigation</title>
- *   |[
+ *   |[<!-- language="C" -->
  * static gboolean
  * foo_focus (GtkWidget       *widget,
  *            GtkDirectionType direction)
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index 36958b235a..1bd5070f48 100644
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -90,7 +90,7 @@
  * to the fact that these widgets internally use a #GtkCellArea.
  * The cell area is exposed as a construct-only property by these
  * widgets. This means that it is possible to e.g. do
- * |[
+ * |[<!-- language="C" -->
  * combo = g_object_new (GTK_TYPE_COMBO_BOX, "cell-area", my_cell_area, NULL);
  * ]|
  * to use a custom cell area with a combo box. But construct properties
@@ -100,7 +100,7 @@
  * cause the default cell area to be instantiated. In this case, a provided
  * construct property value will be ignored (with a warning, to alert
  * you to the problem).
- * |[
+ * |[<!-- language="C" -->
  * static void
  * my_combo_box_init (MyComboBox *b)
  * {
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index aa961e711d..5275a2e683 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -248,7 +248,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
    * continue to use the same kind of widget for editing in future
    * releases, therefore you should check the type of @editable
    * before doing any specific setup, as in the following example:
-   * |[
+   * |[<!-- language="C" -->
    * static void
    * text_editing_started (GtkCellRenderer *cell,
    *                       GtkCellEditable *editable,
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 951db192c3..ce3d72bf83 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -623,7 +623,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    *
    * Here's an example signal handler which fetches data from the model and
    * displays it in the entry.
-   * |[
+   * |[<!-- language="C" -->
    * static gchar*
    * format_entry_text_callback (GtkComboBox *combo,
    *                             const gchar *path,
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index de42b916f7..bd8d059210 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -108,7 +108,7 @@
  * the container must return the height for its minimum width. This is easily achieved by
  * simply calling the reverse apis implemented for itself as follows:
  *
- * |[
+ * |[<!-- language="C" -->
  * static void
  * foo_container_get_preferred_height (GtkWidget *widget, gint *min_height, gint *nat_height)
  * {
@@ -132,7 +132,7 @@
  * Similarly, when gtk_widget_get_preferred_width_for_height() is called for a container or widget
  * that is height-for-width, it then only needs to return the base minimum width like so:
  *
- * |[
+ * |[<!-- language="C" -->
  * static void
  * foo_container_get_preferred_width_for_height (GtkWidget *widget, gint for_height,
  *                                               gint *min_width, gint *nat_width)
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index ad9a37818c..7c638189e8 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -98,7 +98,7 @@
  * in the dialog.
  * <example>
  * <title>Simple GtkDialog usage</title>
- * |[
+ * |[<!-- language="C" -->
  * /&ast; Function to open a dialog box displaying the message provided. &ast;/
  * void
  * quick_message (gchar *message)
@@ -848,7 +848,7 @@ gtk_dialog_new_empty (const gchar     *title,
  * so the first button in the list will be the leftmost button in the dialog.
  *
  * Here's a simple example:
- * |[
+ * |[<!-- language="C" -->
  *  GtkWidget *dialog = gtk_dialog_new_with_buttons ("My dialog",
  *                                                   main_app_window,
  *                                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1227,7 +1227,7 @@ run_destroy_handler (GtkDialog *dialog, gpointer data)
  * destroying the dialog if you wish to do so.
  *
  * Typical usage of this function might be:
- * |[
+ * |[<!-- language="C" -->
  *   gint result = gtk_dialog_run (GTK_DIALOG (dialog));
  *   switch (result)
  *     {
@@ -1471,7 +1471,7 @@ gtk_dialog_set_alternative_button_order_valist (GtkDialog *dialog,
  *
  * Use this function after adding all the buttons to your dialog, as the
  * following example shows:
- * |[
+ * |[<!-- language="C" -->
  * cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
  *                                        _("_Cancel"),
  *                                        GTK_RESPONSE_CANCEL);
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index d89e34759e..008ce0aa77 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1375,7 +1375,7 @@ gtk_drag_dest_set_internal (GtkWidget       *widget,
  * There's no way to set a default action here, you can use the
  * #GtkWidget::drag-motion callback for that. Here's an example which selects
  * the action to use depending on whether the control key is pressed or not:
- * |[
+ * |[<!-- language="C" -->
  * static void
  * drag_motion (GtkWidget *widget,
  *              GdkDragContext *context,
diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index e5375bcb2c..0103999244 100644
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -77,7 +77,7 @@
  *
  * <example>
  * <title>Simple GtkDrawingArea usage</title>
- * |[
+ * |[<!-- language="C" -->
  * gboolean
  * draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data)
  * {
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index 9c41402320..94b592592b 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -39,7 +39,7 @@
  *
  * <example>
  * <title>Forcing entry to uppercase.</title>
- * |[
+ * |[<!-- language="C" -->
  * #include &lt;ctype.h&gt;
  *
  * void
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index ae18dedd5d..01ca5c3e1d 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -7709,7 +7709,7 @@ gtk_entry_get_overwrite_mode (GtkEntry *entry)
  *
  * This is equivalent to:
  *
- * |[
+ * |[<!-- language="C" -->
  * gtk_entry_buffer_get_text (gtk_entry_get_buffer (entry));
  * ]|
  *
@@ -7739,7 +7739,7 @@ gtk_entry_get_text (GtkEntry *entry)
  *
  * This is equivalent to:
  *
- * |[
+ * |[<!-- language="C" -->
  * gtk_entry_buffer_set_max_length (gtk_entry_get_buffer (entry), max);
  * ]|
  **/
@@ -7760,7 +7760,7 @@ gtk_entry_set_max_length (GtkEntry     *entry,
  *
  * This is equivalent to:
  *
- * |[
+ * |[<!-- language="C" -->
  * gtk_entry_buffer_get_max_length (gtk_entry_get_buffer (entry));
  * ]|
  *
@@ -7784,7 +7784,7 @@ gtk_entry_get_max_length (GtkEntry *entry)
  *
  * This is equivalent to:
  *
- * |[
+ * |[<!-- language="C" -->
  * gtk_entry_buffer_get_length (gtk_entry_get_buffer (entry));
  * ]|
  *
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 6667fb9ed6..c8b15664a7 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -43,7 +43,7 @@
  * its expansion state. You should watch this property with a signal
  * connection as follows:
  * </para>
- * |[
+ * |[<!-- language="C" -->
  * expander = gtk_expander_new_with_mnemonic ("_More Options");
  * g_signal_connect (expander, "notify::expanded",
  *                   G_CALLBACK (expander_callback), NULL);
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 6619e78a76..eee7976659 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -111,7 +111,7 @@
  * </para>
  * <example id="example-gtkfilechooser-preview">
  * <title>Sample Usage</title>
- * |[
+ * |[<!-- language="C" -->
  * {
  *   GtkImage *preview;
  *
@@ -160,7 +160,7 @@
  * </para>
  * <example id="example-gtkfilechooser-extra">
  * <title>Sample Usage</title>
- * |[
+ * |[<!-- language="C" -->
  *
  *   GtkWidget *toggle;
  *
@@ -347,7 +347,7 @@ gtk_file_chooser_default_init (GtkFileChooserInterface *iface)
    * illustrates this.
    * <example id="gtkfilechooser-confirmation">
    * <title>Custom confirmation</title>
-   * |[
+   * |[<!-- language="C" -->
    * static GtkFileChooserConfirmation
    * confirm_overwrite_callback (GtkFileChooser *chooser, gpointer data)
    * {
@@ -742,7 +742,7 @@ gtk_file_chooser_get_filename (GtkFileChooser *chooser)
  * a modified version.  If you don't have a file name already &mdash; for
  * example, if the user just created a new file and is saving it for the first
  * time, do not call this function.  Instead, use something similar to this:
- * |[
+ * |[<!-- language="C" -->
  * if (document_is_new)
  *   {
  *     /&ast; the user just created a new document &ast;/
@@ -1094,7 +1094,7 @@ gtk_file_chooser_get_uri (GtkFileChooser *chooser)
  * modified version.  If you don't have a file name already &mdash; for example,
  * if the user just created a new file and is saving it for the first time, do
  * not call this function.  Instead, use something similar to this:
- * |[
+ * |[<!-- language="C" -->
  * if (document_is_new)
  *   {
  *     /&ast; the user just created a new document &ast;/
@@ -1460,7 +1460,7 @@ gtk_file_chooser_get_files (GtkFileChooser *chooser)
  * a file name already &mdash; for example, if the user just created a new
  * file and is saving it for the first time, do not call this function.
  * Instead, use something similar to this:
- * |[
+ * |[<!-- language="C" -->
  * if (document_is_new)
  *   {
  *     /&ast; the user just created a new document &ast;/
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index b92262c418..c639b71804 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -72,7 +72,7 @@
  *
  * <example>
  * <title>Create a button to let the user select a file in /etc</title>
- * |[
+ * |[<!-- language="C" -->
  * {
  *   GtkWidget *button;
  *
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 03d1f564b9..9cf3b67a09 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -351,7 +351,7 @@ gtk_file_filter_buildable_custom_tag_end (GtkBuildable *buildable,
  * gtk_file_filter_add_mime_type(), gtk_file_filter_add_pattern(),
  * or gtk_file_filter_add_custom(). To create a filter
  * that accepts any file, use:
- * |[
+ * |[<!-- language="C" -->
  * GtkFileFilter *filter = gtk_file_filter_new ();
  * gtk_file_filter_add_pattern (filter, "*");
  * ]|
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 2e8ac6f167..959fc037e5 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -118,7 +118,7 @@
  * so that the icon information is shared with other people
  * looking up icons. In the case where the default screen is
  * being used, looking up an icon can be as simple as:
- * |[
+ * |[<!-- language="C" -->
  * GError *error = NULL;
  * GtkIconTheme *icon_theme;
  * GdkPixbuf *pixbuf;
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 7c19d2ee02..39d257d2ee 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -5457,7 +5457,7 @@ gtk_icon_view_unselect_path (GtkIconView *icon_view,
  * To do this, you can use gtk_tree_row_reference_new().
  *
  * To free the return value, use:
- * |[
+ * |[<!-- language="C" -->
  * g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
  * ]|
  *
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index fdd859e5dc..d69d8608da 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -52,7 +52,7 @@
  * #GdkPixbuf ("pixel buffer") from a file, and then display that.
  * There's a convenience function to do this, gtk_image_new_from_file(),
  * used as follows:
- * |[
+ * |[<!-- language="C" -->
  *   GtkWidget *image;
  *   image = gtk_image_new_from_file ("myfile.png");
  * ]|
@@ -76,7 +76,7 @@
  * #GtkEventBox, then connect to the event signals on the event box.
  * <example>
  * <title>Handling button press events on a #GtkImage.</title>
- * |[
+ * |[<!-- language="C" -->
  *   static gboolean
  *   button_press_callback (GtkWidget      *event_box,
  *                          GdkEventButton *event,
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index f44a00a322..9e0a9eb938 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -58,7 +58,7 @@
  * implements a subclass of #GtkIMContext or #GtkIMContextSimple and exports
  * these four functions:
  *
- * |[
+ * |[<!-- language="C" -->
  * void im_module_init(#GTypeModule *module);
  * ]|
  * This function should register the #GType of the #GtkIMContext subclass which
@@ -66,12 +66,12 @@
  * that g_type_register_static() cannot be used as the type needs to be
  * registered dynamically.
  *
- * |[
+ * |[<!-- language="C" -->
  * void im_module_exit(void);
  * ]|
  * Here goes any cleanup code your input method might require on module unload.
  *
- * |[
+ * |[<!-- language="C" -->
  * void im_module_list(const #GtkIMContextInfo ***contexts, int *n_contexts)
  * {
  *   *contexts = info_list;
@@ -83,7 +83,7 @@
  * pointer to statically defined array of #GtkIMContextInfo items for each
  * provided input method.
  *
- * |[
+ * |[<!-- language="C" -->
  * #GtkIMContext * im_module_create(const #gchar *context_id);
  * ]|
  * This function should return a pointer to a newly created instance of the
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index ef3ed805a7..5d6dee4f34 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -74,7 +74,7 @@
  *
  * <example>
  * <title>Simple GtkInfoBar usage.</title>
- * |[
+ * |[<!-- language="C" -->
  * /&ast; set up info bar &ast;/
  * info_bar = gtk_info_bar_new ();
  * gtk_widget_set_no_show_all (info_bar, TRUE);
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index b43636b802..91e8b533ef 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -109,7 +109,7 @@
  * using gtk_label_set_mnemonic_widget(). Here's a simple example where
  * the label is inside a button:
  *
- * |[
+ * |[<!-- language="C" -->
  *   // Pressing Alt+H will activate this button
  *   button = gtk_button_new (<!-- -->);
  *   label = gtk_label_new_with_mnemonic ("_Hello");
@@ -119,7 +119,7 @@
  * There's a convenience function to create buttons with a mnemonic label
  * already inside:
  *
- * |[
+ * |[<!-- language="C" -->
  *   // Pressing Alt+H will activate this button
  *   button = gtk_button_new_with_mnemonic ("_Hello");
  * ]|
@@ -128,7 +128,7 @@
  * #GtkEntry, you have to point the label at the entry with
  * gtk_label_set_mnemonic_widget():
  *
- * |[
+ * |[<!-- language="C" -->
  *   // Pressing Alt+H will focus the entry
  *   entry = gtk_entry_new (<!-- -->);
  *   label = gtk_label_new_with_mnemonic ("_Hello");
@@ -144,7 +144,7 @@
  * linkend="PangoMarkupFormat">markup format</link>.
  * Here's how to create a label with a small font:
  *
- * |[
+ * |[<!-- language="C" -->
  *   label = gtk_label_new (NULL);
  *   gtk_label_set_markup (GTK_LABEL (label), "<small>Small text</small>");
  * ]|
@@ -216,7 +216,7 @@
  * way they appear in web browsers, with colored, underlined text. The title
  * attribute is displayed as a tooltip on the link. An example looks like this:
  *
- * |[
+ * |[<!-- language="C" -->
  * gtk_label_set_markup (label, "Go to the <a href="http://www.gtk.org" title="&lt;i&gt;Our&lt;/i&gt; website">GTK+ website</a> for more...");
  * ]|
  *
@@ -2612,7 +2612,7 @@ gtk_label_set_markup_internal (GtkLabel    *label,
  * label's text and attribute list based on the parse results. If the @str is
  * external data, you may need to escape it with g_markup_escape_text() or
  * g_markup_printf_escaped()<!-- -->:
- * |[
+ * |[<!-- language="C" -->
  * char *markup;
  *
  * markup = g_markup_printf_escaped ("&lt;span style=\"italic\"&gt;&percnt;s&lt;/span&gt;", str);
diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index 83f913cdcf..ef8599fbf1 100644
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -35,7 +35,7 @@
  *
  * <example>
  * <title>Adding a custom offset on the bar</title>
- * |[
+ * |[<!-- language="C" -->
  *
  * static GtkWidget *
  * create_level_bar (void)
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index c0a5ec2803..09891e7cd5 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -55,7 +55,7 @@
  *
  * <example>
  * <title>Creating a simple list store.</title>
- * |[
+ * |[<!-- language="C" -->
  * enum {
  *   COLUMN_STRING,
  *   COLUMN_INT,
@@ -157,7 +157,7 @@
  *
  * <example>
  * <title>A UI Definition fragment for a list store</title>
- * |[
+ * |[<!-- language="C" -->
  * <object class="GtkListStore">
  *   <columns>
  *     <column type="gchararray"/>
@@ -2174,7 +2174,7 @@ gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable)
  * Calling
  * <literal>gtk_list_store_insert_with_values (list_store, iter, position...)</literal>
  * has the same effect as calling
- * |[
+ * |[<!-- language="C" -->
  * gtk_list_store_insert (list_store, iter, position);
  * gtk_list_store_set (list_store, iter, ...);
  * ]|
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index c1205444c2..011c26fb54 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -55,7 +55,7 @@
  * </para>
  * <example>
  * <title>Typical main() function for a GTK+ application</title>
- * |[
+ * |[<!-- language="C" -->
  * int
  * main (int argc, char **argv)
  * {
@@ -1121,7 +1121,7 @@ gtk_init_check_abi_check (int *argc, char ***argv, int num_checks, size_t sizeof
  * changed after GTK+ has already been initialized. In this case,
  * you can use it to update the default text direction as follows:
  *
- * |[
+ * |[<!-- language="C" -->
  * setlocale (LC_ALL, new_locale);
  * direction = gtk_get_locale_direction ();
  * gtk_widget_set_default_direction (direction);
@@ -1253,7 +1253,7 @@ gtk_main_quit (void)
  *
  * <example>
  * <title>Updating the UI during a long computation</title>
- * |[
+ * |[<!-- language="C" -->
  *  /&ast; computation going on... &ast;/
  *
  *  while (gtk_events_pending ())
@@ -1828,7 +1828,7 @@ gtk_main_do_event (GdkEvent *event)
  *
  * <example>
  * <title>A persistent window</title>
- * |[
+ * |[<!-- language="C" -->
  * #include &lt;gtk/gtk.h>&lt;
  *
  * int
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index dfd217d041..909e27d3ed 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -45,7 +45,7 @@
  *
  * <example>
  * <title>Connecting the popup signal handler.</title>
- * |[
+ * |[<!-- language="C" -->
  *   /<!---->* connect our handler which will popup the menu *<!---->/
  *   g_signal_connect_swapped (window, "button_press_event",
  *	G_CALLBACK (my_popup_handler), menu);
@@ -54,7 +54,7 @@
  *
  * <example>
  * <title>Signal handler which displays a popup menu.</title>
- * |[
+ * |[<!-- language="C" -->
  * static gint
  * my_popup_handler (GtkWidget *widget, GdkEvent *event)
  * {
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index fdde639e5f..4740f40ee5 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -66,7 +66,7 @@
  *
  * <example>
  * <title>Setting markup and accelerator on a MenuItem</title>
- * |[
+ * |[<!-- language="C" -->
  * GtkWidget *child = gtk_bin_get_child (GTK_BIN (menu_item));
  * gtk_label_set_markup (GTK_LABEL (child), "<i>new label</i> with <b>markup</b>");
  * gtk_accel_label_set_accel (GTK_ACCEL_LABEL (child), GDK_KEY_1, 0);
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 4d4d9f048a..5fe172461f 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -59,7 +59,7 @@
  * returns when any dialog button is clicked.
  * <example>
  * <title>A modal dialog.</title>
- * |[
+ * |[<!-- language="C" -->
  *  dialog = gtk_message_dialog_new (main_application_window,
  *                                   GTK_DIALOG_DESTROY_WITH_PARENT,
  *                                   GTK_MESSAGE_ERROR,
@@ -73,7 +73,7 @@
  * You might do a non-modal #GtkMessageDialog as follows:
  * <example>
  * <title>A non-modal dialog.</title>
- * |[
+ * |[<!-- language="C" -->
  *  dialog = gtk_message_dialog_new (main_application_window,
  *                                   GTK_DIALOG_DESTROY_WITH_PARENT,
  *                                   GTK_MESSAGE_ERROR,
@@ -610,7 +610,7 @@ gtk_message_dialog_new (GtkWindow     *parent,
  * instead, since you can't pass the markup string either
  * as the format (it might contain '%' characters) or as a string
  * argument.
- * |[
+ * |[<!-- language="C" -->
  *  GtkWidget *dialog;
  *  dialog = gtk_message_dialog_new (main_application_window,
  *                                   GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -800,7 +800,7 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
  * may contain special XML characters, you should use g_markup_printf_escaped()
  * to escape it.
 
- * |[
+ * |[<!-- language="C" -->
  * gchar *msg;
  *
  * msg = g_markup_printf_escaped (message_format, ...);
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 0c216dc2b9..8e431a4736 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -8399,7 +8399,7 @@ gtk_notebook_get_tab_detachable (GtkNotebook *notebook,
  * destination and accept the target "GTK_NOTEBOOK_TAB". The notebook
  * will fill the selection with a GtkWidget** pointing to the child
  * widget that corresponds to the dropped tab.
- * |[
+ * |[<!-- language="C" -->
  *  static void
  *  on_drop_zone_drag_data_received (GtkWidget        *widget,
  *                                   GdkDragContext   *context,
diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index 8bb1c4094d..63fef1f8fc 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -50,7 +50,7 @@
  *
  * <example>
  * <title>A page setup dialog</title>
- * |[
+ * |[<!-- language="C" -->
  * static GtkPrintSettings *settings = NULL;
  * static GtkPageSetup *page_setup = NULL;
  *
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 7b9ceab985..67931ac496 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -75,7 +75,7 @@
  *
  * <example>
  * <title>Creating a paned widget with minimum sizes.</title>
- * |[
+ * |[<!-- language="C" -->
  * GtkWidget *hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
  * GtkWidget *frame1 = gtk_frame_new (NULL);
  * GtkWidget *frame2 = gtk_frame_new (NULL);
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 738c3b7ab3..e5bb221a34 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -4790,7 +4790,7 @@ gtk_places_sidebar_remove_shortcut (GtkPlacesSidebar *sidebar,
  *     A #GSList of #GFile of the locations that have been added as
  *     application-specific shortcuts with gtk_places_sidebar_add_shortcut().
  * To free this list, you can use
- * |[
+ * |[<!-- language="C" -->
  * g_slist_free_full (list, (GDestroyNotify) g_object_unref);
  * ]|
  *
diff --git a/gtk/gtkprintcontext.c b/gtk/gtkprintcontext.c
index 10c79d23ba..97d56e50c8 100644
--- a/gtk/gtkprintcontext.c
+++ b/gtk/gtkprintcontext.c
@@ -37,7 +37,7 @@
  *
  * <example>
  * <title>Using GtkPrintContext in a #GtkPrintOperation::draw-page callback</title>
- * |[
+ * |[<!-- language="C" -->
  * static void
  * draw_page (GtkPrintOperation *operation,
  * 	   GtkPrintContext   *context,
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 7c20bd8fdd..daf0d37c50 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -61,7 +61,7 @@
  *
  * <example>
  * <title>The high-level printing API</title>
- * |[
+ * |[<!-- language="C" -->
  * static GtkPrintSettings *settings = NULL;
  *
  * static void
@@ -853,7 +853,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
    * Emitted for every page that is printed. The signal handler
    * must render the @page_nr's page onto the cairo context obtained
    * from @context using gtk_print_context_get_cairo_context().
-   * |[
+   * |[<!-- language="C" -->
    * static void
    * draw_page (GtkPrintOperation *operation,
    *            GtkPrintContext   *context,
@@ -3117,7 +3117,7 @@ gtk_print_operation_get_error (GtkPrintOperation  *op,
  * #GtkPrintOperation::done signal will be emitted with the result of the 
  * operation when the it is done (i.e. when the dialog is canceled, or when 
  * the print succeeds or fails).
- * |[
+ * |[<!-- language="C" -->
  * if (settings != NULL)
  *   gtk_print_operation_set_print_settings (print, settings);
  *   
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 3535b28cb9..8d62e01886 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -70,7 +70,7 @@
  *
  * <example>
  * <title>How to create a group of two radio buttons.</title>
- * |[
+ * |[<!-- language="C" -->
  * void create_radio_buttons (void) {
  *
  *    GtkWidget *window, *radio1, *radio2, *box, *entry;
@@ -355,7 +355,7 @@ gtk_radio_button_set_group (GtkRadioButton *radio_button,
  * and gtk_radio_button_set_group() methods
  *
  * A common way to set up a group of radio buttons is the following:
- * |[
+ * |[<!-- language="C" -->
  *   GtkRadioButton *radio_button;
  *   GtkRadioButton *last_button;
  *
diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index 008b33773e..8d1fc0e98e 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -48,7 +48,7 @@
  *
  * <example>
  * <title>How to create a group of radio menu items.</title>
- * |[
+ * |[<!-- language="C" -->
  * GSList *group = NULL;
  * GtkWidget *item;
  * gint i;
diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c
index 85fba519d2..cb0c2e1be4 100644
--- a/gtk/gtkrecentchooserdialog.c
+++ b/gtk/gtkrecentchooserdialog.c
@@ -48,7 +48,7 @@
  * <title>Typical usage</title>
  * In the simplest of cases, you can use the following code to use
  * a #GtkRecentChooserDialog to select a recently used file:
- * |[
+ * |[<!-- language="C" -->
  * GtkWidget *dialog;
  *
  * dialog = gtk_recent_chooser_dialog_new ("Recent Documents",
diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c
index df690345b0..a62b0fc901 100644
--- a/gtk/gtkrecentfilter.c
+++ b/gtk/gtkrecentfilter.c
@@ -406,7 +406,7 @@ gtk_recent_filter_buildable_custom_tag_end (GtkBuildable *buildable,
  * gtk_recent_filter_add_pattern(), gtk_recent_filter_add_mime_type(),
  * gtk_recent_filter_add_application(), gtk_recent_filter_add_age().
  * To create a filter that accepts any recently used resource, use:
- * |[
+ * |[<!-- language="C" -->
  * GtkRecentFilter *filter = gtk_recent_filter_new ();
  * gtk_recent_filter_add_pattern (filter, "*");
  * ]|
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 2f564bcd5e..9e8301899e 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -40,7 +40,7 @@
  *
  * Adding a new recently used file is as simple as:
  *
- * |[
+ * |[<!-- language="C" -->
  * GtkRecentManager *manager;
  *
  * manager = gtk_recent_manager_get_default ();
@@ -53,7 +53,7 @@
  * Looking up the meta-data associated with a recently used file
  * given its URI requires calling gtk_recent_manager_lookup_item():
  *
- * |[
+ * |[<!-- language="C" -->
  * GtkRecentManager *manager;
  * GtkRecentInfo *info;
  * GError *error = NULL;
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 6433a57ca7..3f2c5932ef 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -281,7 +281,7 @@ gtk_scale_class_init (GtkScaleClass *class)
    *
    * Here's an example signal handler which displays a value 1.0 as
    * with "--&gt;1.0&lt;--".
-   * |[
+   * |[<!-- language="C" -->
    * static gchar*
    * format_value_callback (GtkScale *scale,
    *                        gdouble   value)
diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c
index 4cfee45cc2..969d34b935 100644
--- a/gtk/gtksearchbar.c
+++ b/gtk/gtksearchbar.c
@@ -56,7 +56,7 @@
  *
  * <example>
  * <title>Creating a search bar</title>
- * |[
+ * |[<!-- language="C" -->
  * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/search-bar.c">
  *  <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
  * </xi:include>
@@ -168,7 +168,7 @@ preedit_changed_cb (GtkEntry  *entry,
  *
  * <example>
  * <title>Showing the search bar on key presses</title>
- * |[
+ * |[<!-- language="C" -->
  * static gboolean
  * window_key_press_event_cb (GtkWidget *widget,
  *                            GdkEvent  *event,
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index cce10660b9..f28d7d3402 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -86,7 +86,7 @@
  * need to be aware that settings that are specific to individual widgets
  * may not be available before the widget type has been realized at least
  * once. The following example demonstrates a way to do this:
- * |[
+ * |[<!-- language="C" -->
  *   gtk_init (&argc, &argv);
  *
  *   /&ast; make sure the type is realized &ast;/
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index ebe3f7b74f..f12e1bee80 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -70,7 +70,7 @@
  *
  * <example>
  * <title>Obtaining the window ID of a socket.</title>
- * |[
+ * |[<!-- language="C" -->
  * GtkWidget *socket = gtk_socket_new (<!-- -->);
  * gtk_widget_show (socket);
  * gtk_container_add (GTK_CONTAINER (parent), socket);
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 5ef8e7daa1..5734d2cbe2 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -80,7 +80,7 @@
  *
  * <example>
  * <title>Using a GtkSpinButton to get an integer</title>
- * |[
+ * |[<!-- language="C" -->
  * /&ast; Provides a function to retrieve an integer value from a
  *  &ast; GtkSpinButton and creates a spin button to model percentage
  *  &ast; values.
@@ -116,7 +116,7 @@
  *
  * <example>
  * <title>Using a GtkSpinButton to get a floating point value</title>
- * |[
+ * |[<!-- language="C" -->
  * /&ast; Provides a function to retrieve a floating point value from a
  *  &ast; GtkSpinButton, and creates a high precision spin button.
  *  &ast;/
@@ -458,7 +458,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
    *
    * The ::output signal can be used to change to formatting
    * of the value that is displayed in the spin buttons entry.
-   * |[
+   * |[<!-- language="C" -->
    * /&ast; show leading zeros &ast;/
    * static gboolean
    * on_output (GtkSpinButton *spin,
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index cee9d65cc7..f8b6064eab 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -101,7 +101,7 @@
  * </para>
  * <example>
  * <title>Using an enumeration to identify  animatable regions</title>
- * |[
+ * |[<!-- language="C" -->
  * enum {
  *   REGION_ENTRY,
  *   REGION_BUTTON_UP,
@@ -138,7 +138,7 @@
  * </para>
  * <example>
  * <title>Using struct pointers to identify animatable regions</title>
- * |[
+ * |[<!-- language="C" -->
  * void
  * notebook_draw_tab (GtkWidget    *widget,
  *                    NotebookPage *page,
@@ -156,7 +156,7 @@
  * </para>
  * <example>
  * <title>Triggering a state change animation on a region</title>
- * |[
+ * |[<!-- language="C" -->
  * gboolean
  * notebook_motion_notify (GtkWidget      *widget,
  *                         GdkEventMotion *event)
@@ -2940,7 +2940,7 @@ gtk_style_context_lookup_color (GtkStyleContext *context,
  *
  * As a practical example, a #GtkButton notifying a state transition on
  * the prelight state:
- * |[
+ * |[<!-- language="C" -->
  * gtk_style_context_notify_state_change (context,
  *                                        gtk_widget_get_window (widget),
  *                                        NULL,
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index e49b741f18..e63147bc18 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -7385,7 +7385,7 @@ gtk_text_view_reset_im_context (GtkTextView *text_view)
  * you need to insert your own key handling between the input method
  * and the default key event handling of the #GtkTextView.
  *
- * |[
+ * |[<!-- language="C" -->
  * static gboolean
  * gtk_foo_bar_key_press_event (GtkWidget   *widget,
  *                              GdkEventKey *event)
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index ee65d2bc86..b43350b484 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -60,7 +60,7 @@
  *
  * <example>
  * <title>Creating two #GtkToggleButton widgets.</title>
- * |[
+ * |[<!-- language="C" -->
  * void make_toggles (void) {
  *    GtkWidget *dialog, *toggle1, *toggle2;
  *
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index f928cff9a7..e6f9f6b981 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -53,7 +53,7 @@
  * to a #GtkToolPalette. To add a #GtkToolItemGroup to a #GtkToolPalette,
  * use gtk_container_add().
  *
- * |[
+ * |[<!-- language="C" -->
  * GtkWidget *palette, *group;
  * GtkToolItem *item;
  *
@@ -72,7 +72,7 @@
  * can be used to get the dragged item in the #GtkWidget::drag-data-received
  * signal handler of the drag target.
  *
- * |[
+ * |[<!-- language="C" -->
  * static void
  * passive_canvas_drag_data_received (GtkWidget        *widget,
  *                                    GdkDragContext   *context,
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 14060f4cf3..8e5cc890ce 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -116,7 +116,7 @@
  *
  * <example>
  * <title>Acquiring a #GtkTreeIter-struct</title>
- * |[
+ * |[<!-- language="C" -->
  *  /&ast; Three ways of getting the iter pointing to the location &ast;/
  * GtkTreePath *path;
  * GtkTreeIter iter;
@@ -147,7 +147,7 @@
  *
  * <example>
  * <title>Reading data from a #GtkTreeModel</title>
- * |[
+ * |[<!-- language="C" -->
  * enum
  * {
  *   STRING_COLUMN,
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index effdc3a4f3..f4c6a81c78 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -3828,7 +3828,7 @@ gtk_tree_model_filter_get_model (GtkTreeModelFilter *filter)
  * empty. The visible function should therefore take special care of empty
  * rows, like in the example below.
  *
- * |[
+ * |[<!-- language="C" -->
  * static gboolean
  * visible_func (GtkTreeModel *model,
  *               GtkTreeIter  *iter,
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 3afe77d72b..f545ae7eb3 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -52,7 +52,7 @@
  *
  * <example>
  * <title>Using a #GtkTreeModelSort</title>
- * |[
+ * |[<!-- language="C" -->
  * {
  *   GtkTreeView *tree_view1;
  *   GtkTreeView *tree_view2;
@@ -88,7 +88,7 @@
  *
  * <example>
  * <title>Accessing the child model of in a selection changed callback</title>
- * |[
+ * |[<!-- language="C" -->
  * void
  * selection_changed (GtkTreeSelection *selection, gpointer data)
  * {
diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index e4daa6eb29..b1df51550a 100644
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -542,7 +542,7 @@ gtk_tree_selection_get_selected (GtkTreeSelection  *selection,
  * To do this, you can use gtk_tree_row_reference_new().
  *
  * To free the return value, use:
- * |[
+ * |[<!-- language="C" -->
  * g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
  * ]|
  *
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 9d002adff6..6f25ca0626 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -1498,7 +1498,7 @@ gtk_tree_store_insert_after (GtkTreeStore *tree_store,
  * Calling
  * <literal>gtk_tree_store_insert_with_values (tree_store, iter, position, ...)</literal>
  * has the same effect as calling
- * |[
+ * |[<!-- language="C" -->
  * gtk_tree_store_insert (tree_store, iter, position);
  * gtk_tree_store_set (tree_store, iter, ...);
  * ]|
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index ad166f59bd..d08cca687a 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1653,7 +1653,7 @@ gtk_tree_view_column_new_with_area (GtkCellArea *area)
  * gtk_tree_view_column_set_attributes() on the newly created #GtkTreeViewColumn.
  *
  * Here's a simple example:
- * |[
+ * |[<!-- language="C" -->
  *  enum { TEXT_COLUMN, COLOR_COLUMN, N_COLUMNS };
  *  ...
  *  {
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 68e87a2cf1..d4bb18b2d4 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -155,7 +155,7 @@
  * Here are some examples of how a %GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH widget
  * generally deals with width-for-height requests, for #GtkWidgetClass.get_preferred_height()
  * it will do:
- * |[
+ * |[<!-- language="C" -->
  * static void
  * foo_widget_get_preferred_height (GtkWidget *widget, gint *min_height, gint *nat_height)
  * {
@@ -178,7 +178,7 @@
  * And in #GtkWidgetClass.get_preferred_width_for_height() it will simply return
  * the minimum and natural width:
  *
- * |[
+ * |[<!-- language="C" -->
  * static void
  * foo_widget_get_preferred_width_for_height (GtkWidget *widget, gint for_height,
  *                                            gint *min_width, gint *nat_width)
@@ -203,7 +203,7 @@
  * be careful to call its virtual methods directly, like this:
  * <example>
  *   <title>Widget calling its own size request method.</title>
- *   |[
+ *   |[<!-- language="C" -->
  * GTK_WIDGET_GET_CLASS(widget)-&gt;get_preferred_width (widget),
  *                                  &min, &natural);
  *   ]|
@@ -2958,7 +2958,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
    * last #GtkWidget::drag-leave and if not, treat the drag-motion signal as
    * an "enter" signal. Upon an "enter", the handler will typically highlight
    * the drop site with gtk_drag_highlight().
-   * |[
+   * |[<!-- language="C" -->
    * static void
    * drag_motion (GtkWidget      *widget,
    *              GdkDragContext *context,
@@ -3126,7 +3126,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
    * gdk_drag_context_get_selected_action() before calling
    * gtk_drag_finish(), e.g. to implement %GDK_ACTION_ASK as
    * shown in the following example:
-   * |[
+   * |[<!-- language="C" -->
    * void
    * drag_data_received (GtkWidget          *widget,
    *                     GdkDragContext     *context,
@@ -10781,7 +10781,7 @@ gtk_widget_add_device_events (GtkWidget    *widget,
  * To reliably find the toplevel #GtkWindow, use
  * gtk_widget_get_toplevel() and call gtk_widget_is_toplevel()
  * on the result.
- * |[
+ * |[<!-- language="C" -->
  *  GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
  *  if (gtk_widget_is_toplevel (toplevel))
  *    {
@@ -11117,7 +11117,7 @@ gtk_widget_get_composite_name (GtkWidget *widget)
  * builders might want to treat them in a different way.
  *
  * Here is a simple example:
- * |[
+ * |[<!-- language="C" -->
  *   gtk_widget_push_composite_child ();
  *   scrolled_window->hscrollbar = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, hadjustment);
  *   gtk_widget_set_composite_name (scrolled_window->hscrollbar, "hscrollbar");
@@ -15312,7 +15312,7 @@ _gtk_widget_set_has_focus (GtkWidget *widget,
  *
  * An example of its usage is:
  *
- * |[
+ * |[<!-- language="C" -->
  *   GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE);
  *
  *   fevent->focus_change.type = GDK_FOCUS_CHANGE;
diff --git a/gtk/gtkwidgetpath.c b/gtk/gtkwidgetpath.c
index 7c56bd7b8c..95a9b0d95f 100644
--- a/gtk/gtkwidgetpath.c
+++ b/gtk/gtkwidgetpath.c
@@ -42,7 +42,7 @@
  * The widget path generation is generally simple:
  * <example>
  * <title>Defining a button within a window</title>
- * |[
+ * |[<!-- language="C" -->
  * {
  *   GtkWidgetPath *path;
  *
@@ -59,7 +59,7 @@
  *
  * <example>
  * <title>Defining the first tab widget in a notebook</title>
- * |[
+ * |[<!-- language="C" -->
  * {
  *   GtkWidgetPath *path;
  *   guint pos;
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 6d43b26373..0758ac923a 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -11351,7 +11351,7 @@ gtk_XParseGeometry (const char   *string,
  * to be called when the window has its "final" size, i.e. after calling
  * gtk_widget_show_all() on the contents and gtk_window_set_geometry_hints()
  * on the window.
- * |[
+ * |[<!-- language="C" -->
  * #include <gtk/gtk.h>
  *    
  * static void