From 67586ddfa41d0f402585c7a488e8a4a8ebb73c8a Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 19 Dec 2007 11:19:12 +0000
Subject: [PATCH] Some minor fixes and additions.

2007-12-19  Alexander Larsson  <alexl@redhat.com>

        * gio/migrating.xml:
        * gio/overview.xml:
	Some minor fixes and additions.


svn path=/trunk/; revision=6154
---
 docs/reference/ChangeLog         |  6 ++++++
 docs/reference/gio/migrating.xml | 10 ++++++++++
 docs/reference/gio/overview.xml  |  4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index a74ac1ff..e2e17d69 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-19  Alexander Larsson  <alexl@redhat.com>
+
+        * gio/migrating.xml:
+        * gio/overview.xml:
+	Some minor fixes and additions.
+	
 2007-12-17  Matthias Clasen <mclasen@redhat.com>
 
 	* gio: Flesh out the overview and migration docs.
diff --git a/docs/reference/gio/migrating.xml b/docs/reference/gio/migrating.xml
index 86c63e5a..6ad226a3 100644
--- a/docs/reference/gio/migrating.xml
+++ b/docs/reference/gio/migrating.xml
@@ -35,9 +35,19 @@
           <row><entry>GnomeVFS</entry><entry>GIO</entry></row>
         </thead>
         <tbody>
+          <row><entry>GnomeVFSURI</entry><entry>GFile</entry></row>
+          <row><entry>GnomeVFSFileInfo</entry><entry>GFileInfo</entry></row>
+          <row><entry>GnomeVFSResult</entry><entry>GError, with G_IO_ERROR values</entry></row>
+          <row><entry>GnomeVFSHandle & GnomeVFSAsyncHandle</entry><entry>GInputStream or GOutputStream</entry></row>
+          <row><entry>GnomeVFSDirectoryHandle</entry><entry>GFileEnumerator</entry></row>
+          <row><entry>mime type</entry><entry>content type</entry></row>
+          <row><entry>GnomeVFSMonitor</entry><entry>GFileMonitor and GDirectoryMonitor</entry></row>
+          <row><entry>GnomeVFSVolumeMonitor</entry><entry>GVolumeMonitor</entry></row>
           <row><entry>GnomeVFSVolume</entry><entry>GMount</entry></row>
           <row><entry>GnomeVFSDrive</entry><entry>GVolume</entry></row>
           <row><entry>-</entry><entry>GDrive</entry></row>
+          <row><entry>GnomeVFSContext</entry><entry>GCancellable</entry></row>
+          <row><entry>gnome_vfs_async_cancel</entry><entry>g_cancellable_cancel</entry></row>
         </tbody>
       </tgroup>
     </table>
diff --git a/docs/reference/gio/overview.xml b/docs/reference/gio/overview.xml
index 5f3d5045..0fcab665 100644
--- a/docs/reference/gio/overview.xml
+++ b/docs/reference/gio/overview.xml
@@ -10,7 +10,7 @@
     shortcomings of GnomeVFS and provide an API that is so good that
     developers prefer it over raw POSIX calls. Among other things
     that means using GObject. It also means not cloning the POSIX 
-    API, but providing a higher-level, document-centric interfaces.
+    API, but providing higher-level, document-centric interfaces.
   </para>
 
   <para>
@@ -55,7 +55,7 @@
        </varlistentry>
        <varlistentry>
          <term>GSeekable</term>
-         <listitem><para>seek in data</para></listitem>
+         <listitem><para>interface optionally implemented by streams to support seeking</para></listitem>
        </varlistentry>
     </variablelist>
     There are interfaces related to applications and the types
-- 
2.34.1