diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 60b24c935e..5242f2611a 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct 14 19:16:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtk-sections.txt: Update.
+
+	* gdk/tmpl/images.sgml gtk/tmpl/gtkmain.sgml 
+	gtk/tmpl/gtkselection.sgml: Remove docs that were moved
+	the the C files.
+
 2002-10-14  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk-pixbuf/Makefile.am (dist-hook): 
diff --git a/docs/reference/gdk/tmpl/images.sgml b/docs/reference/gdk/tmpl/images.sgml
index 98cb586a63..bbf71a36e4 100644
--- a/docs/reference/gdk/tmpl/images.sgml
+++ b/docs/reference/gdk/tmpl/images.sgml
@@ -105,17 +105,13 @@ and if that fails then %GDK_IMAGE_NORMAL will be used.
 
 <!-- ##### FUNCTION gdk_image_new_bitmap ##### -->
 <para>
-Creates a new #GdkImage with a depth of 1 from the given data.
-<warning><para>THIS FUNCTION IS INCREDIBLY BROKEN. The passed-in data must 
-be allocated by malloc() (NOT g_malloc()) and will be freed when the 
-image is freed.</para></warning>
 </para>
 
-@visual: the #GdkVisual to use for the image.
-@data: the pixel data.
-@width: the width of the image in pixels.
-@height: the height of the image in pixels.
-@Returns: a new #GdkImage.
+@visual: 
+@data: 
+@width: 
+@height: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_image_get ##### -->
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index fb1cafa36b..a895a307e3 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -4293,6 +4293,8 @@ GtkCurveType
 GtkDeleteType
 GtkDirectionType
 GtkExpanderStyle
+GtkIMPreeditStyle
+GtkIMStatusStyle
 GtkJustification
 GtkMatchType
 GtkMetricType
diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index a78809fd4b..3508632683 100644
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -254,6 +254,11 @@ mouse cursor is.
 
 </para>
 
+<!-- ##### ARG GtkButton:default-outside-border ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkButton:child-displacement-y ##### -->
 <para>
 
@@ -264,8 +269,3 @@ mouse cursor is.
 
 </para>
 
-<!-- ##### ARG GtkButton:default-outside-border ##### -->
-<para>
-
-</para>
-
diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
index 9f985152d9..7b5e72c6ad 100644
--- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
@@ -66,13 +66,13 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
 @Returns: 
 
 
-<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCheckButton:indicator-size ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index 9fafa89c2b..09e1cf873b 100644
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -299,11 +299,6 @@ was clicked.
 
 </para>
 
-<!-- ##### ARG GtkDialog:content-area-border ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkDialog:action-area-border ##### -->
 <para>
 
@@ -314,3 +309,8 @@ was clicked.
 
 </para>
 
+<!-- ##### ARG GtkDialog:content-area-border ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml
index 742b46cab0..a7d5089cd9 100644
--- a/docs/reference/gtk/tmpl/gtkenums.sgml
+++ b/docs/reference/gtk/tmpl/gtkenums.sgml
@@ -142,6 +142,22 @@ widget.
 @GTK_EXPANDER_SEMI_EXPANDED: 
 @GTK_EXPANDER_EXPANDED: 
 
+<!-- ##### ENUM GtkIMPreeditStyle ##### -->
+<para>
+
+</para>
+
+@GTK_IM_PREEDIT_NOTHING: 
+@GTK_IM_PREEDIT_CALLBACK: 
+
+<!-- ##### ENUM GtkIMStatusStyle ##### -->
+<para>
+
+</para>
+
+@GTK_IM_STATUS_NOTHING: 
+@GTK_IM_STATUS_CALLBACK: 
+
 <!-- ##### ENUM GtkJustification ##### -->
 <para>
 Used for justifying the text inside a #GtkLabel widget. (See also
diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index 0dd8d6509d..b36bdbcb47 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -119,19 +119,10 @@ functions such as g_signal_connect().
 
 <!-- ##### FUNCTION gtk_init_check ##### -->
 <para>
-This function does the same work as gtk_init() with only 
-a single change: It does not terminate the program if the GUI can't be 
-initialized. Instead it returns %FALSE on failure.
-</para>
-<para>
-This way the application can fall back to some other means of communication 
-with the user - for example a curses or command line interface.
 </para>
 
-@argc: A reference to the <parameter>argc</parameter> of the 
-<function>main()</function> function.
-@argv: A reference to the <parameter>argv</parameter> of the 
-<function>main()</function> function.
+@argc: 
+@argv: 
 @Returns: 
 
 
diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml
index caa4ee4368..77c9911363 100644
--- a/docs/reference/gtk/tmpl/gtkrange.sgml
+++ b/docs/reference/gtk/tmpl/gtkrange.sgml
@@ -153,11 +153,6 @@ Emitted when the range value changes.
 
 </para>
 
-<!-- ##### ARG GtkRange:stepper-size ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkRange:trough-border ##### -->
 <para>
 
@@ -168,11 +163,6 @@ Emitted when the range value changes.
 
 </para>
 
-<!-- ##### ARG GtkRange:slider-width ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
 <para>
 
@@ -183,3 +173,13 @@ Emitted when the range value changes.
 
 </para>
 
+<!-- ##### ARG GtkRange:stepper-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRange:slider-width ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml
index d2861f1900..8935f1164b 100644
--- a/docs/reference/gtk/tmpl/gtkscale.sgml
+++ b/docs/reference/gtk/tmpl/gtkscale.sgml
@@ -148,13 +148,13 @@ format_value_callback (GtkScale *scale,
 
 </para>
 
-<!-- ##### ARG GtkScale:value-spacing ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkScale:slider-length ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkScale:value-spacing ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
index 330691b466..385cba1265 100644
--- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
@@ -54,22 +54,7 @@ The #GtkScrollbar struct does not contain any public data.
 </para>
 
 
-<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
 <para>
 
 </para>
@@ -79,7 +64,22 @@ The #GtkScrollbar struct does not contain any public data.
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
+<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml
index a3f582ed40..05f91b89cf 100644
--- a/docs/reference/gtk/tmpl/gtkselection.sgml
+++ b/docs/reference/gtk/tmpl/gtkselection.sgml
@@ -286,7 +286,6 @@ called by applications.
 
 <!-- ##### FUNCTION gtk_selection_clear ##### -->
 <para>
-Internal function.
 </para>
 
 @widget: 
diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index 9ebf2d6d86..64cd3bc451 100644
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -391,17 +391,12 @@ Should be used if you wish to perform an action when ever the style of a toolbar
 
 </para>
 
-<!-- ##### ARG GtkToolbar:space-style ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkToolbar:button-relief ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:internal-padding ##### -->
+<!-- ##### ARG GtkToolbar:space-style ##### -->
 <para>
 
 </para>
@@ -411,3 +406,8 @@ Should be used if you wish to perform an action when ever the style of a toolbar
 
 </para>
 
+<!-- ##### ARG GtkToolbar:internal-padding ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml
index 4d4de6b298..2ea9c10945 100644
--- a/docs/reference/gtk/tmpl/gtktreeview.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeview.sgml
@@ -922,12 +922,7 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
+<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
 <para>
 
 </para>
@@ -942,7 +937,12 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
+<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index ab7a967a57..fbafa97ecc 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -2203,22 +2203,7 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:cursor-color ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:interior-focus ##### -->
+<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
 <para>
 
 </para>
@@ -2228,7 +2213,12 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
-<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
+<!-- ##### ARG GtkWidget:interior-focus ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:cursor-color ##### -->
 <para>
 
 </para>
@@ -2238,3 +2228,13 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
+<!-- ##### ARG GtkWidget:focus-padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
+<para>
+
+</para>
+