s/<!>/<!-- -->/g throughout the documentation to bring the produced

	* gtk/gtkitemfactory.c:
	* gtk/gtkiconfactory.c:
	* gtk/gtkwidget.c:
	* gtk/gtkstyle.c:
	* gtk/gtkrc.c:
	* gtk/gtktreeviewcolumn.c:
	* gtk/gtkdialog.c:
	* gtk/gtktreemodel.c: s/<!>/<!-- -->/g throughout the
	documentation to bring the produced Docbook closer to XML.

	* gdk/tmpl/rgb.sgml:
	* gdk/tmpl/general.sgml:
	* gtk/tmpl/gtktogglebutton.sgml:
	* gtk/tmpl/gtkaccellabel.sgml:
	* gtk/tmpl/gtkradiobutton.sgml:
	* gtk/tmpl/gtktreemodel.sgml:
	* gtk/tmpl/gtkwidget.sgml:
	* gtk/tmpl/gtkimage.sgml:
	* gtk/tmpl/gtktooltips.sgml:
	* gtk/tmpl/gtksignal.sgml:
	* gtk/tmpl/gtkcombo.sgml:
	* gtk/tmpl/gtkdnd.sgml:
	* gtk/tmpl/gtksocket.sgml:
	* gtk/tmpl/gtkdrawingarea.sgml:
	* gtk/tmpl/gtkobject.sgml:
	* gtk/tmpl/gtkpaned.sgml:
	* gtk/tmpl/gtkmain.sgml: s/<!>/<!-- -->/g throughout the
	documentation to bring the produced Docbook closer to XML.

32 files changed, 179 insertions, 86 deletions

diff --git a/ChangeLog b/ChangeLog
index d8a1cc2244..782d77c6bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2002-04-18  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkitemfactory.c:
+	* gtk/gtkiconfactory.c:
+	* gtk/gtkwidget.c:
+	* gtk/gtkstyle.c:
+	* gtk/gtkrc.c:
+	* gtk/gtktreeviewcolumn.c:
+	* gtk/gtkdialog.c:
+	* gtk/gtktreemodel.c: s/<!>/<!-- -->/g throughout the
+	documentation to bring the produced Docbook closer to XML.
+
 2002-04-18  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk-pixbuf/Makefile.am (uninstall-libtool-import-lib)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d8a1cc2244..782d77c6bf 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2002-04-18  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkitemfactory.c:
+	* gtk/gtkiconfactory.c:
+	* gtk/gtkwidget.c:
+	* gtk/gtkstyle.c:
+	* gtk/gtkrc.c:
+	* gtk/gtktreeviewcolumn.c:
+	* gtk/gtkdialog.c:
+	* gtk/gtktreemodel.c: s/<!>/<!-- -->/g throughout the
+	documentation to bring the produced Docbook closer to XML.
+
 2002-04-18  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk-pixbuf/Makefile.am (uninstall-libtool-import-lib)
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d8a1cc2244..782d77c6bf 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+2002-04-18  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkitemfactory.c:
+	* gtk/gtkiconfactory.c:
+	* gtk/gtkwidget.c:
+	* gtk/gtkstyle.c:
+	* gtk/gtkrc.c:
+	* gtk/gtktreeviewcolumn.c:
+	* gtk/gtkdialog.c:
+	* gtk/gtktreemodel.c: s/<!>/<!-- -->/g throughout the
+	documentation to bring the produced Docbook closer to XML.
+
 2002-04-18  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk-pixbuf/Makefile.am (uninstall-libtool-import-lib)
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d8a1cc2244..782d77c6bf 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+2002-04-18  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkitemfactory.c:
+	* gtk/gtkiconfactory.c:
+	* gtk/gtkwidget.c:
+	* gtk/gtkstyle.c:
+	* gtk/gtkrc.c:
+	* gtk/gtktreeviewcolumn.c:
+	* gtk/gtkdialog.c:
+	* gtk/gtktreemodel.c: s/<!>/<!-- -->/g throughout the
+	documentation to bring the produced Docbook closer to XML.
+
 2002-04-18  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk-pixbuf/Makefile.am (uninstall-libtool-import-lib)
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d8a1cc2244..782d77c6bf 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+2002-04-18  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkitemfactory.c:
+	* gtk/gtkiconfactory.c:
+	* gtk/gtkwidget.c:
+	* gtk/gtkstyle.c:
+	* gtk/gtkrc.c:
+	* gtk/gtktreeviewcolumn.c:
+	* gtk/gtkdialog.c:
+	* gtk/gtktreemodel.c: s/<!>/<!-- -->/g throughout the
+	documentation to bring the produced Docbook closer to XML.
+
 2002-04-18  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk-pixbuf/Makefile.am (uninstall-libtool-import-lib)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d8a1cc2244..782d77c6bf 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2002-04-18  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkitemfactory.c:
+	* gtk/gtkiconfactory.c:
+	* gtk/gtkwidget.c:
+	* gtk/gtkstyle.c:
+	* gtk/gtkrc.c:
+	* gtk/gtktreeviewcolumn.c:
+	* gtk/gtkdialog.c:
+	* gtk/gtktreemodel.c: s/<!>/<!-- -->/g throughout the
+	documentation to bring the produced Docbook closer to XML.
+
 2002-04-18  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk-pixbuf/Makefile.am (uninstall-libtool-import-lib)
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 033e149639..bc205a31a2 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,24 @@
+2002-04-18  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/tmpl/rgb.sgml:
+	* gdk/tmpl/general.sgml:
+	* gtk/tmpl/gtktogglebutton.sgml:
+	* gtk/tmpl/gtkaccellabel.sgml:
+	* gtk/tmpl/gtkradiobutton.sgml:
+	* gtk/tmpl/gtktreemodel.sgml:
+	* gtk/tmpl/gtkwidget.sgml:
+	* gtk/tmpl/gtkimage.sgml:
+	* gtk/tmpl/gtktooltips.sgml:
+	* gtk/tmpl/gtksignal.sgml:
+	* gtk/tmpl/gtkcombo.sgml:
+	* gtk/tmpl/gtkdnd.sgml:
+	* gtk/tmpl/gtksocket.sgml:
+	* gtk/tmpl/gtkdrawingarea.sgml:
+	* gtk/tmpl/gtkobject.sgml:
+	* gtk/tmpl/gtkpaned.sgml:
+	* gtk/tmpl/gtkmain.sgml: s/<!>/<!-- -->/g throughout the
+	documentation to bring the produced Docbook closer to XML.
+
 Tue Mar 26 15:41:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/building.sgml: Add a mention of running ldconfig.
diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index 944e08eac3..49f64d86d8 100644
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -348,14 +348,14 @@ avoid the X error in any other way.
 <example>
 <title>Trapping an X error.</title>
 <programlisting>
-  gdk_error_trap_push (<!>);
+  gdk_error_trap_push (<!-- -->);
 
   /* ... Call the X function which may cause an error here ... */
 
   /* Flush the X queue to catch errors now. */
-  gdk_flush (<!>);
+  gdk_flush (<!-- -->);
 
-  if (gdk_error_trap_pop (<!>))
+  if (gdk_error_trap_pop (<!-- -->))
     {
       /* ... Handle the error here ... */
     }
diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml
index f5178cf15e..0b1a7af0da 100644
--- a/docs/reference/gdk/tmpl/rgb.sgml
+++ b/docs/reference/gdk/tmpl/rgb.sgml
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
   gtk_init (&amp;argc, &amp;argv);
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  darea = gtk_drawing_area_new (<!>);
+  darea = gtk_drawing_area_new (<!-- -->);
   gtk_widget_set_size_request (darea, IMAGE_WIDTH, IMAGE_HEIGHT);
   gtk_container_add (GTK_CONTAINER (window), darea);
   gtk_signal_connect (GTK_OBJECT (darea), "expose-event",
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
 	}
     }
 
-  gtk_main (<!>);
+  gtk_main (<!-- -->);
   return 0;
 }
 
diff --git a/docs/reference/gtk/tmpl/gtkaccellabel.sgml b/docs/reference/gtk/tmpl/gtkaccellabel.sgml
index 7d69ffd5ca..91249a510c 100644
--- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccellabel.sgml
@@ -43,7 +43,7 @@ though it is almost always used to display just one accelerator key.
   GtkAccelGroup *accel_group;
 
   /* Create a #GtkAccelGroup and add it to the window. */
-  accel_group = gtk_accel_group_new (<!>);
+  accel_group = gtk_accel_group_new (<!-- -->);
   gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
 
   /* Create the menu item using the convenience function. */
@@ -52,7 +52,7 @@ though it is almost always used to display just one accelerator key.
   gtk_container_add (GTK_CONTAINER (menu), save_item);
 
   /* Now add the accelerator to the GtkMenuItem. Note that since we called
-     gtk_menu_item_new_with_label(<!>) to create the GtkMenuItem the
+     gtk_menu_item_new_with_label(<!-- -->) to create the GtkMenuItem the
      GtkAccelLabel is automatically set up to display the GtkMenuItem
      accelerators. We just need to make sure we use GTK_ACCEL_VISIBLE here. */
   gtk_widget_add_accelerator (save_item, "activate", accel_group,
diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml
index cddb29b0b6..59be2856f4 100644
--- a/docs/reference/gtk/tmpl/gtkcombo.sgml
+++ b/docs/reference/gtk/tmpl/gtkcombo.sgml
@@ -46,7 +46,7 @@ items.</title>
   items = g_list_append (items, "Fourth Item");
   items = g_list_append (items, "Fifth Item");
 
-  combo = gtk_combo_new (<!>);
+  combo = gtk_combo_new (<!-- -->);
   gtk_combo_set_popdown_strings (GTK_COMBO (combo), items);
 </programlisting>
 </example>
@@ -56,9 +56,9 @@ items.</title>
 <programlisting>
   GtkWidget *combo, *item, *hbox, *arrow, *label;
 
-  combo = gtk_combo_new (<!>);
+  combo = gtk_combo_new (<!-- -->);
 
-  item = gtk_list_item_new (<!>);
+  item = gtk_list_item_new (<!-- -->);
   gtk_widget_show (item);
 
   /* You can put almost anything into the GtkListItem widget. Here we will use
diff --git a/docs/reference/gtk/tmpl/gtkdnd.sgml b/docs/reference/gtk/tmpl/gtkdnd.sgml
index 98a4e08c39..02527509d7 100644
--- a/docs/reference/gtk/tmpl/gtkdnd.sgml
+++ b/docs/reference/gtk/tmpl/gtkdnd.sgml
@@ -78,7 +78,7 @@ Sets a widget as a potential drop destination.
  on behalf of a widget for drops onto that widget. The @targets
  and @actions fields only are used if %GTK_DEST_DEFAULT_MOTION
  or %GTK_DEST_DEFAULT_DROP are given.
-@targets: a pointer to an array of #GtkTargetEntry<!>s indicating
+@targets: a pointer to an array of #GtkTargetEntry<!-- -->s indicating
  the drop types that this widget will accept.
 @n_targets: the number of entries in @targets.
 @actions: a bitmask of possible actions for a drop onto this
diff --git a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
index 9b686dd64a..9757c2a863 100644
--- a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
+++ b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
@@ -64,7 +64,7 @@ expose_event_callback (GdkWidget *widget, GdkEventExpose *event, gpointer data)
   return TRUE;
 }
 [...]
-  GtkWidget *drawing_area = gtk_drawing_area_new (<!>);
+  GtkWidget *drawing_area = gtk_drawing_area_new (<!-- -->);
   gtk_widget_set_size_request (drawing_area, 100, 100);
   g_signal_connect (G_OBJECT (drawing_area), "expose_event",  
                     G_CALLBACK (expose_event_callback), NULL);
diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml
index 26d20c525d..cb473615cf 100644
--- a/docs/reference/gtk/tmpl/gtkimage.sgml
+++ b/docs/reference/gtk/tmpl/gtkimage.sgml
@@ -64,7 +64,7 @@ on the image, such as button clicks, place the image inside a
 
     image = gtk_image_new_from_file ("myfile.png");
 
-    event_box = gtk_event_box_new (<!>);
+    event_box = gtk_event_box_new (<!-- -->);
 
     gtk_container_add (GTK_CONTAINER (event_box), image);
 
diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index 4f738f6c4d..9e96f7bb5a 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -46,7 +46,7 @@ int
 main (int argc, char **argv)
 {
   /* Initialize i18n support */
-  gtk_set_locale (<!>);
+  gtk_set_locale (<!-- -->);
 
   /* Initialize the widget set */
   gtk_init (&amp;argc, &amp;argv);
@@ -61,7 +61,7 @@ main (int argc, char **argv)
   gtk_widget_show_all (mainwin);
 
   /* Enter the main event loop, and wait for user interaction */
-  gtk_main (<!>);
+  gtk_main (<!-- -->);
 
   /* The user lost interest */
   return 0;
@@ -171,8 +171,8 @@ and invoke timeouts etc. while doing some time intensive computation.
 <programlisting>
 	/* computation going on */
 ...
-        while (gtk_events_pending (<!>))
-	  gtk_main_iteration (<!>);
+        while (gtk_events_pending (<!-- -->))
+	  gtk_main_iteration (<!-- -->);
 ...
 	/* computation continued */
 </programlisting>
@@ -334,7 +334,7 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (win), but);
 
   gtk_widget_show_all (win);
-  gtk_main (<!>);
+  gtk_main (<!-- -->);
   return 0;
 }
 </programlisting>
diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml
index e7d68589ec..1a948be38e 100644
--- a/docs/reference/gtk/tmpl/gtkobject.sgml
+++ b/docs/reference/gtk/tmpl/gtkobject.sgml
@@ -39,7 +39,7 @@ it called g_object_ref()), and the child widget has no floating reference.
 The purpose of the floating reference is to keep the child widget alive 
 until you add it to a parent container:
 <informalexample><programlisting>
-   button = gtk_button_new (<!>);
+   button = gtk_button_new (<!-- -->);
    /* button has one floating reference to keep it alive */
    gtk_container_add (GTK_CONTAINER (container), button);
    /* button has one non-floating reference owned by the container */
diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml
index e731c2038c..2bfa3e5c27 100644
--- a/docs/reference/gtk/tmpl/gtkpaned.sgml
+++ b/docs/reference/gtk/tmpl/gtkpaned.sgml
@@ -47,7 +47,7 @@ gtk_paned_set_position().
 <example>
 <title>Creating a paned widget with minimum sizes.</title>
 <programlisting>
-GtkWidget *hpaned = gtk_hpaned_new (<!>);
+GtkWidget *hpaned = gtk_hpaned_new (<!-- -->);
 GtkWidget *frame1 = gtk_frame_new (NULL);
 GtkWidget *frame2 = gtk_frame_new (NULL);
 gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_IN);
diff --git a/docs/reference/gtk/tmpl/gtkradiobutton.sgml b/docs/reference/gtk/tmpl/gtkradiobutton.sgml
index d3117b4c8a..6ca8c201e3 100644
--- a/docs/reference/gtk/tmpl/gtkradiobutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkradiobutton.sgml
@@ -48,7 +48,7 @@ void create_radio_buttons (void) {
    
    /* Create a radio button with a GtkEntry widget */
    radio1 = gtk_radio_button_new (NULL);
-   entry = gtk_entry_new (<!>);
+   entry = gtk_entry_new (<!-- -->);
    gtk_container_add (GTK_CONTAINER (radio1), entry);
    
    
diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml
index 3d391d7e59..edb7b8b71c 100644
--- a/docs/reference/gtk/tmpl/gtksignal.sgml
+++ b/docs/reference/gtk/tmpl/gtksignal.sgml
@@ -8,7 +8,7 @@ Object methods and callbacks.
 <para>
 The GTK+ signal system merely proxies the GLib signal system now. For future 
 usage, direct use of the <link linkend="gobject-Signals">GSignal</link> API is recommended, this avoids significant 
-performance hits where #GtkArg structures have to be converted into #GValue<!>s.
+performance hits where #GtkArg structures have to be converted into #GValue<!-- -->s.
 </para>
 
 <refsect2>
diff --git a/docs/reference/gtk/tmpl/gtksocket.sgml b/docs/reference/gtk/tmpl/gtksocket.sgml
index 579105672d..38e6fe9fd9 100644
--- a/docs/reference/gtk/tmpl/gtksocket.sgml
+++ b/docs/reference/gtk/tmpl/gtksocket.sgml
@@ -25,7 +25,7 @@ have been added to its parent.
 <example>
 <title>Obtaining the window ID of a socket.</title>
 <programlisting>
-GtkWidget *socket = gtk_socket_new (<!>);
+GtkWidget *socket = gtk_socket_new (<!-- -->);
 gtk_widget_show (socket);
 gtk_container_add (GTK_CONTAINER (parent), socket);
 
diff --git a/docs/reference/gtk/tmpl/gtktogglebutton.sgml b/docs/reference/gtk/tmpl/gtktogglebutton.sgml
index c14925f8fd..ae72f3a42f 100644
--- a/docs/reference/gtk/tmpl/gtktogglebutton.sgml
+++ b/docs/reference/gtk/tmpl/gtktogglebutton.sgml
@@ -31,7 +31,7 @@ To simply switch the state of a toggle button, use gtk_toggle_button_toggled.
 void make_toggles (void) {
    GtkWidget *dialog, *toggle1, *toggle2;
 
-   dialog = gtk_dialog_new (<!>);
+   dialog = gtk_dialog_new (<!-- -->);
    toggle1 = gtk_toggle_button_new_with_label ("Hi, i'm a toggle button.");
 
    /* Makes this toggle button invisible */
diff --git a/docs/reference/gtk/tmpl/gtktooltips.sgml b/docs/reference/gtk/tmpl/gtktooltips.sgml
index 68e807bb26..b9879da88b 100644
--- a/docs/reference/gtk/tmpl/gtktooltips.sgml
+++ b/docs/reference/gtk/tmpl/gtktooltips.sgml
@@ -38,7 +38,7 @@ Information about the tooltip (if any) associated with an arbitrary widget can b
    GtkWidget *load_button, *save_button, *hbox;
    GtkTooltips *button_bar_tips;
    
-   button_bar_tips = gtk_tooltips_new (<!>);
+   button_bar_tips = gtk_tooltips_new (<!-- -->);
    
    /* Create the buttons and pack them into a GtkHBox */
    hbox = gtk_hbox_new (TRUE, 2);
diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml
index 9c60f905f5..f212888868 100644
--- a/docs/reference/gtk/tmpl/gtktreemodel.sgml
+++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml
@@ -168,7 +168,7 @@ enum
       gchar *str_data;
       gint   int_data;
 
-      /* Make sure you terminate calls to gtk_tree_model_get(<!>)
+      /* Make sure you terminate calls to gtk_tree_model_get(<!-- -->)
        * with a '-1' value
        */
       gtk_tree_model_get (list_store, &amp;iter, 
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index 69ced7b704..192eac6d08 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -26,8 +26,8 @@ Tells about certain properties of the widget.
 </para>
 
 @GTK_TOPLEVEL: 
-        widgets without a real parent, as there are #GtkWindow<!>s and
-        #GtkMenu<!>s have this flag set throughout their lifetime.
+        widgets without a real parent, as there are #GtkWindow<!-- -->s and
+        #GtkMenu<!-- -->s have this flag set throughout their lifetime.
         Toplevel widgets always contain their own #GdkWindow.
 @GTK_NO_WINDOW: 
         Indicative for a widget that does not provide its own #GdkWindow. 
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index db87ce5b8c..689b3952a6 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -427,14 +427,14 @@ gtk_dialog_new_empty (const gchar     *title,
  *
  * Here's a simple example:
  * <informalexample><programlisting>
- *  <!>GtkWidget *dialog = gtk_dialog_new_with_buttons ("My dialog",
- *  <!>                                                 main_app_window,
- *  <!>                                                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- *  <!>                                                 GTK_STOCK_OK,
- *  <!>                                                 GTK_RESPONSE_ACCEPT,
- *  <!>                                                 GTK_STOCK_CANCEL,
- *  <!>                                                 GTK_RESPONSE_REJECT,
- *  <!>                                                 NULL);
+ *  GtkWidget *dialog = gtk_dialog_new_with_buttons ("My dialog",
+ *                                                   main_app_window,
+ *                                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ *                                                   GTK_STOCK_OK,
+ *                                                   GTK_RESPONSE_ACCEPT,
+ *                                                   GTK_STOCK_CANCEL,
+ *                                                   GTK_RESPONSE_REJECT,
+ *                                                   NULL);
  * </programlisting></informalexample>
  * 
  * Return value: a new #GtkDialog
@@ -892,17 +892,17 @@ run_destroy_handler (GtkDialog *dialog, gpointer data)
  *
  * Typical usage of this function might be:
  * <informalexample><programlisting>
- * <!>  gint result = gtk_dialog_run (GTK_DIALOG (dialog));
- * <!>  switch (result)
- * <!>    {
- * <!>      case GTK_RESPONSE_ACCEPT:
- * <!>         do_application_specific_something (<!-- -->);
- * <!>         break;
- * <!>      default:
- * <!>         do_nothing_since_dialog_was_cancelled (<!-- -->);
- * <!>         break;
- * <!>    }
- * <!>  gtk_widget_destroy (dialog);
+ *   gint result = gtk_dialog_run (GTK_DIALOG (dialog));
+ *   switch (result)
+ *     {
+ *       case GTK_RESPONSE_ACCEPT:
+ *          do_application_specific_something (<!-- -->);
+ *          break;
+ *       default:
+ *          do_nothing_since_dialog_was_cancelled (<!-- -->);
+ *          break;
+ *     }
+ *   gtk_widget_destroy (dialog);
  * </programlisting></informalexample>
  * 
  * Return value: response ID
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 209d5a6b54..985e6c3f4a 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -133,11 +133,11 @@ gtk_icon_factory_finalize (GObject *object)
  * gtk_icon_factory_new:
  *
  * Creates a new #GtkIconFactory. An icon factory manages a collection
- * of #GtkIconSet<!>s; a #GtkIconSet manages a set of variants of a
+ * of #GtkIconSet<!-- -->s; a #GtkIconSet manages a set of variants of a
  * particular icon (i.e. a #GtkIconSet contains variants for different
  * sizes and widget states). Icons in an icon factory are named by a
  * stock ID, which is a simple string identifying the icon. Each
- * #GtkStyle has a list of #GtkIconFactory<!>s derived from the current
+ * #GtkStyle has a list of #GtkIconFactory<!-- -->s derived from the current
  * theme; those icon factories are consulted first when searching for
  * an icon. If the theme doesn't set a particular icon, GTK+ looks for
  * the icon in a list of default icon factories, maintained by
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index adb7d4ecab..d23872879f 100644
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -621,7 +621,7 @@ gtk_item_factory_path_from_widget (GtkWidget	    *widget)
  * gtk_item_factory_create_items:
  * @ifactory: a #GtkItemFactory
  * @n_entries: the length of @entries
- * @entries: an array of #GtkItemFactoryEntry<!>s whose @callback members
+ * @entries: an array of #GtkItemFactoryEntry<!-- -->s whose @callback members
  *    must by of type #GtkItemFactoryCallback1
  * @callback_data: data passed to the callback functions of all entries
  *
@@ -640,7 +640,7 @@ gtk_item_factory_create_items (GtkItemFactory	   *ifactory,
  * gtk_item_factory_create_items_ac:
  * @ifactory: a #GtkItemFactory
  * @n_entries: the length of @entries
- * @entries: an array of #GtkItemFactoryEntry<!>s 
+ * @entries: an array of #GtkItemFactoryEntry<!-- -->s 
  * @callback_data: data passed to the callback functions of all entries
  * @callback_type: 1 if the callback functions in @entries are of type
  *    #GtkItemFactoryCallback1, 2 if they are of type #GtkItemFactoryCallback2 
@@ -1160,7 +1160,7 @@ gtk_item_factory_create_item (GtkItemFactory	     *ifactory,
 /**
  * gtk_item_factory_create_menu_entries:
  * @n_entries: the length of @entries
- * @entries: an array of #GtkMenuEntry<!>s 
+ * @entries: an array of #GtkMenuEntry<!-- -->s 
  *
  * Creates the menu items from the @entries.
  */
@@ -1366,7 +1366,7 @@ gtk_item_factory_delete_entry (GtkItemFactory         *ifactory,
  * gtk_item_factory_delete_entries:
  * @ifactory: a #GtkItemFactory
  * @n_entries: the length of @entries
- * @entries: an array of #GtkItemFactoryEntry<!>s 
+ * @entries: an array of #GtkItemFactoryEntry<!-- -->s 
  *
  * Deletes the menu items which were created from the @entries by the given
  * item factory.
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 8c479b496f..a44c526ce1 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1616,10 +1616,10 @@ gtk_rc_get_style (GtkWidget *widget)
  *
  * The action of gtk_rc_get_style() is similar to:
  * <informalexample><programlisting>
- * <!> gtk_widget_path (widget, NULL, &amp;path, NULL);
- * <!> gtk_widget_class_path (widget, NULL, &amp;class_path, NULL);
- * <!> gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget), path, class_path,
- * <!>                            G_OBJECT_TYPE (widget));
+ *  gtk_widget_path (widget, NULL, &amp;path, NULL);
+ *  gtk_widget_class_path (widget, NULL, &amp;class_path, NULL);
+ *  gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget), path, class_path,
+ *                             G_OBJECT_TYPE (widget));
  * </programlisting></informalexample>
  * 
  * Return value: A style created by matching with the supplied paths,
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 5ac1002d09..d0229155db 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -967,7 +967,7 @@ gtk_draw_shadow (GtkStyle      *style,
  * @window: a #GdkWindow
  * @state_type: a state
  * @shadow_type: type of shadow to draw
- * @points: an array of #GdkPoint<!>s
+ * @points: an array of #GdkPoint<!-- -->s
  * @npoints: length of @points
  * @fill: %TRUE if the polygon should be filled
  * 
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index e516b97603..8d66e9d23b 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -879,9 +879,9 @@ gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
  * index is 0.  If @index is too big, or @parent has no children, @iter is set
  * to an invalid iterator and %FALSE is returned.  @parent will remain a valid
  * node after this function has been called.  As a special case, if @parent is
- * %NULL, then the @n<!>th root node is set.
+ * %NULL, then the @n<!-- -->th root node is set.
  *
- * Return value: %TRUE, if @parent has an @n<!>th child.
+ * Return value: %TRUE, if @parent has an @n<!-- -->th child.
  **/
 gboolean
 gtk_tree_model_iter_nth_child (GtkTreeModel *tree_model,
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index c2e5b2e0f4..3b1c435a63 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1100,18 +1100,18 @@ gtk_tree_view_column_new (void)
  *
  * Here's a simple example:
  * <informalexample><programlisting>
- *  <!>enum { TEXT_COLUMN, COLOR_COLUMN, N_COLUMNS };
- *  <!>...
- *  <!>{
- *  <!>  GtkTreeViewColumn *column;
- *  <!>  GtkCellRenderer   *renderer = gtk_cell_renderer_text_new ();
- *  <!>
- *  <!>  column = gtk_tree_view_column_new_with_attributes ("Title",
- *  <!>                                                     renderer,
- *  <!>                                                     "text", TEXT_COLUMN,
- *  <!>                                                     "foreground", COLOR_COLUMN,
- *  <!>                                                     NULL);
- *  <!>}
+ *  enum { TEXT_COLUMN, COLOR_COLUMN, N_COLUMNS };
+ *  ...
+ *  {
+ *    GtkTreeViewColumn *column;
+ *    GtkCellRenderer   *renderer = gtk_cell_renderer_text_new (<!-- -->);
+ *  
+ *    column = gtk_tree_view_column_new_with_attributes ("Title",
+ *                                                       renderer,
+ *                                                       "text", TEXT_COLUMN,
+ *                                                       "foreground", COLOR_COLUMN,
+ *                                                       NULL);
+ *  }
  * </programlisting></informalexample>
  * 
  * Return value: A newly created #GtkTreeViewColumn.
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index b416c11c93..28667edb37 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5017,13 +5017,13 @@ gtk_widget_set_extension_events (GtkWidget *widget,
  * To reliably find the toplevel #GtkWindow, use
  * gtk_widget_get_toplevel() and check if the %TOPLEVEL flags
  * is set on the result.
- *  <informalexample><programlisting>
- *  <!>GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
- *  <!>if (GTK_WIDGET_TOPLEVEL (toplevel))
- *  <!> {
- *  <!>   [ Perform action on toplevel. ]
- *  <!> }
- *  </programlisting></informalexample>
+ * <informalexample><programlisting>
+ *  GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
+ *  if (GTK_WIDGET_TOPLEVEL (toplevel))
+ *    {
+ *      [ Perform action on toplevel. ]
+ *    }
+ * </programlisting></informalexample>
  *
  * Return value: the topmost ancestor of @widget, or @widget itself if there's no ancestor.
  **/
@@ -5336,13 +5336,13 @@ gtk_widget_get_composite_name (GtkWidget *widget)
  * 
  * Here is a simple example:
  * <informalexample><programlisting>
- * <!>  gtk_widget_push_composite_child (<!>);
- * <!>  scrolled_window->hscrollbar = gtk_hscrollbar_new (hadjustment);
- * <!>  gtk_widget_set_composite_name (scrolled_window->hscrollbar, "hscrollbar");
- * <!>  gtk_widget_pop_composite_child (<!>);
- * <!>  gtk_widget_set_parent (scrolled_window->hscrollbar, 
- * <!>                         GTK_WIDGET (scrolled_window));
- * <!>  gtk_widget_ref (scrolled_window->hscrollbar);
+ *   gtk_widget_push_composite_child (<!-- -->);
+ *   scrolled_window->hscrollbar = gtk_hscrollbar_new (hadjustment);
+ *   gtk_widget_set_composite_name (scrolled_window->hscrollbar, "hscrollbar");
+ *   gtk_widget_pop_composite_child (<!-- -->);
+ *   gtk_widget_set_parent (scrolled_window->hscrollbar, 
+ *                          GTK_WIDGET (scrolled_window));
+ *   gtk_widget_ref (scrolled_window->hscrollbar);
  * </programlisting></informalexample>
  **/
 void