summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-05-11 18:53:57 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-05-11 18:53:57 +0000
commit8f88ba6ffa6de84c835aee701a454b5c0488532d (patch)
tree53c1ed6c63f77348f587e9a27c63a7c279845804 /docs
parentec11b71411abf0cca229e9fbc4b32724a09b0642 (diff)
Allow G_OPTION_ARG_CALLBACK for G_OPTION_REMAINING. (#437297, Dave Benson)
2007-05-11 Matthias Clasen <mclasen@redhat.com> * glib/goption.c: Allow G_OPTION_ARG_CALLBACK for G_OPTION_REMAINING. (#437297, Dave Benson) * tests/option-test.c: Add a test for this. svn path=/trunk/; revision=5487
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/ChangeLog5
-rw-r--r--docs/reference/glib/tmpl/option.sgml3
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index aa65d4125..0799374c0 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-11 Matthias Clasen <mclasen@redhat.com>
+
+ * glib/tmpl/option.sgml: Document new G_OPTION_ARG_REMAINING
+ functionality.
+
2007-05-03 Behdad Esfahbod <behdad@gnome.org>
* glib/glib-sections.txt:
diff --git a/docs/reference/glib/tmpl/option.sgml b/docs/reference/glib/tmpl/option.sgml
index f85f98210..9dc78ead9 100644
--- a/docs/reference/glib/tmpl/option.sgml
+++ b/docs/reference/glib/tmpl/option.sgml
@@ -378,7 +378,8 @@ Flags which modify individual options.
If a long option in the main group has this name, it is not treated as a
regular option. Instead it collects all non-option arguments which would
otherwise be left in <literal>argv</literal>. The option must be of type
-%G_OPTION_ARG_STRING_ARRAY or %G_OPTION_ARG_FILENAME_ARRAY.
+%G_OPTION_ARG_CALLBACK, %G_OPTION_ARG_STRING_ARRAY
+or %G_OPTION_ARG_FILENAME_ARRAY.
</para>
<para>