diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 2827fd66ad..4a4f0099d5 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,19 @@
+2003-06-24  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtk-docs.sgml: Move GtkIMContext to "Abstract Base Classes", since its abstract.
+
+	* gtk/tmpl/gtkaccessible.sgml: 
+	* gtk/tmpl/gtkimmulticontext.sgml: 
+	* gtk/tmpl/gtkimcontextsimple.sgml: 
+	* gtk/tmpl/gtkimcontext.sgml: 
+	* gtk/tmpl/gtkviewport.sgml: 
+	* gtk/tmpl/gtkcellrenderertext.sgml: 
+	* gtk/tmpl/gtkcellrendererpixbuf.sgml: 
+	* gtk/tmpl/gtkcelleditable.sgml: 
+	* gtk/tmpl/gtktreemodelsort.sgml: 
+	* gtk/tmpl/gtktreednd.sgml: 
+	* gtk/tmpl/gtktreesortable.sgml: Add short descriptions.
+
 2003-06-23  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/Makefile.am (HTML_IMAGES): Add RTL variants of stock icons.
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 017e0815d7..eff8daba74 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -425,7 +425,6 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkDrawingArea;
         &GtkEventBox;
         &GtkHandleBox;
-        &GtkIMContext;
         &GtkIMContextSimple;
         &GtkIMMulticontext;
         &GtkSizeGroup;
@@ -449,6 +448,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkScrollbar;
         &GtkSeparator;
         &GtkWidget;
+        &GtkIMContext;
     </chapter>    
 
     <chapter id="PlugSocket">
diff --git a/docs/reference/gtk/tmpl/gtkaccessible.sgml b/docs/reference/gtk/tmpl/gtkaccessible.sgml
index f05ec86a8b..9ed1f8a15a 100644
--- a/docs/reference/gtk/tmpl/gtkaccessible.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccessible.sgml
@@ -2,7 +2,7 @@
 GtkAccessible
 
 <!-- ##### SECTION Short_Description ##### -->
-
+Accessibility support for widgets
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkcelleditable.sgml b/docs/reference/gtk/tmpl/gtkcelleditable.sgml
index ec8aae0d54..90c5e266fa 100644
--- a/docs/reference/gtk/tmpl/gtkcelleditable.sgml
+++ b/docs/reference/gtk/tmpl/gtkcelleditable.sgml
@@ -2,7 +2,7 @@
 GtkCellEditable
 
 <!-- ##### SECTION Short_Description ##### -->
-
+Interface for widgets which can are used for editing cells 
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
index 9edecfad3c..ad20d1c39e 100644
--- a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
@@ -2,7 +2,7 @@
 GtkCellRendererPixbuf
 
 <!-- ##### SECTION Short_Description ##### -->
-
+Renders a pixbuf in a cell
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
index c0b05209c1..1b569d4680 100644
--- a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
@@ -2,7 +2,7 @@
 GtkCellRendererText
 
 <!-- ##### SECTION Short_Description ##### -->
-
+Renders text in a cell
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
index c0077d4a8b..769c3c542d 100644
--- a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
@@ -2,7 +2,7 @@
 GtkCellRendererToggle
 
 <!-- ##### SECTION Short_Description ##### -->
-
+Renders a toggle button in a cell
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkimcontext.sgml b/docs/reference/gtk/tmpl/gtkimcontext.sgml
index 554b20d2d3..ab552bce78 100644
--- a/docs/reference/gtk/tmpl/gtkimcontext.sgml
+++ b/docs/reference/gtk/tmpl/gtkimcontext.sgml
@@ -2,7 +2,7 @@
 GtkIMContext
 
 <!-- ##### SECTION Short_Description ##### -->
-
+Base class for input method contexts 
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml b/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml
index fdf406ed30..0a0a4a8641 100644
--- a/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml
+++ b/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml
@@ -2,7 +2,7 @@
 GtkIMContextSimple
 
 <!-- ##### SECTION Short_Description ##### -->
-
+An input method context supporting table-based input methods
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkimmulticontext.sgml b/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
index 8a70aa8593..4b5436b72c 100644
--- a/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
+++ b/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
@@ -2,7 +2,7 @@
 GtkIMMulticontext
 
 <!-- ##### SECTION Short_Description ##### -->
-
+An input method context supporting multiple, loadable input methods
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtktreednd.sgml b/docs/reference/gtk/tmpl/gtktreednd.sgml
index 9414655b6b..4b19f634a7 100644
--- a/docs/reference/gtk/tmpl/gtktreednd.sgml
+++ b/docs/reference/gtk/tmpl/gtktreednd.sgml
@@ -2,7 +2,7 @@
 GtkTreeView drag-and-drop
 
 <!-- ##### SECTION Short_Description ##### -->
-
+Interfaces for drag-and-drop support in GtkTreeView
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml
index 1bea6a9297..7f6bd3cd3b 100644
--- a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml
+++ b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml
@@ -2,7 +2,7 @@
 GtkTreeModelSort
 
 <!-- ##### SECTION Short_Description ##### -->
-
+A wrapper which makes an underlying tree model sortable
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtktreesortable.sgml b/docs/reference/gtk/tmpl/gtktreesortable.sgml
index 1c9cf1e2ab..f0c0b658fd 100644
--- a/docs/reference/gtk/tmpl/gtktreesortable.sgml
+++ b/docs/reference/gtk/tmpl/gtktreesortable.sgml
@@ -1,8 +1,8 @@
 <!-- ##### SECTION Title ##### -->
-GtkTreeSortable
+GtkTreeSortable 
 
 <!-- ##### SECTION Short_Description ##### -->
-
+The interface for sortable models used by GtkTreeView
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkviewport.sgml b/docs/reference/gtk/tmpl/gtkviewport.sgml
index f001d3cf91..81d3acf89c 100644
--- a/docs/reference/gtk/tmpl/gtkviewport.sgml
+++ b/docs/reference/gtk/tmpl/gtkviewport.sgml
@@ -2,7 +2,7 @@
 GtkViewport
 
 <!-- ##### SECTION Short_Description ##### -->
-
+An adapter which makes widgets scrollable
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>