diff --git a/docs/reference/gio/#gio-unused.txt# b/docs/reference/gio/#gio-unused.txt#
deleted file mode 100644
index bf3faa5a1..000000000
--- a/docs/reference/gio/#gio-unused.txt#
+++ /dev/null
@@ -1,100 +0,0 @@
-GFenDirectoryMonitor
-GFenDirectoryMonitorClass
-GFenFileMonitor
-GFenFileMonitorClass
-GLocalFileIOStream
-GLocalFileIOStreamClass
-GLocalFileIOStreamPrivate
-GSocketInputStream
-GSocketInputStreamClass
-GSocketInputStreamPrivate
-GSocketOutputStream
-GSocketOutputStreamClass
-GSocketOutputStreamPrivate
-GWin32DirectoryMonitor
-GWin32DirectoryMonitorClass
-GWin32DirectoryMonitorPrivate
-GWin32Mount
-GWin32MountClass
-GWin32Volume
-GWin32VolumeMonitor
-GWin32VolumeMonitorClass
-GWinHttpDllFuncs
-GWinHttpFile
-GWinHttpFileClass
-GWinHttpFileInputStream
-GWinHttpFileInputStreamClass
-GWinHttpFileOutputStream
-GWinHttpFileOutputStreamClass
-GWinHttpVfs
-GWinHttpVfsClass
-G_FEN_DIRECTORY_MONITOR
-G_FEN_DIRECTORY_MONITOR_CLASS
-G_FEN_FILE_MONITOR
-G_FEN_FILE_MONITOR_CLASS
-G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE
-G_IS_FEN_DIRECTORY_MONITOR
-G_IS_FEN_DIRECTORY_MONITOR_CLASS
-G_IS_FEN_FILE_MONITOR
-G_IS_FEN_FILE_MONITOR_CLASS
-G_IS_LOCAL_FILE_IO_STREAM
-G_IS_LOCAL_FILE_IO_STREAM_CLASS
-G_IS_SOCKET_INPUT_STREAM
-G_IS_SOCKET_INPUT_STREAM_CLASS
-G_IS_SOCKET_OUTPUT_STREAM
-G_IS_SOCKET_OUTPUT_STREAM_CLASS
-G_IS_WIN32_DIRECTORY_MONITOR
-G_IS_WIN32_DIRECTORY_MONITOR_CLASS
-G_IS_WIN32_MOUNT
-G_IS_WIN32_MOUNT_CLASS
-G_IS_WIN32_VOLUME_MONITOR
-G_IS_WIN32_VOLUME_MONITOR_CLASS
-G_IS_WINHTTP_FILE
-G_IS_WINHTTP_FILE_CLASS
-G_IS_WINHTTP_FILE_INPUT_STREAM
-G_IS_WINHTTP_FILE_INPUT_STREAM_CLASS
-G_IS_WINHTTP_FILE_OUTPUT_STREAM
-G_IS_WINHTTP_FILE_OUTPUT_STREAM_CLASS
-G_IS_WINHTTP_VFS
-G_IS_WINHTTP_VFS_CLASS
-G_LOCAL_FILE_IO_STREAM
-G_LOCAL_FILE_IO_STREAM_CLASS
-G_LOCAL_FILE_IO_STREAM_GET_CLASS
-G_SOCKET_INPUT_STREAM
-G_SOCKET_INPUT_STREAM_CLASS
-G_SOCKET_INPUT_STREAM_GET_CLASS
-G_SOCKET_OUTPUT_STREAM
-G_SOCKET_OUTPUT_STREAM_CLASS
-G_SOCKET_OUTPUT_STREAM_GET_CLASS
-G_TYPE_FEN_DIRECTORY_MONITOR
-G_TYPE_FEN_FILE_MONITOR
-G_TYPE_LOCAL_FILE_IO_STREAM
-G_TYPE_SOCKET_OUTPUT_STREAM
-G_TYPE_WIN32_DIRECTORY_MONITOR
-G_TYPE_WIN32_MOUNT
-G_TYPE_WIN32_VOLUME_MONITOR
-G_TYPE_WINHTTP_FILE
-G_TYPE_WINHTTP_FILE_INPUT_STREAM
-G_TYPE_WINHTTP_FILE_OUTPUT_STREAM
-G_TYPE_WINHTTP_VFS
-G_WIN32_DIRECTORY_MONITOR
-G_WIN32_DIRECTORY_MONITOR_CLASS
-G_WIN32_DIRECTORY_MONITOR_GET_CLASS
-G_WIN32_MOUNT
-G_WIN32_MOUNT_CLASS
-G_WIN32_VOLUME_MONITOR
-G_WIN32_VOLUME_MONITOR_CLASS
-G_WINHTTP_FILE
-G_WINHTTP_FILE_CLASS
-G_WINHTTP_FILE_GET_CLASS
-G_WINHTTP_FILE_INPUT_STREAM
-G_WINHTTP_FILE_INPUT_STREAM_CLASS
-G_WINHTTP_FILE_INPUT_STREAM_GET_CLASS
-G_WINHTTP_FILE_OUTPUT_STREAM
-G_WINHTTP_FILE_OUTPUT_STREAM_CLASS
-G_WINHTTP_FILE_OUTPUT_STREAM_GET_CLASS
-G_WINHTTP_VFS
-G_WINHTTP_VFS_CLASS
-G_WINHTTP_VFS_GET_CLASS
-g_win32_directory_monitor_get_type
-g_win32_directory_monitor_register
diff --git a/gio/gsettings.c b/gio/gsettings.c
index 9a886a888..bb334ca82 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -30,6 +30,71 @@
*
* The #GSettings class provides a convenient API for storing and retrieving
* application settings.
+ *
+ * When creating a GSettings instance, you have to specify a schema
+ * that describes the keys in your settings and their types and default
+ * values, as well as some other information.
+ *
+ * Normally, a schema has as fixed path that determines where the settings
+ * are stored in the conceptual global tree of settings. However, schemas
+ * can also be 'relocatable', i.e. not equipped with a fixed path. This is
+ * useful e.g. when the schema describes an 'account', and you want to be
+ * able to store a arbitrary number of accounts.
+ *
+ * Unlike other configuration systems (like GConf), GSettings does not
+ * restrict keys to basic types like strings and numbers. GSettings stores
+ * values as #GVariant, and allows any #GVariantType for keys.
+ *
+ * Similar to GConf, the default values in GSettings schemas can be
+ * localized, but the localized values are stored in gettext catalogs
+ * and looked up with the domain that is specified in the gettext-domain
+ * attribute of the schemalist or schema elements
+ * and the category that is specified in the l10n attribute of the
+ * key element.
+ *
+ * GSettings uses schemas in a compact binary form that is created
+ * by the gschema-compile utility. The input is a schema description in
+ * an XML format that can be described by the following DTD:
+ * |[
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * ]]>
+ * ]|
*/
struct _GSettingsPrivate
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index a9e9851b8..f4103cce7 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
@@ -25,46 +25,6 @@
#include "gvdb/gvdb-reader.h"
-/*
- * The #GSettingsSchema class provides schema information (i.e. types,
- * default values and descriptions) for keys in settings.
- *
- * Schema information is required to use #GSettings.
- *
- * The source format for GSettings schemas is an XML format that can
- * be described with the following DTD:
- * |[
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- * ]]>
- * ]|
- */
G_DEFINE_TYPE (GSettingsSchema, g_settings_schema, G_TYPE_OBJECT)