GIO doc cleanups

diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index 0a62e15215a356eeac3469bcc5f7c81fc723a453..5f6fc1b986582bce7d0dd092b927150912c29b6c 100644 (file)
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -32,10 +32,15 @@ IGNORE_HFILES=                              \
        gdbusauthmechanismexternal.h    \
        gdbusauthmechanismsha1.h        \
        gdbusprivate.h                  \
+       gdbus-sessionbus.h              \
+       gdbus-tests.h                   \
+       testenums.h                     \
        gdelayedsettingsbackend.h       \
        gdummyfile.h                    \
        gfamdirectorymonitor.h          \
        gfamfilemonitor.h               \
+       gfendirectorymonitor.h          \
+       gfenfilemonitor.h               \
        gfileattribute-priv.h           \
        gfileinfo-priv.h                \
        ginotifydirectorymonitor.h      \
@@ -52,6 +57,7 @@ IGNORE_HFILES=                                \
        glocalfileenumerator.h          \
        glocalfileinfo.h                \
        glocalfileinputstream.h         \
+       glocalfileiostream.h            \
        glocalfilemonitor.h             \
        glocalfileoutputstream.h        \
        glocalvfs.h                     \
@@ -67,9 +73,21 @@ IGNORE_HFILES=                               \
        gunixdrive.h                    \
        gunixresolver.h                 \
        gunixvolume.h                   \
+       gvdb-builder.h                  \
+       gvdb-format.h                   \
+       gvdb-render.h                   \
        gvolumeprivate.h                \
        gwin32appinfo.h                 \
+       gwin32mount.h                   \
+       gwin32directorymonitor.h        \
+       gwin32inputstream.h             \
+       gwin32outputstream.h            \
+       gwin32volumemonitor.h           \
        gwin32resolver.h                \
+       gwinhttpfile.h                  \
+       gwinhttpfileinputstream.h       \
+       gwinhttpfileoutputstream.h      \
+       gwinhttpvfs.h                   \
        inotify-diag.h                  \
        inotify-helper.h                \
        inotify-kernel.h                \

diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index 75faa9390c07da9e1a162aa1cabd21116938a60f..6feece7e2e6b22db897a7d34400969b33b73fb5f 100644 (file)
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -299,6 +299,8 @@ G_FILE_ATTRIBUTE_FILESYSTEM_READONLY
 G_FILE_ATTRIBUTE_GVFS_BACKEND
 G_FILE_ATTRIBUTE_SELINUX_CONTEXT
 G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT
+G_FILE_ATTRIBUTE_TRASH_DELETION_DATE
+G_FILE_ATTRIBUTE_TRASH_ORIG_PATH
 G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW
 G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION
 g_file_info_new
@@ -1474,6 +1476,7 @@ G_UNIX_FD_LIST_CLASS
 G_IS_UNIX_FD_LIST
 G_IS_UNIX_FD_LIST_CLASS
 G_UNIX_FD_LIST_GET_CLASS
+G_TYPE_UNIX_FD_LIST
 <SUBSECTION Private>
 GUnixFDListPrivate
 g_unix_fd_list_get_type
@@ -1598,9 +1601,11 @@ g_resolver_lookup_service
 g_resolver_lookup_service_async
 g_resolver_lookup_service_finish
 g_resolver_free_targets
+
 <SUBSECTION>
 G_RESOLVER_ERROR
 GResolverError
+
 <SUBSECTION Standard>
 GResolverClass
 G_IS_RESOLVER
@@ -1609,7 +1614,9 @@ G_RESOLVER
 G_RESOLVER_CLASS
 G_RESOLVER_GET_CLASS
 G_TYPE_RESOLVER
+
 <SUBSECTION Private>
+GResolverPrivate
 g_resolver_get_type
 g_resolver_error_quark
 </SECTION>
@@ -2116,6 +2123,7 @@ G_IS_SETTINGS_BACKEND_CLASS
 G_SETTINGS_BACKEND
 G_SETTINGS_BACKEND_CLASS
 G_SETTINGS_BACKEND_GET_CLASS
+G_TYPE_SETTINGS_BACKEND
 
 <SUBSECTION Private>
 g_settings_backend_get_type
@@ -2177,8 +2185,10 @@ G_SETTINGS_GET_CLASS
 G_SETTINGS_SCHEMA
 G_SETTINGS_SCHEMA_CLASS
 G_SETTINGS_SCHEMA_GET_CLASS
+G_TYPE_SETTINGS
 
 <SUBSECTION Private>
+GSettingsPrivate
 g_settings_get_type
 </SECTION>
 
@@ -2604,16 +2614,32 @@ g_permission_release_finish
 <SUBSECTION>
 g_permission_impl_update
 <SUBSECTION Standard>
+G_PERMISSION
+G_PERMISSION_CLASS
+G_PERMISSION_GET_CLASS
+G_IS_PERMISSION
+G_IS_PERMISSION_CLASS
+GPermissionClass
+G_TYPE_PERMISSION
+<SUBSECTION Private>
 g_permission_get_type
 GPermissionPrivate
-GPermissionClass
 </SECTION>
 
 <SECTION>
 <FILE>gsimplepermission</FILE>
 GSimplePermission
 g_simple_permission_new
+
 <SUBSECTION Standard>
+G_SIMPLE_PERMISSION
+G_SIMPLE_PERMISSION_CLASS
+G_SIMPLE_PERMISSION_GET_CLASS
+G_IS_SIMPLE_PERMISSION
+G_IS_SIMPLE_PERMISSION_CLASS
+G_TYPE_SIMPLE_PERMISSION
+
+<SUBSECTION Private>
 g_simple_permission_get_type
 </SECTION>
 

diff --git a/gio/gsettings.c b/gio/gsettings.c
index 9904e8806d0dd91fbcae65941833db7d662f2f1e..c850f3256fcfb832062cae52661a02dfa01c0ee7 100644 (file)
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -1226,7 +1226,7 @@ g_settings_get_enum (GSettings   *settings,
  * @settings: a #GSettings object
  * @key: a key, within @settings
  * @value: an enumerated value
- * Returns: %TRUE, if the set succeeds
+ * @returns: %TRUE, if the set succeeds
  *
  * Looks up the enumerated type nick for @value and writes it to @key,
  * within @settings.