Document GdkScreen.

	* gdk/tmpl/windows.sgml: Document GdkScreen.

	* gtk/gtk-sections.txt: Move a few Class structs to Standard sections.

	* gtk/tmpl/gtktreemodel.sgml, gtk/tmpl/gtkprogress.sgml,
	gtk/tmpl/gtksignal.sgml, gtk/tmpl/gtkimage.sgml: Generate proper
	markup for format strings in examples, also fix an oversight in
	the GtkTreeModel example.  (#74213)

7 files changed, 85 insertions, 30 deletions

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index f947049f6..d0117afe7 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,16 @@
+2002-03-12  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/tmpl/windows.sgml: Document GdkScreen.
+
+	* gtk/gtk-sections.txt: Move a few Class structs to Standard sections.
+
 2002-03-11  Matthias Clasen  <maclas@gmx.de>
 
+	* gtk/tmpl/gtktreemodel.sgml, gtk/tmpl/gtkprogress.sgml,
+	gtk/tmpl/gtksignal.sgml, gtk/tmpl/gtkimage.sgml: Generate proper
+	markup for format strings in examples, also fix an oversight in
+	the GtkTreeModel example.  (#74213)
+
 	* gtk/gtk.types: Add interfaces to get docs on their signals.
 
 Sat Mar  9 13:00:38 2002  Jonathan Blandford  <jrb@redhat.com>
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index 064a73395..287865b66 100644
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -240,7 +240,9 @@ corresponding flag in #GdkWindowAttributesType.
 
 <!-- ##### STRUCT GdkScreen ##### -->
 <para>
-
+This is a currently just a placeholder typedef for the first argument of 
+the @window_at_pointer function in #GdkPointerHooks. It will be used
+when GDK gets multihead support. 
 </para>
 
 
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index df35d89d2..b7b646047 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -1169,7 +1169,6 @@ GtkImageAnimationData
 <FILE>gtkimagemenuitem</FILE>
 <TITLE>GtkImageMenuItem</TITLE>
 GtkImageMenuItem
-GtkImageMenuItemClass
 gtk_image_menu_item_set_image
 gtk_image_menu_item_get_image
 gtk_image_menu_item_new
@@ -1177,6 +1176,7 @@ gtk_image_menu_item_new_from_stock
 gtk_image_menu_item_new_with_label
 gtk_image_menu_item_new_with_mnemonic
 <SUBSECTION Standard>
+GtkImageMenuItemClass
 GTK_IMAGE_MENU_ITEM
 GTK_IMAGE_MENU_ITEM_CLASS
 GTK_IMAGE_MENU_ITEM_GET_CLASS
@@ -2101,7 +2101,6 @@ gtk_separator_menu_item_get_type
 <FILE>gtksettings</FILE>
 <TITLE>GtkSettings</TITLE>
 GtkSettings
-GtkSettingsClass
 GtkSettingsValue
 gtk_settings_get_default
 gtk_settings_install_property
@@ -2116,6 +2115,7 @@ gtk_settings_set_string_property
 gtk_settings_set_long_property
 gtk_settings_set_double_property
 <SUBSECTION Standard>
+GtkSettingsClass
 GTK_IS_SETTINGS
 GTK_IS_SETTINGS_CLASS
 GTK_SETTINGS
@@ -2582,7 +2582,6 @@ gtk_text_view_starts_display_line
 gtk_text_view_move_visually
 gtk_text_view_add_child_at_anchor
 GtkTextChildAnchor
-GtkTextChildAnchorClass
 gtk_text_child_anchor_new
 gtk_text_child_anchor_get_widgets
 gtk_text_child_anchor_get_deleted
@@ -2619,6 +2618,7 @@ GTK_TYPE_TEXT_VIEW
 GTK_TEXT_VIEW_CLASS
 GTK_IS_TEXT_VIEW_CLASS
 GTK_TEXT_VIEW_GET_CLASS
+GtkTextChildAnchorClass
 GTK_TEXT_CHILD_ANCHOR
 GTK_IS_TEXT_CHILD_ANCHOR
 GTK_TYPE_TEXT_CHILD_ANCHOR
@@ -3839,7 +3839,6 @@ gtk_gc_release
 <TITLE>GtkStyle</TITLE>
 GTK_STYLE_ATTACHED
 GtkStyle
-GtkStyleClass
 gtk_style_new
 gtk_style_copy
 gtk_style_attach
@@ -3906,6 +3905,7 @@ GtkRcProperty
 GtkRcPropertyParser
 
 <SUBSECTION Standard>
+GtkStyleClass
 GTK_STYLE
 GTK_IS_STYLE
 GTK_TYPE_STYLE
@@ -3935,7 +3935,6 @@ gtk_theme_engine_get_type
 <FILE>gtkrc</FILE>
 <TITLE>Resource Files</TITLE>
 GtkRcStyle
-GtkRcStyleClass
 GtkRcFlags
 GtkRcTokenType
 gtk_rc_scanner_new
@@ -3966,6 +3965,7 @@ gtk_rc_style_ref
 gtk_rc_style_unref
 
 <SUBSECTION Standard>
+GtkRcStyleClass
 GTK_RC_STYLE
 GTK_IS_RC_STYLE
 GTK_TYPE_RC_STYLE
diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml
index 2010765af..26d20c525 100644
--- a/docs/reference/gtk/tmpl/gtkimage.sgml
+++ b/docs/reference/gtk/tmpl/gtkimage.sgml
@@ -45,7 +45,7 @@ on the image, such as button clicks, place the image inside a
                          GdkEventButton *event,
                          gpointer        data)
   {
-    g_print ("Event box clicked at coordinates %%d,%%d\n", 
+    g_print ("Event box clicked at coordinates &percent;d,&percent;d\n", 
              event->x, event->y);
 
     /* Returning TRUE means we handled the event, so the signal 
diff --git a/docs/reference/gtk/tmpl/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml
index ee1294db5..cd7638149 100644
--- a/docs/reference/gtk/tmpl/gtkprogress.sgml
+++ b/docs/reference/gtk/tmpl/gtkprogress.sgml
@@ -53,22 +53,22 @@ current progress.  The string can contain the following substitution characters:
 <itemizedlist>
 <listitem>
 <para>
-%%v - the current progress value.
+&percent;v - the current progress value.
 </para>
 </listitem>
 <listitem>
 <para>
-%%l - the lower bound for the progress value.
+&percent;l - the lower bound for the progress value.
 </para>
 </listitem>
 <listitem>
 <para>
-%%u - the upper bound for the progress value.
+&percent;u - the upper bound for the progress value.
 </para>
 </listitem>
 <listitem>
 <para>
-%%p - the current progress percentage.
+&percent;p - the current progress percentage.
 </para>
 </listitem>
 </itemizedlist>
diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml
index b5787dbe1..3d391d7e5 100644
--- a/docs/reference/gtk/tmpl/gtksignal.sgml
+++ b/docs/reference/gtk/tmpl/gtksignal.sgml
@@ -450,7 +450,7 @@ as parameter to your function:
 <programlisting>
 static void button_clicked_int (GtkButton* button, gpointer func_data)
 {
-	g_print ("button pressed: %%d\n", GPOINTER_TO_INT (func_data));
+	g_print ("button pressed: &percent;d\n", GPOINTER_TO_INT (func_data));
 }
 
 /* By calling this function, you will make the g_print above
diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml
index 83f6caf37..bd3072d38 100644
--- a/docs/reference/gtk/tmpl/gtktreemodel.sgml
+++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml
@@ -103,7 +103,7 @@ the second is much more common, as you often get paths from callbacks.
 <para>
 <example>
 <title>Acquiring a <structname>GtkTreeIter</structname></title>
-<programlisting><![CDATA[
+<programlisting>
 /* Three ways of getting the iter pointing to the location
  */
 {
@@ -112,22 +112,21 @@ the second is much more common, as you often get paths from callbacks.
   GtkTreeIter parent_iter;
 
   /* get the iterator from a string */
-  gtk_tree_model_get_iter_from_string (model, &iter, "3:2:5");
+  gtk_tree_model_get_iter_from_string (model, &amp;iter, "3:2:5");
 
   /* get the iterator from a path */
   path = gtk_tree_path_new_from_string ("3:2:5");
-  gtk_tree_model_get_iter (model, &iter, path);
+  gtk_tree_model_get_iter (model, &amp;iter, path);
   gtk_tree_path_free (path);
 
 
   /* walk the tree to find the iterator */
-  gtk_tree_model_get_nth_child (model, &iter, NULL, 3);
+  gtk_tree_model_get_nth_child (model, &amp;iter, NULL, 3);
   parent_iter = iter;
-  gtk_tree_model_get_nth_child (model, &iter, &parent_iter, 2);
+  gtk_tree_model_get_nth_child (model, &amp;iter, &amp;parent_iter, 2);
   parent_iter = iter;
-  gtk_tree_model_get_nth_child (model, &iter, NULL, 5);
+  gtk_tree_model_get_nth_child (model, &amp;iter, NULL, 5);
 }
-]]>
 </programlisting>
 </example>
 </para>
@@ -140,7 +139,7 @@ it is specific to the #GtkListStore.  For information on how to write
 such a function, see the #GtkListStore documentation.
 <example>
 <title>Reading data from a <structname>GtkTreeModel</structname></title>
-<programlisting><![CDATA[
+<programlisting>
 enum
 {
   STRING_COLUMN,
@@ -159,7 +158,7 @@ enum
   populate_model (list_store);
 
   /* Get the first iter in the list */
-  if (gtk_tree_model_get_iter_first (model, &iter))
+  if (gtk_tree_model_get_iter_first (model, &amp;iter))
     {
       gint row_count = 0;
 
@@ -169,30 +168,28 @@ 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,
-                              STRING_COLUMN, &str_data,
-                              INT_COLUMN, &int_data,
+          gtk_tree_model_get (list_store, &amp;iter, 
+                              STRING_COLUMN, &amp;str_data,
+                              INT_COLUMN, &amp;int_data,
                               -1);
 
           /* Do something with the data */
-          g_print ("Row %d: (%s,%d)\n", row_count, str_data, int_data);
+          g_print ("Row &percent;d: (&percent;s,&percent;d)\n", row_count, str_data, int_data);
           g_free (str_data);
 
           row_count ++;
         }
-      while (gtk_tree_model_iter_next (model, &iter));
+      while (gtk_tree_model_iter_next (model, &amp;iter));
     }
   else
     {
-      /* As gtk_tree_model_get_iter_first returned FALSE, the list is empty */
+      /* As gtk_tree_model_get_iter_first(<!>) returned FALSE, the list is empty */
       g_print ("Model is empty.\n");
     }
 }
-]]>
-
 </programlisting>
 </example>
 </para>
@@ -795,3 +792,48 @@ versions of GTK+.
 @new_order: 
 
 
+<!-- ##### SIGNAL GtkTreeModel::row-changed ##### -->
+<para>
+
+</para>
+
+@treemodel: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### SIGNAL GtkTreeModel::row-deleted ##### -->
+<para>
+
+</para>
+
+@treemodel: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL GtkTreeModel::row-has-child-toggled ##### -->
+<para>
+
+</para>
+
+@treemodel: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### SIGNAL GtkTreeModel::row-inserted ##### -->
+<para>
+
+</para>
+
+@treemodel: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### SIGNAL GtkTreeModel::rows-reordered ##### -->
+<para>
+
+</para>
+
+@treemodel: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
+