--- gforth/doc/makedoc.fs	2007/12/31 17:34:59	1.12
+++ gforth/doc/makedoc.fs	2010/04/10 12:37:07	1.14
@@ -6,7 +6,7 @@
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 
 \ the stack effect of loading this file is: ( addr u -- )
@@ -85,18 +84,18 @@ s" \ automatically generated by makedoc.
             endif
         endif
 	[char] \ parse 2drop
-	>in @
-	bl word  dup c@
+        >in @
+        parse-name dup
 	IF
-	    dup count 1- chars + c@ [char] - =
+	    2dup 1- chars + c@ [char] - =
 	    IF
 		s" --" >file
-		count >file drop
+		>file drop
 	    ELSE
-		drop >in !
+		2drop >in !
 	    THEN
 	ELSE
-	    drop >in !
+	    2drop >in !
 	THEN
         latest name>string >file
         s"  " >file