diff --git a/ChangeLog b/ChangeLog
index e31fa3352..9250b7b9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-25  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Tools/AGSParser.m: Interpret a mapping to '//' in the WordMap as
+	meaning that the resto of the line containing the mapped value
+	should be ignored.
+
 2002-04-24  Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Tools/make_strings/GNUmakefile - modified to prevent build
diff --git a/Tools/AGSParser.m b/Tools/AGSParser.m
index ad18f6132..ebaf2d5ee 100644
--- a/Tools/AGSParser.m
+++ b/Tools/AGSParser.m
@@ -1155,6 +1155,11 @@ try:
 	    }
 	  else if ([val length] > 0)
 	    {
+	      if ([val isEqualToString: @"//"] == YES)
+		{
+		  [self skipRemainderOfLine];
+		  return [self parseIdentifier];
+		}
 	      return val;	// Got mapped identifier.
 	    }
 	  goto try;		// Mapping removed the identifier.
diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m
index fb763e796..370aba298 100644
--- a/Tools/autogsdoc.m
+++ b/Tools/autogsdoc.m
@@ -294,7 +294,11 @@
       in the source files  to other words.  Generally you will not have
       to use this, but it is sometimes helpful to avoid the parser being
       confused by the use of C preprocessor macros.  You can effectively
-      redefine the macro to something less confusing.
+      redefine the macro to something less confusing.<br />
+      The value you map the identifier to must be one of -<br />
+      Another identifier,<br />
+      An empty string - the value is ignored,<br />
+      Two slashes ('//') - the rest of the line is ignored.<br />
     </item>
   </list>
   <section>