diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index cbf23537f9..11887c25be 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkfilefilter.sgml: Mention subclassing, aliasing
+	and supertypes.
+
 2004-11-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/images/combo-box.png: New image
diff --git a/docs/reference/gtk/tmpl/gtkfilefilter.sgml b/docs/reference/gtk/tmpl/gtkfilefilter.sgml
index fbe7130cde..34cc4d8f58 100644
--- a/docs/reference/gtk/tmpl/gtkfilefilter.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilefilter.sgml
@@ -13,6 +13,14 @@ gtk_file_filter_add_mime_type()), or by a custom filter function
 (with gtk_file_filter_add_custom()). 
 </para>
 
+<para>
+Filtering by mime types handles aliasing and subclassing of mime
+types; e.g. a filter for text/plain also matches a file with mime 
+type application/rtf, since application/rtf is a subclass of 
+text/plain. Note that #GtkFileFilter allows wildcards for the 
+subtype of a mime type, so you can e.g. filter for image/*.
+</para>
+
 <para>
 Normally, filters are used by adding them to a #GtkFileChooser,
 see gtk_file_chooser_add_filter(), but it is also possible