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

diff --git a/extra/qualified/qualified-docs.factor b/extra/qualified/qualified-docs.factor
index d336d31114a0f5d0c0b4a685f2248f020e2a5614..c5cb088db38c49118b3fa305df781be2b40acf55 100755 (executable)
--- a/extra/qualified/qualified-docs.factor
+++ b/extra/qualified/qualified-docs.factor
@@ -8,26 +8,26 @@ HELP: QUALIFIED:
     "QUALIFIED: math\n1 2 math:+ ! ==> 3" } } ;
 
 HELP: QUALIFIED-WITH:
-{ $syntax "QUALIFIED-WITH: vocab prefix" }
-{ $description "Works like " { $link POSTPONE: QUALIFIED: } " but uses the specified prefix." }
+{ $syntax "QUALIFIED-WITH: vocab word-prefix" }
+{ $description "Works like " { $link POSTPONE: QUALIFIED: } " but uses " { $snippet "word-prefix" } " as prefix." }
 { $examples { $code
     "QUALIFIED-WITH: math m\n1 2 m:+ ! ==> 3" } } ;
 
 HELP: FROM:
 { $syntax "FROM: vocab => words ... ;" }
-{ $description "Imports the specified words from vocab." }
+{ $description "Imports " { $snippet "words" } " from " { $snippet "vocab" } "." }
 { $examples { $code
     "FROM: math.parser => bin> hex> ; ! imports only bin> and hex>" } } ;
 
 HELP: EXCLUDE:
 { $syntax "EXCLUDE: vocab => words ... ;" }
-{ $description "Imports everything from vocab excluding the specified words" }
+{ $description "Imports everything from " { $snippet "vocab" } " excluding " { $snippet "words" } "." }
 { $examples { $code
     "EXCLUDE: math.parser => bin> hex> ; ! imports everythin but bin> and hex>" } } ;
 
 HELP: RENAME:
 { $syntax "RENAME: word vocab => newname " }
-{ $description "Imports word from vocab, but renamed to newname." }
+{ $description "Imports " { $snippet "word" } " from " { $snippet "vocab" } ", but renamed to " { $snippet "newname" } "." }
 { $examples { $code
     "RENAME: + math => -"
     "2 3 - ! => 5" } } ;