diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml
index e22f5bdee5..4a14ce950f 100644
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -17,44 +17,28 @@
   <reference id="reference">
     <title>API Reference</title>
     <xi:include href="xml/general.xml" />
-
     <xi:include href="multihead.sgml" />
     <xi:include href="xml/gdkdisplay.xml" />
     <xi:include href="xml/gdkdisplaymanager.xml" />
     <xi:include href="xml/gdkscreen.xml" />
-
     <xi:include href="xml/regions.xml" />
     <xi:include href="xml/drawing.xml" />
-
     <xi:include href="xml/colors.xml" />
     <xi:include href="xml/visuals.xml" />
-
-    <xi:include href="xml/fonts.xml" />
     <xi:include href="xml/cursors.xml" />
-
     <xi:include href="xml/windows.xml" />
-
     <xi:include href="xml/events.xml" />
     <xi:include href="xml/event_structs.xml" />
-
     <xi:include href="xml/keys.xml" />
-
     <xi:include href="xml/selections.xml" />
     <xi:include href="xml/dnd.xml" />
-
     <xi:include href="xml/properties.xml" />
-
     <xi:include href="xml/threads.xml" />
-
-    <xi:include href="xml/input.xml" />
     <xi:include href="xml/gdkdevicemanager.xml" />
-
     <xi:include href="xml/pango_interaction.xml" />
     <xi:include href="xml/cairo_interaction.xml" />
     <xi:include href="xml/x_interaction.xml" />
-
     <xi:include href="xml/gdkapplaunchcontext.xml" />
-
     <xi:include href="xml/gdktesting.xml" />
   </reference>
 
diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index 1b8080b78f..2ae906a78f 100644
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -326,6 +326,30 @@ available.
 
 @void: 
 
+
+<!-- ##### FUNCTION gdk_error_trap_push ##### -->
+<para>
+
+</para>
+
+@void:
+
+
+<!-- ##### MACRO gdk_error_trap_pop ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION gdk_error_trap_pop_ignored ##### -->
+<para>
+
+</para>
+
+@void:
+
+
 <!-- ##### MACRO GDK_WINDOWING_X11 ##### -->
 <para>
 This macro is defined if GDK is configured to use the X11 backend.
@@ -340,3 +364,10 @@ This macro is defined if GDK is configured to use the win32 backend.
 
 
 
+<!-- ##### MACRO GDK_WINDOWING_QUARTZ ##### -->
+<para>
+This macro is defined if GDK is configured to use the Quartz backend.
+</para>
+
+
+