Merge branch 'master' of http://factorcode.org/git/factor

diff --cc core/parser/parser-docs.factor
index b036f68db433ab628b8d0a88dc7d0cb7b11351fc,444eec8b6397c366495ff57450a47e6cd2ea45da..7e94d71c29af99c6b6d8f48409377b264a30f29c
--- 1/core/parser/parser-docs.factor
--- 2/core/parser/parser-docs.factor
+++ b/core/parser/parser-docs.factor
@@@ -140,15 -140,9 +140,15 @@@ HELP: no-wor
  { $values { "name" string } { "newword" word } }
  { $description "Throws a " { $link no-word-error } "." } ;
  
 +HELP: parse-word
 +{ $values { "string" string } { "word/number" "a word or number" } }
 +{ $description "If " { $snippet "string" } " is a valid number literal, it is converted to a number, otherwise the current vocabulary search path is searched for a word named by the string." }
 +{ $errors "Throws an error if the token does not name a word, and does not parse as a number." }
 +{ $notes "This word is used to implement " { $link scan-word } "." } ;
 +
  HELP: scan-word
  { $values { "word/number/f" "a word, number or " { $link f } } }
- { $description "Reads the next token from parser input. If the token is a valid number literal, it is converted to a number, otherwise the dictionary is searched for a word named by the token. Outputs " { $link f } " if the end of the input has been reached." }
+ { $description "Reads the next token from parser input. If the token is a valid number literal, it is converted to a number, otherwise the vocabulary search path is searched for a word named by the token. Outputs " { $link f } " if the end of the input has been reached." }
  { $errors "Throws an error if the token does not name a word, and does not parse as a number." }
  $parsing-note ;