fix load error in scaffold

diff --git a/basis/tools/scaffold/scaffold-docs.factor b/basis/tools/scaffold/scaffold-docs.factor
index 9074c809869d790f3ee7dd123b99f666b8d1c808..0a75732553078f0bc42c26dabaab6e72256c5f4b 100644 (file)
--- a/basis/tools/scaffold/scaffold-docs.factor
+++ b/basis/tools/scaffold/scaffold-docs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax kernel strings words ;
+USING: help.markup help.syntax kernel strings words vocabs ;
 IN: tools.scaffold
 
 HELP: developer-name
@@ -13,7 +13,7 @@ HELP: help.
 { $description "Prints out scaffold help markup for a given word." } ;
 
 HELP: scaffold-help
-{ $values { "string" string } }
+{ $values { "vocab" vocab } }
 { $description "Takes an existing vocabulary and creates a help file with scaffolded help for each word. This word only works if no help file yet exists." } ;
 
 HELP: scaffold-undocumented

diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index 5a0bf66e261b50a692b18d6a853efa056eb5c936..16729394bfc9416fb457148ba07300979901f929 100755 (executable)
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -169,7 +169,7 @@ ERROR: no-vocab vocab ;
 : docs-header. ( word -- )
     "HELP: " write name>> print ;
 
-: (docs.) ( word -- )
+: (help.) ( word -- )
     [ docs-header. ] [ $values. ] [ $description. ] tri ;
 
 : interesting-words ( vocab -- array )
@@ -178,7 +178,7 @@ ERROR: no-vocab vocab ;
     natural-sort ;
 
 : interesting-words. ( vocab -- )
-    interesting-words [ (docs.) nl ] each ;
+    interesting-words [ (help.) nl ] each ;
 
 : docs-file-string ( vocab -- str2 )
     [
@@ -216,11 +216,11 @@ ERROR: no-vocab vocab ;
     "Edit documentation: " write
     "-docs.factor" vocab/suffix>path <pathname> . ;
 
-: docs. ( word -- )
-    [ (docs.) ] [ nl vocabulary>> link-vocab ] bi ;
-
 PRIVATE>
 
+: help. ( word -- )
+    [ (help.) ] [ nl vocabulary>> link-vocab ] bi ;
+
 : scaffold-help ( vocab -- )
     [
         dup "-docs.factor" vocab/suffix>path scaffolding? [