summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2016-03-28 11:58:15 +0200
committerMurray Cumming <murrayc@murrayc.com>2016-03-28 11:58:34 +0200
commit7e9ddc40a225b11dd046304307b6632bca04110e (patch)
tree20e3ff324d58e40f64e3b4b093e10b16771e4484
parent916e5b5952cc494da1abc772e8fa4f477153435b (diff)
downloadglibmm-7e9ddc40a225b11dd046304307b6632bca04110e.tar.gz
Regenerate docs.xml files.
-rw-r--r--gio/src/gio_docs.xml2
-rw-r--r--glib/src/glib_docs.xml9
2 files changed, 6 insertions, 5 deletions
diff --git a/gio/src/gio_docs.xml b/gio/src/gio_docs.xml
index b7bad576..a575ef99 100644
--- a/gio/src/gio_docs.xml
+++ b/gio/src/gio_docs.xml
@@ -7263,7 +7263,7 @@ Since: 2.28
</parameter>
</parameters>
<return> a %NULL-terminated array of the names of the
-actions in the groupb
+actions in the group
</return>
</function>
diff --git a/glib/src/glib_docs.xml b/glib/src/glib_docs.xml
index b785ad39..3692d2d9 100644
--- a/glib/src/glib_docs.xml
+++ b/glib/src/glib_docs.xml
@@ -899,7 +899,8 @@ This level is also used for messages produced by g_assert().
</parameter_description>
</parameter>
<parameter name="G_LOG_LEVEL_CRITICAL">
-<parameter_description> log level for critical messages, see g_critical().
+<parameter_description> log level for critical warning messages, see
+g_critical().
This level is also used for messages produced by g_return_if_fail()
and g_return_val_if_fail().
</parameter_description>
@@ -11934,7 +11935,7 @@ Since: 2.8
<function name="g_clear_error">
<description>
-If @err is %NULL, does nothing. If @err is non-%NULL,
+If @err or *@err is %NULL, does nothing. Otherwise,
calls g_error_free() on *@err and sets *@err to %NULL.
</description>
@@ -18560,8 +18561,8 @@ in the
[XDG Base Directory Specification](http://www.freedesktop.org/Standards/basedir-spec).
This is the directory
specified in the `XDG_RUNTIME_DIR` environment variable.
-In the case that this variable is not set, GLib will issue a warning
-message to stderr and return the value of g_get_user_cache_dir().
+In the case that this variable is not set, we return the value of
+g_get_user_cache_dir(), after verifying that it exists.
On Windows this is the folder to use for local (as opposed to
roaming) application data. See documentation for