diff --git a/ChangeLog b/ChangeLog
index a52ae4461..d79d2a5c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-11-06  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSObject.m: Use %p to print address in description.
+	* Documentation/General/OpenStepCompliance.gsdoc:
+	* Documentation/General/Debugging.gsdoc:
+	* Tools/gsdoc.gsdoc:
+	* Tools/gdomap.gsdoc:
+	* Tools/gsdoc-1_0_1.dtd:
+	* Tools/gsdoc-1_0_1.rnc:
+	* Tools/autogsdoc.m:
+	* Tools/AGSOutput.m:
+	* Tools/autogsdoc.1:
+	* Tools/BaseTools.gsdoc:
+	Minor documentation version fixups.
+
 2006-11-03  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSString.m: ([stringByAddingPercentEscapesUsingEncoding:])
diff --git a/Documentation/General/Debugging.gsdoc b/Documentation/General/Debugging.gsdoc
index 74be69b88..950ffab04 100644
--- a/Documentation/General/Debugging.gsdoc
+++ b/Documentation/General/Debugging.gsdoc
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.1//EN" "http://www.gnustep.org/gsdoc-1_0_1.xml">
+<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.3//EN" "http://www.gnustep.org/gsdoc-1_0_3.xml">
 <!--
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/Documentation/General/OpenStepCompliance.gsdoc b/Documentation/General/OpenStepCompliance.gsdoc
index 49ad930ec..b7d6cb0b4 100644
--- a/Documentation/General/OpenStepCompliance.gsdoc
+++ b/Documentation/General/OpenStepCompliance.gsdoc
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.1//EN" "http://www.gnustep.org/gsdoc-1_0_1.xml">
+<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.3//EN" "http://www.gnustep.org/gsdoc-1_0_3.xml">
 <!--
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 0a8445b45..4414b6057 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -1485,8 +1485,8 @@ GSDescriptionForClassMethod(pcl self, SEL aSel)
  */
 - (NSString*) description
 {
-  return [NSString stringWithFormat: @"<%s: %lx>",
-    GSClassNameFromObject(self), (unsigned long)self];
+  return [NSString stringWithFormat: @"<%s: %p>",
+    GSClassNameFromObject(self), self];
 }
 
 /**
@@ -2372,8 +2372,8 @@ GSDescriptionForClassMethod(pcl self, SEL aSel)
 }
 - (NSString*) description
 {
-  return [NSString stringWithFormat: @"<%s: %lx>",
-    GSClassNameFromObject(self), (unsigned long)self];
+  return [NSString stringWithFormat: @"<%s: %p>",
+    GSClassNameFromObject(self), self];
 }
 - (BOOL) isProxy
 {
diff --git a/Tools/AGSOutput.m b/Tools/AGSOutput.m
index 098de1d17..eb04b9ee7 100644
--- a/Tools/AGSOutput.m
+++ b/Tools/AGSOutput.m
@@ -2334,7 +2334,7 @@ static BOOL snuggleStart(NSString *t)
 
 	  [str appendString: @"<?xml version=\"1.0\"?>\n"];
 	  [str appendString: @"<!DOCTYPE gsdoc PUBLIC "];
-	  [str appendString: @"\"-//GNUstep//DTD gsdoc 1.0.1//EN\" "];
+	  [str appendString: @"\"-//GNUstep//DTD gsdoc 1.0.3//EN\" "];
 	  [str appendString: @"\"http://www.gnustep.org/gsdoc-1_0_3.xml\">\n"];
 	  [str appendString: @"<gsdoc base=\""];
 	  [str appendString: [name lastPathComponent]];
diff --git a/Tools/BaseTools.gsdoc b/Tools/BaseTools.gsdoc
index d3d7d6f43..8bf334605 100644
--- a/Tools/BaseTools.gsdoc
+++ b/Tools/BaseTools.gsdoc
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.1//EN" "http://www.gnustep.org/gsdoc-1_0_1.xml">
+<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.3//EN" "http://www.gnustep.org/gsdoc-1_0_3.xml">
 <!--
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/Tools/autogsdoc.1 b/Tools/autogsdoc.1
index 5b8206a06..ace596001 100644
--- a/Tools/autogsdoc.1
+++ b/Tools/autogsdoc.1
@@ -542,9 +542,9 @@ default should be a hand-edited GSDoc document which should have a
 .P
 <?xml version="1.0"?>
 .RS 0
-<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.1//EN" 
+<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.3//EN" 
 .RS 0
-                        "http://www.gnustep.org/gsdoc-1_0_1.xml">
+                        "http://www.gnustep.org/gsdoc-1_0_3.xml">
 .RS 0
 <gsdoc base="index">
 .RS 0
diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m
index 920523b8b..0b3d10811 100644
--- a/Tools/autogsdoc.m
+++ b/Tools/autogsdoc.m
@@ -546,7 +546,7 @@
     </p>
 <example>
   &lt;?xml version="1.0"?&gt;
-  &lt;!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.1//EN"
+  &lt;!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.3//EN"
   "http://www.gnustep.org/gsdoc-1_0_3.xml"&gt;
   &lt;gsdoc base="index"&gt;
     &lt;head&gt;
@@ -1774,7 +1774,7 @@ main(int argc, char **argv, char **env)
 
       // skeleton for table of contents files
       [tocSkel setString: @"<?xml version=\"1.0\"?>\n"
-@"<!DOCTYPE gsdoc PUBLIC \"-//GNUstep//DTD gsdoc 1.0.1//EN\" \"http://www.gnustep.org/gsdoc-1_0_3.xml\">\n"
+@"<!DOCTYPE gsdoc PUBLIC \"-//GNUstep//DTD gsdoc 1.0.3//EN\" \"http://www.gnustep.org/gsdoc-1_0_3.xml\">\n"
 @"<gsdoc base=\"[typeU]\" stylesheeturl=\"gsdoc_contents\">\n"
 @"  <head>\n"
 @"    <title>[typeU]</title>\n"
@@ -1880,7 +1880,7 @@ main(int argc, char **argv, char **env)
 @"named %@ in the documentation output directory.\n"
 @"Then include this file in the arguments to autogsdoc.\n\n", prjFile);
           [prjFileContents setString: @"<?xml version=\"1.0\"?>\n"
-@"<!DOCTYPE gsdoc PUBLIC \"-//GNUstep//DTD gsdoc 1.0.1//EN\" \"http://www.gnustep.org/gsdoc-1_0_3.xml\">\n"
+@"<!DOCTYPE gsdoc PUBLIC \"-//GNUstep//DTD gsdoc 1.0.3//EN\" \"http://www.gnustep.org/gsdoc-1_0_3.xml\">\n"
 @"<gsdoc base=\"[prjName]\">\n"
 @"  <head>\n"
 @"    <title>The [prjName] Project</title>\n"
diff --git a/Tools/gdomap.gsdoc b/Tools/gdomap.gsdoc
index fd1cde749..5b356cfdd 100644
--- a/Tools/gdomap.gsdoc
+++ b/Tools/gdomap.gsdoc
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.1//EN" "http://www.gnustep.org/gsdoc-1_0_1.xml">
+<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.3//EN" "http://www.gnustep.org/gsdoc-1_0_3.xml">
 <!--
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/Tools/gsdoc-1_0_1.dtd b/Tools/gsdoc-1_0_1.dtd
index ac407654c..4c4e5cdfe 100644
--- a/Tools/gsdoc-1_0_1.dtd
+++ b/Tools/gsdoc-1_0_1.dtd
@@ -28,7 +28,7 @@
 <!--
   gsdoc is an XML language - Typical usage:
   <?xml version="1.0"?>
-  <!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.1//EN"
+  <!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.3//EN"
 	"http://www.gnustep.org/gsdoc.xml">
   <gsdoc base="myDocName">
   </gsdoc>
diff --git a/Tools/gsdoc-1_0_1.rnc b/Tools/gsdoc-1_0_1.rnc
index 75aeac0d8..8e6cd9529 100644
--- a/Tools/gsdoc-1_0_1.rnc
+++ b/Tools/gsdoc-1_0_1.rnc
@@ -53,7 +53,7 @@
 
 # gsdoc is an XML language - Typical usage:
 # <?xml version="1.0"?>
-# <!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.1//EN"
+# <!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.3//EN"
 #       "http://www.gnustep.org/gsdoc.xml">
 # <gsdoc base="myDocName">
 # </gsdoc>
diff --git a/Tools/gsdoc.gsdoc b/Tools/gsdoc.gsdoc
index ef6ec73f7..f6f551bda 100644
--- a/Tools/gsdoc.gsdoc
+++ b/Tools/gsdoc.gsdoc
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.1//EN" "http://www.gnustep.org/gsdoc-1_0_1.xml">
+<!DOCTYPE gsdoc PUBLIC "-//GNUstep//DTD gsdoc 1.0.3//EN" "http://www.gnustep.org/gsdoc-1_0_3.xml">
 <!--
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -15,8 +15,8 @@ notice and this notice are preserved.
         A person who devotes far too much time to GNUstep development.
       </desc>
     </author>
-    <version>1.0.1</version>
-    <date>8 March, 2004</date>
+    <version>1.0.3</version>
+    <date>6 Nov, 2006</date>
     <abstract>
       This documents the GNUstep Documentation markup language.
     </abstract>