diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index ca3eec9b46..46ea74b847 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,16 @@
+2002-12-11  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/tmpl/pixmaps.sgml: Make "GdkPixmap" a valid id to reduce
+	dangling links.
+
+	* gdk/tmpl/windows.sgml: Make "GdkWindow" a valid id to reduce
+	dangling links.
+
+	* gdk/tmpl/drawing.sgml: Make "GdkDrawable" a valid id to reduce
+	dangling links.
+
+	* gdk/tmpl/gcs.sgml: Make "GdkGC" a valid id to reduce dangling links.
+
 2002-12-10  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/tmpl/gtktextview.sgml: Add docs.
diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml
index 6599ce8de5..45f1725b01 100644
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/docs/reference/gdk/tmpl/drawing.sgml
@@ -26,7 +26,7 @@ more information.
 </para>
 
 <!-- ##### STRUCT GdkDrawable ##### -->
-<para>
+<para><anchor id="GdkDrawable"/>
 An opaque structure representing an object that can be
 drawn onto. This can be a #GdkPixmap, a #GdkBitmap,
 or a #GdkWindow.
diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml
index 8a60b59578..98726e385a 100644
--- a/docs/reference/gdk/tmpl/gcs.sgml
+++ b/docs/reference/gdk/tmpl/gcs.sgml
@@ -31,7 +31,7 @@ be set by the latter method.
 </para>
 
 <!-- ##### STRUCT GdkGC ##### -->
-<para>
+<para><anchor id="GdkGC"/>
 The #GdkGC structure represents a graphics context.
 It is an opaque structure with no user-visible
 elements.
diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml
index b2f14b98fa..67a41cc21b 100644
--- a/docs/reference/gdk/tmpl/pixmaps.sgml
+++ b/docs/reference/gdk/tmpl/pixmaps.sgml
@@ -19,7 +19,7 @@ pixel can be either on or off).
 </para>
 
 <!-- ##### STRUCT GdkPixmap ##### -->
-<para>
+<para><anchor id="GdkPixmap"/>
 An opaque structure representing an offscreen drawable.
 Pointers to structures of type #GdkPixmap, #GdkBitmap,
 and #GdkWindow, can often be used interchangeably. 
@@ -33,14 +33,16 @@ these types.
 Create a new pixmap with a given size and depth.
 </para>
 
-@window: a #GdkWindow, used to determine default values for the
-  new pixmap. Can be %NULL if @depth is specified,
+@drawable: 
 @width: The width of the new pixmap in pixels.
 @height: The height of the new pixmap in pixels.
 @depth: The depth (number of bits per pixel) of the new pixmap. 
   If -1, and @window is not %NULL, the depth of the new
   pixmap will be equal to that of @window.
 @Returns: the #GdkPixmap
+<!-- # Unused Parameters # -->
+@window: a #GdkWindow, used to determine default values for the
+  new pixmap. Can be %NULL if @depth is specified,
 
 
 <!-- ##### FUNCTION gdk_bitmap_create_from_data ##### -->
@@ -48,13 +50,15 @@ Create a new pixmap with a given size and depth.
 Creates a new bitmap from data in XBM format.
 </para>
 
-@window: a #GdkWindow, used to determine default values for the
-  new pixmap. Can be %NULL, in which case the root window is
-  used.
+@drawable: 
 @data: a pointer to the XBM data.
 @width: the width of the new pixmap in pixels.
 @height: the height of the new pixmap in pixels.
 @Returns: the #GdkBitmap
+<!-- # Unused Parameters # -->
+@window: a #GdkWindow, used to determine default values for the
+  new pixmap. Can be %NULL, in which case the root window is
+  used.
 
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_data ##### -->
@@ -62,8 +66,7 @@ Creates a new bitmap from data in XBM format.
 Create a two-color pixmap from data in XBM data.
 </para>
 
-@window: a #GdkWindow, used to determine default values for the
-  new pixmap. Can be %NULL, if the depth is given.
+@drawable: 
 @data: a pointer to the data.
 @width: the width of the new pixmap in pixels.
 @height: the height of the new pixmap in pixels.
@@ -71,6 +74,9 @@ Create a two-color pixmap from data in XBM data.
 @fg: the foreground color.
 @bg: the background color.
 @Returns: the #GdkPixmap
+<!-- # Unused Parameters # -->
+@window: a #GdkWindow, used to determine default values for the
+  new pixmap. Can be %NULL, if the depth is given.
 
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_xpm ##### -->
@@ -78,8 +84,7 @@ Create a two-color pixmap from data in XBM data.
 Create a pixmap from a XPM file.
 </para>
 
-@window: a #GdkWindow, used to determine default values for the
-  new pixmap.
+@drawable: 
 @mask: a pointer to a place to store a bitmap representing
 the transparency mask of the XPM file. Can be %NULL,
 in which case transparency will be ignored.
@@ -88,6 +93,9 @@ that are transparent in the input file. Can be %NULL,
 in which case a default color will be used.
 @filename: the filename of a file containing XPM data.
 @Returns: the #GdkPixmap
+<!-- # Unused Parameters # -->
+@window: a #GdkWindow, used to determine default values for the
+  new pixmap.
 
 
 <!-- ##### FUNCTION gdk_pixmap_colormap_create_from_xpm ##### -->
@@ -95,8 +103,7 @@ in which case a default color will be used.
 Create a pixmap from a XPM file using a particular colormap.
 </para>
 
-@window: a #GdkWindow, used to determine default values for the
-  new pixmap. Can be %NULL if @colormap is given.
+@drawable: 
 @colormap: the #GdkColormap that the new pixmap will be use.
   If omitted, the colormap for @window will be used.
 @mask: a pointer to a place to store a bitmap representing
@@ -107,6 +114,9 @@ that are transparent in the input file. Can be %NULL,
 in which case a default color will be used.
 @filename: the filename of a file containing XPM data.
 @Returns: the #GdkPixmap.
+<!-- # Unused Parameters # -->
+@window: a #GdkWindow, used to determine default values for the
+  new pixmap. Can be %NULL if @colormap is given.
 
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_xpm_d ##### -->
@@ -114,8 +124,7 @@ in which case a default color will be used.
 Create a pixmap from data in XPM format.
 </para>
 
-@window: a #GdkWindow, used to determine default values for the
-  new pixmap.
+@drawable: 
 @mask: Pointer to a place to store a bitmap representing
 the transparency mask of the XPM file. Can be %NULL,
 in which case transparency will be ignored.
@@ -124,6 +133,9 @@ that are transparent in the input file. Can be %NULL
 in which case a default color will be used.
 @data: Pointer to a string containing the XPM data.
 @Returns: the #GdkPixmap
+<!-- # Unused Parameters # -->
+@window: a #GdkWindow, used to determine default values for the
+  new pixmap.
 
 
 <!-- ##### FUNCTION gdk_pixmap_colormap_create_from_xpm_d ##### -->
@@ -132,8 +144,7 @@ Create a pixmap from data in XPM format using a particular
 colormap.
 </para>
 
-@window: a #GdkWindow, used to determine default values for the
-  new pixmap. Can be %NULL if @colormap is given.
+@drawable: 
 @colormap: the #GdkColormap that the new pixmap will be use.
   If omitted, the colormap for @window will be used.
 @mask: a pointer to a place to store a bitmap representing
@@ -144,6 +155,9 @@ that are transparent in the input file. Can be %NULL,
 in which case a default color will be used.
 @data: Pointer to a string containing the XPM data.
 @Returns: the #GdkPixmap.
+<!-- # Unused Parameters # -->
+@window: a #GdkWindow, used to determine default values for the
+  new pixmap. Can be %NULL if @colormap is given.
 
 
 <!-- ##### MACRO gdk_pixmap_ref ##### -->
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index 389a116cda..9120ec77e2 100644
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -19,7 +19,7 @@ For example, each #GtkButton has a #GdkWindow associated with it.
 </para>
 
 <!-- ##### STRUCT GdkWindow ##### -->
-<para>
+<para><anchor id="GdkWindow"/>
 An opaque structure representing an onscreen drawable.
 Pointers to structures of type #GdkPixmap, #GdkBitmap,
 and #GdkWindow, can often be used interchangeably.