From 2125a86d737fa1f0b81638a882dac0b6052b05b6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Thu, 11 Oct 2001 20:40:55 +0000
Subject: [PATCH] Updates.

       * glib/tmpl/patterns.sgml, glib/tmpl/shell.sgml: Updates.
---
 docs/reference/ChangeLog               |  4 ++++
 docs/reference/glib/tmpl/patterns.sgml | 11 ++++++++---
 docs/reference/glib/tmpl/shell.sgml    |  3 ---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index e9df56c93..8cca5f537 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-11  Matthias Clasen  <matthiasc@poet.de>
+
+	* glib/tmpl/patterns.sgml, glib/tmpl/shell.sgml: Updates.
+
 2001-10-05  Matthias Clasen  <matthiasc@poet.de>
 
 	* glib/tmpl/hooks.sgml: Document G_HOOK_FLAG_USER_SHIFT.
diff --git a/docs/reference/glib/tmpl/patterns.sgml b/docs/reference/glib/tmpl/patterns.sgml
index b1ad4fabb..89344d875 100644
--- a/docs/reference/glib/tmpl/patterns.sgml
+++ b/docs/reference/glib/tmpl/patterns.sgml
@@ -11,11 +11,16 @@ The <function>g_pattern_match*</function> functions match a string
 against a pattern containing '*' and '?' wildcards with similar semantics 
 as the standard <function>glob()</function> function: '*' matches an
 arbitrary, possibly empty, string, '?' matches an arbitrary character.
-Note that in contrast to <function>glob()</function>, the '/' character
-<emphasis>can</emphasis> be matched by the wildcards. 
 </para>
 <para>
-There is no way to include literal '*' or '?' characters in a pattern. 
+Note that in contrast to <function>glob()</function>, the '/' character
+<emphasis>can</emphasis> be matched by the wildcards, there are no
+'[...]' character ranges and '*', '?' and '[' can <emphasis>not</emphasis>
+be escaped to include them literally in a pattern. 
+</para>
+<para>
+The pattern matcher is restricted to ASCII and will not work correctly with
+multibyte UTF-8 characters in the pattern or in the string to match.
 </para>
 <para>
 When multiple string must be matched against the same pattern, it
diff --git a/docs/reference/glib/tmpl/shell.sgml b/docs/reference/glib/tmpl/shell.sgml
index 13478ac2a..99d859fb7 100644
--- a/docs/reference/glib/tmpl/shell.sgml
+++ b/docs/reference/glib/tmpl/shell.sgml
@@ -42,9 +42,6 @@ error domains.
 @argvp: 
 @error: 
 @Returns: 
-<!-- # Unused Parameters # -->
-@argc: 
-@argv: 
 
 
 <!-- ##### FUNCTION g_shell_quote ##### -->