diff --git a/ChangeLog b/ChangeLog
index c49f2a8fb..dd8cbbf00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gwin32.c: Add bits of markup to g_win32_get_windows_version()
+	docs.
+
 2004-10-31  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Document g_win32_get_windows_version().
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c49f2a8fb..dd8cbbf00 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gwin32.c: Add bits of markup to g_win32_get_windows_version()
+	docs.
+
 2004-10-31  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Document g_win32_get_windows_version().
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c49f2a8fb..dd8cbbf00 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-10-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gwin32.c: Add bits of markup to g_win32_get_windows_version()
+	docs.
+
 2004-10-31  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Document g_win32_get_windows_version().
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c49f2a8fb..dd8cbbf00 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gwin32.c: Add bits of markup to g_win32_get_windows_version()
+	docs.
+
 2004-10-31  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Document g_win32_get_windows_version().
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c49f2a8fb..dd8cbbf00 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gwin32.c: Add bits of markup to g_win32_get_windows_version()
+	docs.
+
 2004-10-31  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Document g_win32_get_windows_version().
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index fa8c45bd1..6b52be4e4 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-31  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/tmpl/windows.sgml: Document G_WIN32_IS_NT_BASED,
+	G_WIN32_HAVE_WIDECHAR_API.
+
+	* glib/glib-sections.txt: Add g_lstat
+
+	* glib/running.sgml: Document G_WIN32_PRETEND_WIN9X.
+
 2004-10-29  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/tmpl/option.sgml: Add an example.
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index ef611d2ba..996ea5a8c 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -991,6 +991,7 @@ g_open
 g_rename
 g_mkdir
 g_stat
+g_lstat
 g_unlink
 g_remove
 g_fopen
diff --git a/docs/reference/glib/running.sgml b/docs/reference/glib/running.sgml
index f86fdf92c..8cd4d58ef 100644
--- a/docs/reference/glib/running.sgml
+++ b/docs/reference/glib/running.sgml
@@ -97,6 +97,17 @@ variables like <envar>LANG</envar>, <envar>PATH</envar> or <envar>HOME</envar>.
   </para>
 </formalpara> 
 
+<formalpara>
+  <title><envar>G_WIN32_PRETEND_WIN9X</envar></title>
+
+  <para>
+    Setting this variable to any value forces g_win32_get_windows_version()
+    to return a version code for Windows 9x. This is mainly an internal 
+    debugging aid for GTK+ and GLib developers, to be able to check the 
+    code paths for Windows 9x.
+  </para>
+</formalpara> 
+
 </refsect2>
 
 <refsect2>
diff --git a/docs/reference/glib/tmpl/windows.sgml b/docs/reference/glib/tmpl/windows.sgml
index f544519f1..07310efb3 100644
--- a/docs/reference/glib/tmpl/windows.sgml
+++ b/docs/reference/glib/tmpl/windows.sgml
@@ -99,22 +99,28 @@ On non-Windows platforms, expands to nothing.
    will be stored. If this is used, you must also include 
    <filename>windows.h</filename>. If you need a more complex DLL entry 
    point function, you cannot use this.
-<!-- # Unused Parameters # -->
-@static: 
-@dll_name: 
 
 
 <!-- ##### MACRO G_WIN32_HAVE_WIDECHAR_API ##### -->
 <para>
-
+On Windows, this macro defines an expression which evaluates to %TRUE
+if functions like _wopen(), _wrename(), etc., are available.
+</para>
+<para>
+On non-Windows platforms, it is not defined.
 </para>
 
-
+@Since: 2.6
 
 <!-- ##### MACRO G_WIN32_IS_NT_BASED ##### -->
 <para>
-
+On Windows, this macro defines an expression which evaluates to %TRUE 
+if the code is running on an NT-based Windows operating system.
+</para>
+<para>
+On non-Windows platforms, it is not defined.
 </para>
 
+@Since: 2.6
 
 
diff --git a/glib/gwin32.c b/glib/gwin32.c
index 4e06dfc0a..db39cdd22 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -1313,12 +1313,15 @@ _g_win32_thread_init (void)
  * version and feature information should use Win32 API like
  * GetVersionEx() and VerifyVersionInfo().
  *
- * If there is an environment variable G_WIN32_PRETEND_WIN9X defined
- * (with any value), this function always returns a version code for
- * Windows 9x. This is mainly an internal debugging aid for GTK and
- * GLib developers, to be able to check the code paths for Win9x.
+ * If there is an environment variable <envar>G_WIN32_PRETEND_WIN9X</envar> 
+ * defined (with any value), this function always returns a version 
+ * code for Windows 9x. This is mainly an internal debugging aid for 
+ * GTK+ and GLib developers, to be able to check the code paths for 
+ * Windows 9x.
  *
  * Returns: The version information.
+ * 
+ * Since: 2.6
  **/
 guint
 g_win32_get_windows_version (void)