summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/ChangeLog8
-rw-r--r--docs/reference/glib/tmpl/scanner.sgml5
2 files changed, 11 insertions, 2 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index aead46156..1a765672d 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,6 +1,12 @@
+2002-03-25 Sven Neumann <sven@gimp.org>
+
+ * glib/tmpl/scanner.sgml: Fixed documentation about unused struct
+ fields and added a note about proper g_scanner_unexp_token() usage.
+
2002-03-11 Matthias Clasen <maclas@gmx.de>
- * glib/tmpl/string_utils.sgml: Add a note about g_strreverse() and UTF-8.
+ * glib/tmpl/string_utils.sgml: Add a note about g_strreverse() and
+ UTF-8.
2002-02-21 Matthias Clasen <maclas@gmx.de>
diff --git a/docs/reference/glib/tmpl/scanner.sgml b/docs/reference/glib/tmpl/scanner.sgml
index f936b2e30..0bc4a9b06 100644
--- a/docs/reference/glib/tmpl/scanner.sgml
+++ b/docs/reference/glib/tmpl/scanner.sgml
@@ -31,7 +31,7 @@ name would be a good choice.
</para>
<para>
The <structfield>user_data</structfield> and
-<structfield>derived_data</structfield> fields are not used.
+<structfield>max_parse_errors</structfield> fields are not used.
If you need to associate extra data with the scanner you can place them here.
</para>
<para>
@@ -435,6 +435,9 @@ documentation.
<!-- ##### FUNCTION g_scanner_unexp_token ##### -->
<para>
Outputs a message resulting from an unexpected token in the input stream.
+Note that you should not call g_scanner_peek_next_token() followed by
+g_scanner_unexp_token() without an intermediate call to
+g_scanner_get_next_token().
</para>
@scanner: a #GScanner.