diff --git a/ChangeLog b/ChangeLog
index 438c94f97..f6c957823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gconvert.c (g_get_filename_charsets): Improve
+	formatting of docs. 
+
 2006-12-26  Behdad Esfahbod  <behdad@gnome.org>
 
 	* configure.in: Use libtool to determine shared library suffix.
diff --git a/glib/gconvert.c b/glib/gconvert.c
index e5b476ba3..0d27ed0f1 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -1144,8 +1144,8 @@ filename_charset_cache_free (gpointer data)
  * used in the GLib API is always UTF-8 and said environment variables
  * have no effect.
  *
- * <envar>G_FILENAME_ENCODING</envar> may be set to a comma-separated list 
- * of character set names. The special token "@locale" is taken to mean the 
+ * <envar>G_FILENAME_ENCODING</envar> may be set to a comma-separated list of 
+ * character set names. The special token "&commat;locale" is taken to mean the
  * character set for the current locale. If <envar>G_FILENAME_ENCODING</envar> 
  * is not set, but <envar>G_BROKEN_FILENAMES</envar> is, the character set of 
  * the current locale is taken as the filename encoding. If neither environment