diff --git a/doc/ChangeLog b/doc/ChangeLog
index d0e9f7851..aebe2b03c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-07  Shane Landrum  <epicene@pobox.com>
+
+	* en/GConf/ChangeSet.xml
+	* en/GConf/NoSuchKeyException.xml
+	* en/GConf/NotifyEventArgs.xml
+	* en/GConf/ClientBase.xml
+	* en/GConf/NotifyFuncNative.xml
+	* en/GConf/Client.xml: Cleaned up and added docs.
+	
 2005-01-06  Dan Winship  <danw@novell.com>
 
 	* en/Gtk/StockManager.xml: resurrect and update
diff --git a/doc/en/GConf/ChangeSet.xml b/doc/en/GConf/ChangeSet.xml
index 478805782..00a18ec8d 100644
--- a/doc/en/GConf/ChangeSet.xml
+++ b/doc/en/GConf/ChangeSet.xml
@@ -42,8 +42,8 @@
       <Parameters />
       <Docs>
         <summary>Initializes a new ChangeSet object</summary>
-        <returns>an object of type 'GConf.ChangeSet'</returns>
-        <remarks>To be added</remarks>
+        <returns>a <see cref="T:GConf.ChangeSet" /></returns>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Finalize">
@@ -69,11 +69,11 @@
         <Parameter Name="key" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Gets the value stored in the changeset under key <paramref name="key"/>.</summary>
         <param name="key">a <see cref="T:System.String" /></param>
         <returns>a <see cref="T:System.Object" /></returns>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/GConf/Client.xml b/doc/en/GConf/Client.xml
index 6909b618b..4fc6fdc7a 100644
--- a/doc/en/GConf/Client.xml
+++ b/doc/en/GConf/Client.xml
@@ -78,7 +78,7 @@ catch (GConf.NoSuchKeyException)
         <summary>Registers a notification request.</summary>
         <param name="dir">an object of type <see cref="T:System.String" /></param>
         <param name="notify">an object of type <see cref="T:GConf.NotifyEventHandler" /></param>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
diff --git a/doc/en/GConf/ClientBase.xml b/doc/en/GConf/ClientBase.xml
index 8c08191e1..8eaba9b0a 100644
--- a/doc/en/GConf/ClientBase.xml
+++ b/doc/en/GConf/ClientBase.xml
@@ -10,8 +10,9 @@
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
   <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
+    <summary>Abstract class; extend this to create objects that behave
+    like GConf clients.</summary>
+    <remarks></remarks>
   </Docs>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
@@ -30,10 +31,10 @@
         <Parameter Name="val" Type="System.Object" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <param name="key">To be added: an object of type 'string'</param>
-        <param name="val">To be added: an object of type 'object'</param>
-        <remarks>To be added</remarks>
+        <summary>Set the value stored at key <paramref name="key"/> to <paramref name="value"/>.</summary>
+        <param name="key">a <see cref="T:System.String" /></param>
+        <param name="val">a <see cref="T:System.Object" /></param>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Get">
@@ -46,10 +47,10 @@
         <Parameter Name="key" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <param name="key">To be added: an object of type 'string'</param>
-        <returns>To be added: an object of type 'object'</returns>
-        <remarks>To be added</remarks>
+        <summary>Get the value stored at key <paramref name="key"/>.</summary>
+        <param name="key">a <see cref="T:System.String" /></param>
+        <returns>a <see cref="T:System.Object" /></returns>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -58,10 +59,10 @@
       <ReturnValue />
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>Protected constructor.</summary>
         <returns>a <see cref="T:GConf.ClientBase" /></returns>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/GConf/NoSuchKeyException.xml b/doc/en/GConf/NoSuchKeyException.xml
index a13e20511..bdde6dc6c 100644
--- a/doc/en/GConf/NoSuchKeyException.xml
+++ b/doc/en/GConf/NoSuchKeyException.xml
@@ -29,9 +29,9 @@
       <ReturnValue />
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
-        <returns>To be added: an object of type 'GConf.NoSuchKeyException'</returns>
-        <remarks>To be added</remarks>
+        <summary>Public constructor.</summary>
+        <returns>a <see cref="T:GConf.NoSuchKeyException" /></returns>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -42,11 +42,11 @@
         <Parameter Name="key" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <param name="key">To be added: an object of type 'string'</param>
-        <returns>To be added: an object of type 'GConf.NoSuchKeyException'</returns>
-        <remarks>To be added</remarks>
+        <summary>Public constructor.</summary>
+        <param name="key">a <see cref="T:System.String" />, name of the key that was not found.</param>
+        <returns>a <see cref="T:GConf.NoSuchKeyException" /></returns>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/GConf/NotifyEventArgs.xml b/doc/en/GConf/NotifyEventArgs.xml
index a86f89587..436004f89 100644
--- a/doc/en/GConf/NotifyEventArgs.xml
+++ b/doc/en/GConf/NotifyEventArgs.xml
@@ -11,7 +11,7 @@
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
   <Docs>
     <summary>Arguments of the GConf Notify event that was called due to a GConf key being added, removed or updated.</summary>
-    <remarks>To be added</remarks>
+    <remarks></remarks>
   </Docs>
   <Base>
     <BaseTypeName>System.EventArgs</BaseTypeName>
@@ -29,9 +29,9 @@
       </Parameters>
       <Docs>
         <summary>This constructor is called to initialize a NotifyEventArgs with the key/value that was updated, removed or added in GConf</summary>
-        <param name="key">To be added: an object of type 'string'</param>
-        <param name="val">To be added: an object of type 'object'</param>
-        <returns>an object of type 'GConf.NotifyEventArgs', event arguments to the NotifyEventHandler delegate</returns>
+        <param name="key">a <see cref="T:System.String" /></param>
+        <param name="val">a <see cref="T:System.Object" /></param>
+        <returns>a <see cref="T:GConf.NotifyEventArgs" />, event arguments to the NotifyEventHandler delegate</returns>
         <remarks />
       </Docs>
     </Member>
@@ -45,7 +45,7 @@
         <summary>This NotifyEventArgs property refers to the GConf Value from an entry which modification, addition or removal cause the event to be fired.
 </summary>
         <returns>the object stored in the GConf which modification, removal or addition cause the event to be fired.</returns>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Key">
@@ -57,7 +57,7 @@
       <Docs>
         <summary>This NotifyEventArgs property refers to the key which value modification, addition or removal cause the event to be fired.</summary>
         <returns>a string for the key name</returns>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/doc/en/GConf/NotifyFuncNative.xml b/doc/en/GConf/NotifyFuncNative.xml
index 22621ee7f..b694d59b4 100644
--- a/doc/en/GConf/NotifyFuncNative.xml
+++ b/doc/en/GConf/NotifyFuncNative.xml
@@ -10,8 +10,8 @@
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
   <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
+    <summary>Internal class. Do not use.</summary>
+    <remarks>Used by <see cref="T:GConf.NotifyWrapper"/>.</remarks>
   </Docs>
   <Base>
     <BaseTypeName>System.Delegate</BaseTypeName>
@@ -41,7 +41,7 @@
         <Parameter Name="object" Type="System.Object" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Internal. Do not use.</summary>
         <param name="client_ptr">a <see cref="T:System.IntPtr" /></param>
         <param name="id">a <see cref="T:System.UInt32" /></param>
         <param name="entry_ptr">a <see cref="T:System.IntPtr" /></param>
@@ -49,7 +49,7 @@
         <param name="callback">a <see cref="T:System.AsyncCallback" /></param>
         <param name="object">a <see cref="T:System.Object" /></param>
         <returns>a <see cref="T:System.IAsyncResult" /></returns>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="EndInvoke">
@@ -62,9 +62,9 @@
         <Parameter Name="result" Type="System.IAsyncResult" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Internal. Do not use.</summary>
         <param name="result">a <see cref="T:System.IAsyncResult" /></param>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -76,11 +76,11 @@
         <Parameter Name="method" Type="System.IntPtr" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Public constructor.</summary>
         <param name="object">a <see cref="T:System.Object" /></param>
         <param name="method">a <see cref="T:System.IntPtr" /></param>
         <returns>a <see cref="T:GConf.NotifyFuncNative" /></returns>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Invoke">
@@ -96,13 +96,13 @@
         <Parameter Name="user_data" Type="System.IntPtr" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Internal. Do not use.</summary>
         <param name="client_ptr">a <see cref="T:System.IntPtr" /></param>
         <param name="id">a <see cref="T:System.UInt32" /></param>
         <param name="entry_ptr">a <see cref="T:System.IntPtr" /></param>
         <param name="user_data">a <see cref="T:System.IntPtr" /></param>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>