diff --git a/ChangeLog b/ChangeLog
index 323587696..ce8513a9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-10  Mike Kestner  <mkestner@ximian.com>
+
+	* configure.in : break the monodoc dep, even though it was optional
+	it was a pain in the backside.
+	* doc/Makefile.am : add assemble target to build docs using monodoc.
+	we now have two manual targets which use monodoc, but aren't required
+	for the default build (update and assemble).
+
 2004-06-10  Mike Kestner  <mkestner@ximian.com>
 
 	* configure.in : AC_SUBST GACUTIL_FLAGS. require mono-0.95 (though
diff --git a/configure.in b/configure.in
index 467966cfe..fec29f6bb 100644
--- a/configure.in
+++ b/configure.in
@@ -105,20 +105,6 @@ AC_SUBST(GACUTIL_FLAGS)
 AC_SUBST(LIB_PREFIX)
 AC_SUBST(LIB_SUFFIX)
 
-MONODOC_REQUIRED_VERSION=0.12
-PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no)
-
-if test "x$enable_monodoc" = "xyes"; then
-	AC_PATH_PROG(MONODOC, monodoc, no)
-	if test x$MONODOC = xno; then
-	   enable_monodoc=no
-	fi
-else
-	MONODOC=
-fi
-
-AC_SUBST(MONODOC)
-
 PKG_CHECK_MODULES(GLIB, glib-2.0)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
@@ -192,7 +178,6 @@ AM_CONDITIONAL(ENABLE_GNOMEDB, test "x$enable_gnomedb" = "xyes")
 AM_CONDITIONAL(ENABLE_RSVG, test "x$enable_rsvg" = "xyes")
 AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
 AM_CONDITIONAL(ENABLE_VTE, test "x$enable_vte" = "xyes")
-AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
 
 
 AC_SUBST(CFLAGS)
@@ -284,7 +269,6 @@ echo "Configuration summary"
 echo ""
 echo "   * Installation prefix = $prefix"
 echo "   * $CS compiler: $CSC"
-echo "   * Documentation: $enable_monodoc ($MONODOC)"
 echo ""
 echo "   Optional assemblies included in the build:"
 echo ""
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6e44a9e01..d0d644ef1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,19 +1,14 @@
-if ENABLE_MONODOC
-TARGETS = gtk-sharp-docs.source
 docsdir = $(datadir)/doc/gtk-sharp/xml
-docs_DATA = $(TARGETS)
-else
-TARGETS = 
-docsdir = $(datadir)
-docs_DATA = 
-endif
+docs_DATA = gtk-sharp-docs.source
 
-ASSEMBLER = $(MONODOC) --assemble
-UPDATER = $(MONODOC) --update
+ASSEMBLER = monodoc --assemble
+UPDATER = monodoc --update
 
 DIRS=glib pango atk gdk gtk glade art gnome gda gnomedb gconf/GConf gconf/GConf.PropertyEditors rsvg gtkhtml vte
 NAMESPACES=GLib Pango Atk Gdk Gtk Glade Art Gnome Gda GnomeDb GConf GConf.PropertyEditors Rsvg Vte
 
+assemble: gtk-sharp-docs.zip gtk-sharp-docs.tree
+
 gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
 	$(ASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs
 
@@ -35,41 +30,17 @@ EXTRA_DIST =			\
 dist-hook:
 	mkdir -p $(distdir)/en
 	cp $(srcdir)/en/*.xml $(distdir)/en/
-	mkdir -p $(distdir)/en/GLib
-	cp $(srcdir)/en/GLib/*.xml $(distdir)/en/GLib/
-	mkdir -p $(distdir)/en/Pango
-	cp $(srcdir)/en/Pango/*.xml $(distdir)/en/Pango/
-	mkdir -p $(distdir)/en/Atk
-	cp $(srcdir)/en/Atk/*.xml $(distdir)/en/Atk/
-	mkdir -p $(distdir)/en/Gdk
-	cp $(srcdir)/en/Gdk/*.xml $(distdir)/en/Gdk/
-	mkdir -p $(distdir)/en/Gtk
-	cp $(srcdir)/en/Gtk/*.xml $(distdir)/en/Gtk/
-	mkdir -p $(distdir)/en/Glade
-	cp $(srcdir)/en/Glade/*.xml $(distdir)/en/Glade/
-	mkdir -p $(distdir)/en/Art
-	cp $(srcdir)/en/Art/*.xml $(distdir)/en/Art/
-	mkdir -p $(distdir)/en/Gnome
-	cp $(srcdir)/en/Gnome/*.xml $(distdir)/en/Gnome/
-	mkdir -p $(distdir)/en/Gda
-	cp $(srcdir)/en/Gda/*.xml $(distdir)/en/Gda/
-	mkdir -p $(distdir)/en/GnomeDb
-	cp $(srcdir)/en/GnomeDb/*.xml $(distdir)/en/GnomeDb/
-	mkdir -p $(distdir)/en/Rsvg
-	cp $(srcdir)/en/Rsvg/*.xml $(distdir)/en/Rsvg/
-	mkdir -p $(distdir)/en/Vte
-	cp $(srcdir)/en/Vte/*.xml $(distdir)/en/Vte/
-	mkdir -p $(distdir)/en/GConf
-	cp $(srcdir)/en/GConf/*.xml $(distdir)/en/GConf/
-	mkdir -p $(distdir)/en/GConf.PropertyEditors
-	cp $(srcdir)/en/GConf.PropertyEditors/*.xml $(distdir)/en/GConf.PropertyEditors/
+	for i in $(NAMESPACES); do				\
+		mkdir -p $(distdir)/en/$$i;			\
+		cp $(srcdir)/en/$$i/*.xml $(distdir)/en/$$i;	\
+	done
 
 install-data-local:
 	mkdir -p $(DESTDIR)$(docsdir)/en
 	cp $(srcdir)/en/*.xml $(DESTDIR)$(docsdir)/en;
 	for i in $(NAMESPACES); do					\
 		mkdir -p $(DESTDIR)$(docsdir)/en/$$i;			\
-		cp $(srcdir)/en/$$i/* $(DESTDIR)$(docsdir)/en/$$i;	\
+		cp $(srcdir)/en/$$i/*.xml $(DESTDIR)$(docsdir)/en/$$i;	\
 	done
 
 uninstall-local:
diff --git a/doc/en/Gnome/CanvasItem.xml b/doc/en/Gnome/CanvasItem.xml
index 5a56ed20d..1eb449251 100644
--- a/doc/en/Gnome/CanvasItem.xml
+++ b/doc/en/Gnome/CanvasItem.xml
@@ -393,8 +393,7 @@
       </Parameters>
       <Docs>
         <summary>Gets the affine transform that converts from item-relative coordinates to canvas pixel coordinates.</summary>/
-        <param name="affine">Return value for an affine transformation matrix (return value).</param><remarks>
-        </remarks></Docs>
+        <param name="affine">Return value for an affine transformation matrix (return value).</param><remarks></remarks></Docs>
     </Member>
     <Member MemberName="Raise">
       <MemberSignature Language="C#" Value="public void Raise (int positions);" />
diff --git a/doc/en/Vte/Conv.xml b/doc/en/Vte/Conv.xml
index ee67081ba..47f49216f 100644
--- a/doc/en/Vte/Conv.xml
+++ b/doc/en/Vte/Conv.xml
@@ -37,16 +37,5 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected Conv ();" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:Vte.Conv" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Vte/Terminal.xml b/doc/en/Vte/Terminal.xml
index 6a04f4972..ff4a25770 100644
--- a/doc/en/Vte/Terminal.xml
+++ b/doc/en/Vte/Terminal.xml
@@ -825,34 +825,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="ForkCommand">
-      <MemberSignature Language="C#" Value="public int ForkCommand (string command, string argv, string envv, string directory, bool lastlog, bool utmp, bool wtmp);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="command" Type="System.String" />
-        <Parameter Name="argv" Type="System.String" />
-        <Parameter Name="envv" Type="System.String" />
-        <Parameter Name="directory" Type="System.String" />
-        <Parameter Name="lastlog" Type="System.Boolean" />
-        <Parameter Name="utmp" Type="System.Boolean" />
-        <Parameter Name="wtmp" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="command">a <see cref="T:System.String" /></param>
-        <param name="argv">a <see cref="T:System.String" /></param>
-        <param name="envv">a <see cref="T:System.String" /></param>
-        <param name="directory">a <see cref="T:System.String" /></param>
-        <param name="lastlog">a <see cref="T:System.Boolean" /></param>
-        <param name="utmp">a <see cref="T:System.Boolean" /></param>
-        <param name="wtmp">a <see cref="T:System.Boolean" /></param>
-        <returns>a <see cref="T:System.Int32" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Reset">
       <MemberSignature Language="C#" Value="public void Reset (bool full, bool clear_history);" />
       <MemberType>Method</MemberType>
@@ -919,22 +891,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="IsWordChar">
-      <MemberSignature Language="C#" Value="public bool IsWordChar (string c);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="c" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="c">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="SetColors">
       <MemberSignature Language="C#" Value="public void SetColors (Gdk.Color foreground, Gdk.Color background, Gdk.Color palette, long palette_size);" />
       <MemberType>Method</MemberType>
@@ -2002,5 +1958,46 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Font">
+      <MemberSignature Language="C#" Value="public Pango.FontDescription Font { set; get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Pango.FontDescription</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Pango.FontDescription" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ForkCommand">
+      <MemberSignature Language="C#" Value="public int ForkCommand (string command, string [] argv, string [] envv, string directory, bool lastlog, bool utmp, bool wtmp);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="command" Type="System.String" />
+        <Parameter Name="argv" Type="System.String[]" />
+        <Parameter Name="envv" Type="System.String[]" />
+        <Parameter Name="directory" Type="System.String" />
+        <Parameter Name="lastlog" Type="System.Boolean" />
+        <Parameter Name="utmp" Type="System.Boolean" />
+        <Parameter Name="wtmp" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="command">a <see cref="T:System.String" /></param>
+        <param name="argv">a <see cref="T:System.String" /></param>
+        <param name="envv">a <see cref="T:System.String" /></param>
+        <param name="directory">a <see cref="T:System.String" /></param>
+        <param name="lastlog">a <see cref="T:System.Boolean" /></param>
+        <param name="utmp">a <see cref="T:System.Boolean" /></param>
+        <param name="wtmp">a <see cref="T:System.Boolean" /></param>
+        <returns>a <see cref="T:System.Int32" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Vte/TerminalAccessible.xml b/doc/en/Vte/TerminalAccessible.xml
index 5785a63fd..f572c2442 100644
--- a/doc/en/Vte/TerminalAccessible.xml
+++ b/doc/en/Vte/TerminalAccessible.xml
@@ -303,22 +303,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="GetCharacterAtOffset">
-      <MemberSignature Language="C#" Value="public virtual string GetCharacterAtOffset (int offset);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="offset" Type="System.Int32" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="offset">a <see cref="T:System.Int32" /></param>
-        <returns>a <see cref="T:System.String" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="SetSelection">
       <MemberSignature Language="C#" Value="public virtual bool SetSelection (int selection_num, int start_offset, int end_offset);" />
       <MemberType>Method</MemberType>
@@ -662,17 +646,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected TerminalAccessible ();" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:Vte.TerminalAccessible" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="GType">
       <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>