Merge branch 'doc-fixes' into 'master'

Various doc fixes

See merge request GNOME/glib!982

gio/gasyncinitable.h

@@ -97,6 +97,7 @@ void     g_async_initable_new_async        (GType                 object_type,
 					    ...);
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_async_initable_init_async)
 void     g_async_initable_newv_async       (GType                 object_type,
 					    guint                 n_parameters,
@@ -105,6 +106,7 @@ void     g_async_initable_newv_async       (GType                 object_type,
 					    GCancellable         *cancellable,
 					    GAsyncReadyCallback   callback,
 					    gpointer              user_data);
+
 G_GNUC_END_IGNORE_DEPRECATIONS
 
 GLIB_AVAILABLE_IN_ALL

gio/gcontenttype.h

@@ -70,10 +70,12 @@ GLIB_AVAILABLE_IN_ALL
 GList *  g_content_types_get_registered   (void);
 
 /*< private >*/
+#ifndef __GTK_DOC_IGNORE__
 GLIB_AVAILABLE_IN_2_60
 const gchar * const *g_content_type_get_mime_dirs (void);
 GLIB_AVAILABLE_IN_2_60
 void                 g_content_type_set_mime_dirs (const gchar * const *dirs);
+#endif /* __GTK_DOC_IGNORE__ */
 
 G_END_DECLS
 

gio/ginitable.h

@@ -82,12 +82,14 @@ gpointer g_initable_new        (GType          object_type,
 				...);
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_initable_init)
 gpointer g_initable_newv       (GType          object_type,
 				guint          n_parameters,
 				GParameter    *parameters,
 				GCancellable  *cancellable,
 				GError       **error);
+
 G_GNUC_END_IGNORE_DEPRECATIONS
 
 GLIB_AVAILABLE_IN_ALL

gio/gnetworkaddress.c

@@ -224,7 +224,7 @@ g_network_address_get_property (GObject    *object,
 
 }
 
-/**
+/*
  * inet_addresses_to_inet_socket_addresses:
  * @addresses: (transfer full): #GList of #GInetAddress
  *