diff --git a/doc/ChangeLog b/doc/ChangeLog
index d59641585..8e60277d6 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,14 @@
+2005-01-04  Shane Landrum  <epicene@pobox.com>
+
+	* en/Gtk/Image.xml
+	* en/Gtk/RetrieveSurroundingArgs.xml
+	* en/Gtk/IMMulticontext.xml
+	* en/Gtk/FileInfo.xml
+	* en/Gtk/FileInfoType.xml
+	* en/Gtk/IMStatusStyle.xml
+	* en/Gtk/RetrieveSurroundingHandler.xml
+	* en/Gtk/IMPreeditStyle.xml: Added docs.
+
 2005-01-03  Shane Landrum  <epicene@pobox.com>
 
 	* en/Gtk/IMContextSimple.xml
diff --git a/doc/en/Gtk/FileInfo.xml b/doc/en/Gtk/FileInfo.xml
index c3e5e87fc..e35d75515 100644
--- a/doc/en/Gtk/FileInfo.xml
+++ b/doc/en/Gtk/FileInfo.xml
@@ -9,8 +9,12 @@
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
   <Docs>
-    <summary>To be added</summary>
-    <remarks></remarks>
+    <summary>
+      A class for handling information about files.
+    </summary>
+    <remarks>
+      For use with <see cref="T:Gtk.FileSystem"/> classes.
+    </remarks>
   </Docs>
   <Base>
     <BaseTypeName>GLib.Opaque</BaseTypeName>
@@ -30,8 +34,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
-        <remarks></remarks>
+        <summary>Frees memory associated with this data structure.</summary>
+        <remarks>Subject to change in the future.</remarks>
       </Docs>
     </Member>
     <Member MemberName="Copy">
@@ -42,7 +46,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>Returns a new object that's a copy of this object.</summary>
         <returns>a <see cref="T:Gtk.FileInfo" /></returns>
         <remarks></remarks>
       </Docs>
@@ -55,8 +59,8 @@
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <summary>Public constructor for internal use only.</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" />, the underlying C object.</param>
         <returns>a <see cref="T:Gtk.FileInfo" /></returns>
         <remarks></remarks>
       </Docs>
@@ -67,7 +71,7 @@
       <ReturnValue />
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>Public constructor.</summary>
         <returns>a <see cref="T:Gtk.FileInfo" /></returns>
         <remarks></remarks>
       </Docs>
@@ -80,7 +84,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>When making a derived class, override this method to change
+	that class's <see cref="T:GLib.GType" />.</summary>
         <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks></remarks>
       </Docs>
@@ -93,7 +98,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>The file's name.</summary>
         <returns>a <see cref="T:System.String" /></returns>
         <remarks></remarks>
       </Docs>
@@ -106,7 +111,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>The file's MIME type.</summary>
         <returns>a <see cref="T:System.String" /></returns>
         <remarks></remarks>
       </Docs>
@@ -119,7 +124,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>The file's last-modified time.</summary>
         <returns>a <see cref="T:System.Int64" /></returns>
         <remarks></remarks>
       </Docs>
@@ -132,7 +137,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>The file's size.</summary>
         <returns>a <see cref="T:System.Int64" /></returns>
         <remarks></remarks>
       </Docs>
@@ -145,7 +150,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>Whether the file is hidden or not.</summary>
         <returns>a <see cref="T:System.Boolean" /></returns>
         <remarks></remarks>
       </Docs>
@@ -158,9 +163,16 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:System.String" /></returns>
-        <remarks></remarks>
+        <summary>Generates a collation key on the display name for faster sorting.</summary>
+        <returns>a <see cref="T:System.String" />, 
+	  the collate key for the display name, or <see langword="null"/>
+	  if the display name hasn't been set.</returns>
+        <remarks>
+	  The collate key is a string that can be usefully compared with
+	  others using the C method strcmp().
+	  This is useful when sorting a bunch of <see cref="T:Gtk.FileInfo"/>
+	  objects since the collate key will be only computed once.
+	</remarks>
       </Docs>
     </Member>
     <Member MemberName="IsFolder">
@@ -171,7 +183,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>Whether the file is actually a folder or not.</summary>
         <returns>a <see cref="T:System.Boolean" /></returns>
         <remarks></remarks>
       </Docs>
diff --git a/doc/en/Gtk/FileInfoType.xml b/doc/en/Gtk/FileInfoType.xml
index 8244f8ec2..999e6aa70 100644
--- a/doc/en/Gtk/FileInfoType.xml
+++ b/doc/en/Gtk/FileInfoType.xml
@@ -9,8 +9,12 @@
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
   <Docs>
-    <summary>Enumeration to represent information about a file.</summary>
-    <remarks></remarks>
+    <summary>
+      Mask of information about a file for use with
+      <see cref="M:Gtk.FileSystem.GetFolder"/>.
+    </summary>
+    <remarks>
+</remarks>
   </Docs>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
@@ -41,7 +45,7 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>A file's display name.</summary>
         <remarks></remarks>
       </Docs>
     </Member>
@@ -54,7 +58,7 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Whether a file is actually a folder.</summary>
         <remarks></remarks>
       </Docs>
     </Member>
@@ -67,7 +71,7 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Whether a file is hidden.</summary>
         <remarks></remarks>
       </Docs>
     </Member>
@@ -80,7 +84,7 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>A file's MIME type.</summary>
         <remarks></remarks>
       </Docs>
     </Member>
@@ -93,7 +97,7 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>A file's modification time.</summary>
         <remarks></remarks>
       </Docs>
     </Member>
@@ -106,7 +110,7 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>A file's size.</summary>
         <remarks></remarks>
       </Docs>
     </Member>
@@ -119,7 +123,7 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>All the information about a file.</summary>
         <remarks></remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gtk/IMContext.xml b/doc/en/Gtk/IMContext.xml
index 201b88757..5da65a605 100644
--- a/doc/en/Gtk/IMContext.xml
+++ b/doc/en/Gtk/IMContext.xml
@@ -240,7 +240,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>Event fired when pre-editing is started.</summary>
         <remarks />
       </Docs>
     </Member>
@@ -252,7 +252,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>Event fired when the input method needs to delete the context text.</summary>
         <remarks />
       </Docs>
     </Member>
@@ -276,7 +276,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>
+	  Event fired when the input method requires the context surrounding the cursor. 
+	</summary>
         <remarks />
       </Docs>
     </Member>
@@ -288,7 +290,7 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>Event fired when pre-editing is completed.</summary>
         <remarks />
       </Docs>
     </Member>
@@ -303,10 +305,16 @@
         <Parameter Name="cursor_index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>
+	  Sets surrounding context around the insertion point and preedit string. 
+	</summary>
         <param name="text">a <see cref="T:System.String" /></param>
         <param name="cursor_index">a <see cref="T:System.Int32" /></param>
-        <remarks />
+        <remarks>
+	  This function is expected to be called in response to the 
+	  <see cref="E:Gtk.IMContext.RetrieveSurrounding"/> event,
+	  and it will likely have no effect if called at other times.
+	</remarks>
       </Docs>
     </Member>
     <Member MemberName="GetSurrounding">
@@ -324,7 +332,26 @@
         <param name="text">a <see cref="T:System.String" /></param>
         <param name="cursor_index">a <see cref="T:System.Int32" /></param>
         <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks />
+        <remarks>
+	  <para>
+	    Input methods typically want context in order to constrain
+	    input text based on existing text; this is important for
+	    languages such as Thai where only some sequences of
+	    characters are allowed.
+	  </para>
+	  <para>
+	    This function is implemented by emitting the <see
+	    cref="E:Gtk.IMContext.RetrieveSurrounding"/> event on the
+	    input method; in response to this signal, a widget should
+	    provide as much context as is available, up to an entire
+	    paragraph, by calling <see
+	    cref="M:Gtk.IMContext.SetSurrounding"/>. Note that there
+	    is no obligation for a widget to respond to the <see
+	    cref="E:Gtk.IMContext.RetrieveSurrounding"/> signal, so
+	    input methods must be prepared to function without
+	    context.
+	</para>
+	</remarks>
       </Docs>
     </Member>
     <Member MemberName="GType">
@@ -448,11 +475,17 @@
         <Parameter Name="cursor_pos" Type="System.Int32&amp;" RefType="out" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <param name="str">a <see cref="T:System.String" /></param>
-        <param name="attrs">a <see cref="T:Pango.AttrList" /></param>
-        <param name="cursor_pos">a <see cref="T:System.Int32" /></param>
-        <remarks>To be added</remarks>
+        <summary>
+	  Retrieve the current preedit string for the input context
+	  and a list of attributes to apply to the string.
+	</summary>
+        <param name="str">a <see cref="T:System.String" />, a location to store , the retrieved string.</param>
+        <param name="attrs">a <see cref="T:Pango.AttrList" />, location to store the retrieved attribute list.</param>
+        <returns>a <see cref="T:System.Int32" />, the position of the cursor (in bytes) within the preedit string.</returns>        
+	<remarks>
+	  This string should be displayed inserted at the insertion
+	  point. 
+	</remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
diff --git a/doc/en/Gtk/IMMulticontext.xml b/doc/en/Gtk/IMMulticontext.xml
index 9a94ad133..1477bafad 100644
--- a/doc/en/Gtk/IMMulticontext.xml
+++ b/doc/en/Gtk/IMMulticontext.xml
@@ -10,7 +10,9 @@
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
   <Docs>
-    <summary>To be added</summary>
+    <summary>
+      An input method context object that manages the use of multiple input method contexts for a widget
+    </summary>
     <remarks />
   </Docs>
   <Base>
@@ -36,7 +38,7 @@
         <Parameter Name="menushell" Type="Gtk.MenuShell" />
       </Parameters>
       <Docs>
-        <summary>Add menuitems for various available input methods to a menu;
+        <summary>Add menu items for various available input methods to a menu;
 	  the menuitems, when selected, will switch the input method
 	  for the context and the global default input method.</summary>
         <param name="menushell">a <see cref="T:Gtk.MenuShell" /></param>
@@ -110,4 +112,4 @@
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gtk/IMPreeditStyle.xml b/doc/en/Gtk/IMPreeditStyle.xml
index 9993e9464..088b7a903 100644
--- a/doc/en/Gtk/IMPreeditStyle.xml
+++ b/doc/en/Gtk/IMPreeditStyle.xml
@@ -80,7 +80,7 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/doc/en/Gtk/IMStatusStyle.xml b/doc/en/Gtk/IMStatusStyle.xml
index f51e8c59e..6138f9c5f 100644
--- a/doc/en/Gtk/IMStatusStyle.xml
+++ b/doc/en/Gtk/IMStatusStyle.xml
@@ -80,7 +80,7 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/doc/en/Gtk/Image.xml b/doc/en/Gtk/Image.xml
index cc94ebe4a..91064a1c1 100644
--- a/doc/en/Gtk/Image.xml
+++ b/doc/en/Gtk/Image.xml
@@ -173,8 +173,9 @@
       <Docs>
         <summary>This constructor is used to create an instance of <see cref="Gtk.Image" /> containing the <see cref="T:Gdk.PixbufAnimation" /> passed to it.</summary>
         <param name="animation">
-          <see cref="T:Gdk.PixbufAnimation" />
-  to be displayed by the Image.</param>
+          <see cref="T:Gdk.PixbufAnimation" /> 
+	  to be displayed by the Image.
+	</param>
         <returns>An instance of type <see cref="T:Gtk.Image" />.</returns>
         <remarks />
       </Docs>
@@ -443,9 +444,11 @@ masked by the given <see cref="Gdk.Pixmap" />.</summary>
         <ReturnType>Gtk.ImageType</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>The type of representation being used by the #GtkImage
+        <summary>The type of representation being used by the 
+	  <see cref="T:Gtk.Image"/>
 	  to store image data. If the Image has no image data,
-	  the return value will be <see cref="P:Gtk.ImageType.Empty" />.</summary>
+	  the return value will be <see cref="P:Gtk.ImageType.Empty" />.
+	</summary>
         <returns>an object of type <see cref="T:Gtk.ImageType" /></returns>
         <remarks />
       </Docs>
@@ -577,10 +580,10 @@ masked by the given <see cref="Gdk.Pixmap" />.</summary>
         <Parameter Name="mask" Type="Gdk.Pixmap" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Same functionality as <see cref="M:Gtk.Image.SetFromImage"/>.</summary>
         <param name="val">a <see cref="T:Gdk.Image" /></param>
         <param name="mask">a <see cref="T:Gdk.Pixmap" /></param>
-        <remarks>To be added</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Get">
@@ -594,10 +597,18 @@ masked by the given <see cref="Gdk.Pixmap" />.</summary>
         <Parameter Name="mask" Type="Gdk.Pixmap" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>
+	  Gets the <see cref="T:Gdk.Image"/> and mask being 
+	  displayed by the <see cref="T:Gtk.Image"/>.
+	</summary>
         <param name="val">a <see cref="T:Gdk.Image" /></param>
         <param name="mask">a <see cref="T:Gdk.Pixmap" /></param>
-        <remarks>To be added</remarks>
+        <remarks>
+	  The storage type of the image must be 
+	  <see cref="T:Gtk.ImageType.Empty"/>.
+	  or <see cref="T:Gtk.ImageType.Image"/>.
+	  (see <see cref="P:Gtk.Image.StorageType" />).
+	</remarks>
       </Docs>
     </Member>
     <Member MemberName="GetStock">
@@ -614,7 +625,9 @@ masked by the given <see cref="Gdk.Pixmap" />.</summary>
         <summary>Get the stock item name and size, if this is a stock image</summary>
         <param name="stock_id">the stock item name</param>
         <param name="size">the stock item size, a <see cref="T:Gtk.IconSize" /></param>
-        <remarks>If the <see cref="T:Gtk.Image" /> is displaying a stock image, this method can be used to retrieve the stock item name and the size.</remarks>
+        <remarks>
+	  If the <see cref="T:Gtk.Image" /> is displaying a stock image, this method can be used to retrieve the stock item name and the size.
+	</remarks>
       </Docs>
     </Member>
     <Member MemberName="GetIconSet">
@@ -671,4 +684,4 @@ masked by the given <see cref="Gdk.Pixmap" />.</summary>
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gtk/RetrieveSurroundingArgs.xml b/doc/en/Gtk/RetrieveSurroundingArgs.xml
index d151ecfae..70aa10d40 100644
--- a/doc/en/Gtk/RetrieveSurroundingArgs.xml
+++ b/doc/en/Gtk/RetrieveSurroundingArgs.xml
@@ -33,4 +33,4 @@
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gtk/RetrieveSurroundingHandler.xml b/doc/en/Gtk/RetrieveSurroundingHandler.xml
index cb4841671..0b293e063 100644
--- a/doc/en/Gtk/RetrieveSurroundingHandler.xml
+++ b/doc/en/Gtk/RetrieveSurroundingHandler.xml
@@ -12,6 +12,10 @@
       <para>The <see cref="M:Gtk.IMContext.RetrieveSurrounding" /> event utilizes this delegate:</para>
       <para>Event data is passed via the <see cref="T:Gtk.RetrieveSurroundingArgs" /> parameter.</para>
       <para>To attach a <see cref="T:Gtk.RetrieveSurroundingHandler" /> to an event, add the RetrieveSurroundingHandler instance to the event.  The methods referenced by the RetrieveSurroundingHandler instance are invoked whenever the event is raised, until the RetrieveSurroundingHandler is removed from the event.</para>
+      <para>
+	Handlers of this class should set the input method surrounding context by calling <see cref="T:Gtk.IMContext.SetSurrounding" />. The method returns %TRUE if the signal was handled by the callback.
+      </para>
+
     </remarks>
   </Docs>
   <Base>
@@ -34,4 +38,4 @@
   <ReturnValue>
     <ReturnType>System.Void</ReturnType>
   </ReturnValue>
-</Type>
\ No newline at end of file
+</Type>