Fixing issues found by stricter help lint

diff --git a/basis/ascii/ascii-docs.factor b/basis/ascii/ascii-docs.factor
index 75af8a7102431d74b867feb2c64a04accb710d46..6af697cf8935c09020d4a3846beb283eb2ea76bb 100755 (executable)
--- a/basis/ascii/ascii-docs.factor
+++ b/basis/ascii/ascii-docs.factor
@@ -46,6 +46,6 @@ ARTICLE: "ascii" "ASCII character classes"
 { $subsection printable? }\r
 { $subsection control? }\r
 { $subsection quotable? }\r
-"Modern applications should use Unicode 5.0 instead (" { $vocab-link "unicode" } ")." ;\r
+"Modern applications should use Unicode 5.0 instead (" { $vocab-link "unicode.categories" } ")." ;\r
 \r
 ABOUT: "ascii"\r

diff --git a/basis/cocoa/cocoa-docs.factor b/basis/cocoa/cocoa-docs.factor
index 01b0809f37fc85deabdf7ef75177048c25a028d7..a97128825114cff17172339828923c64ffb1e2e4 100644 (file)
--- a/basis/cocoa/cocoa-docs.factor
+++ b/basis/cocoa/cocoa-docs.factor
@@ -19,7 +19,7 @@ HELP: SUPER->
 ARTICLE: "objc-calling" "Calling Objective C code"
 "Before an Objective C class can be used, it must be imported; by default, a small set of common classes are imported automatically, but additional classes can be imported as needed."
 { $subsection import-objc-class }
-"Every imported Objective C class has as corresponding class word in the " { $vocab-link "objc-classes" } " vocabulary. Class words push the class object in the stack, allowing class methods to be invoked."
+"Every imported Objective C class has as corresponding class word in the " { $vocab-link "cocoa.classes" } " vocabulary. Class words push the class object in the stack, allowing class methods to be invoked."
 $nl
 "Messages can be sent to classes and instances using a pair of parsing words:"
 { $subsection POSTPONE: -> }

diff --git a/basis/compiler/generator/generator-docs.factor b/basis/compiler/generator/generator-docs.factor
index 45238ab00ad2c0040ac7bf9d2c043226ee9710cb..5d485b13d4e76bf6c87e35fd6808783e69366b00 100755 (executable)
--- a/basis/compiler/generator/generator-docs.factor
+++ b/basis/compiler/generator/generator-docs.factor
@@ -4,7 +4,7 @@ kernel vectors arrays effects sequences ;
 IN: compiler.generator
 
 ARTICLE: "generator" "Compiled code generator"
-"Most of the words in the " { $vocab-link "generator" } " vocabulary are internal to the compiler and user code has no reason to call them."
+"Most of the words in the " { $vocab-link "compiler.generator" } " vocabulary are internal to the compiler and user code has no reason to call them."
 $nl
 "Debugging information can be enabled or disabled; this hook is used by " { $link "tools.deploy" } ":"
 { $subsection compiled-stack-traces? }

diff --git a/basis/io/buffers/buffers-docs.factor b/basis/io/buffers/buffers-docs.factor
index fbe352185cc83f0930223013f4cf02ab943f6831..5ab25b9c31f11212e0e6f2d8a4b09a50b6812045 100755 (executable)
--- a/basis/io/buffers/buffers-docs.factor
+++ b/basis/io/buffers/buffers-docs.factor
@@ -8,7 +8,7 @@ $nl
 $nl
 "Buffers are used to implement native I/O backends."
 $nl
-"Buffer words are found in the " { $vocab-link "buffers" } " vocabulary."
+"Buffer words are found in the " { $vocab-link "io.buffers" } " vocabulary."
 { $subsection buffer }
 { $subsection <buffer> }
 "Buffers must be manually deallocated by calling " { $link dispose } "."

diff --git a/basis/io/styles/styles-docs.factor b/basis/io/styles/styles-docs.factor
index 48b72255a721321904247a0b8ca6c31e5790f7fb..febec6573a104221787751e48df6c4b91ce068d5 100644 (file)
--- a/basis/io/styles/styles-docs.factor
+++ b/basis/io/styles/styles-docs.factor
@@ -36,7 +36,7 @@ ARTICLE: "presentations" "Presentations"
 ARTICLE: "styles" "Formatted output"
 "The " { $link stream-format } ", " { $link with-style } ", " { $link with-nesting } " and " { $link tabular-output } " words take a hashtable of style attributes. Output stream implementations are free to ignore style information."
 $nl
-"Style hashtables are keyed by symbols from the " { $vocab-link "styles" } " vocabulary."
+"Style hashtables are keyed by symbols from the " { $vocab-link "io.styles" } " vocabulary."
 { $subsection "character-styles" }
 { $subsection "paragraph-styles" }
 { $subsection "table-styles" }

diff --git a/basis/logging/analysis/analysis-docs.factor b/basis/logging/analysis/analysis-docs.factor
index 10b6924b52343563351dea220a8b3a802fcf8b92..98ad28e4f63f31da79236d5af9a7620bf934e80f 100644 (file)
--- a/basis/logging/analysis/analysis-docs.factor
+++ b/basis/logging/analysis/analysis-docs.factor
@@ -20,7 +20,7 @@ HELP: analyze-log
 { $description "Analyzes a log file and prints a formatted report. The " { $snippet "word-names" } " parameter is documented in " { $link analyze-entries } "." } ;
 
 ARTICLE: "logging.analysis" "Log analysis"
-"The " { $vocab-link "logging.analysis" } " vocabulary builds on the " { $vocab-link "logging.parser" } " vocabulary. It parses log files and produces formatted summary reports. It is used by the " { $vocab-link "logger.insomniac" } " vocabulary to e-mail daily reports."
+"The " { $vocab-link "logging.analysis" } " vocabulary builds on the " { $vocab-link "logging.parser" } " vocabulary. It parses log files and produces formatted summary reports. It is used by the " { $vocab-link "logging.insomniac" } " vocabulary to e-mail daily reports."
 $nl
 "Print log file summary:"
 { $subsection analyze-log }

diff --git a/basis/logging/logging-docs.factor b/basis/logging/logging-docs.factor
index f4bdbfc64df22cb71afbf7ace21d42470d2cdbbc..7c14cae78e150068baa3c002c53866fbe56ae356 100755 (executable)
--- a/basis/logging/logging-docs.factor
+++ b/basis/logging/logging-docs.factor
@@ -100,7 +100,7 @@ ARTICLE: "logging.rotation" "Log rotation"
 "The " { $vocab-link "logging.insomniac" } " vocabulary automates log rotation." ;
 
 ARTICLE: "logging.server" "Log implementation"
-"The " { $vocab-link "logging.server" } " vocabulary implements a concurrent log server using " { $vocab-link "concurrency" } ". User code never interacts with the server directly, instead it uses the words in the " { $link "logging" } " vocabulary. The server is used to synchronize access to log files and ensure that log rotation can proceed in an orderly fashion."
+"The " { $vocab-link "logging.server" } " vocabulary implements a concurrent log server using " { $vocab-link "concurrency.messaging" } ". User code never interacts with the server directly, instead it uses the words in the " { $link "logging" } " vocabulary. The server is used to synchronize access to log files and ensure that log rotation can proceed in an orderly fashion."
 $nl
 "The " { $link log-message } " word sends a message to the server which results in the server executing an internal word:"
 { $subsection (log-message) }

diff --git a/core/strings/strings-docs.factor b/core/strings/strings-docs.factor
index 8d2a9080d4ba8911963af25976ab665e40510552..88e47d5309433da87916eeaca3ba25585fdb8de7 100755 (executable)
--- a/core/strings/strings-docs.factor
+++ b/core/strings/strings-docs.factor
@@ -23,7 +23,8 @@ $nl
 "Since strings are sequences, basic string manipulation can be performed using sequence operations (" { $link "sequences" } "). More advanced functionality can be found in other vocabularies, including but not limited to:"
 { $list
     { { $vocab-link "ascii" } " - traditional ASCII character classes" }
-    { { $vocab-link "unicode" } " - Unicode 5.0-aware character classes, case conversion, word breaks, ..." }
+    { { $vocab-link "unicode.categories" } " - Unicode character classes" }
+    { { $vocab-link "unicode.case" } " - Unicode case conversion" }
     { { $vocab-link "regexp" } " - regular expressions" }
     { { $vocab-link "peg" } " - parser expression grammars" }
 } ;

diff --git a/extra/printf/printf-docs.factor b/extra/printf/printf-docs.factor
index fdecc2ad68807aa06f15ef81105bdf3c2f51d255..d59320e350ea7f639b89d6a7495dc5bff237d7e9 100755 (executable)
--- a/extra/printf/printf-docs.factor
+++ b/extra/printf/printf-docs.factor
@@ -39,7 +39,7 @@ HELP: sprintf
 { $see-also printf } ;\r
 \r
 ARTICLE: "printf" "Formatted printing"\r
-"The " { $vocab-link "printf" } " and " { $vocab-link "sprintf" } " words are used for formatted printing.\n"\r
+"The " { $link printf } " and " { $link sprintf } " words are used for formatted printing.\n"\r
 "\n"\r
 "Several format specifications exist for handling arguments of different types, and specifying attributes for the result string, including such things as maximum width, padding, and decimals.\n"\r
 { $table\r

diff --git a/extra/wordtimer/wordtimer-docs.factor b/extra/wordtimer/wordtimer-docs.factor
index cfe6cfea494d6d5adda2d91c26a3839108d8dff4..bb64f8fed68caade85dcec59ab5ae8063c7efc54 100644 (file)
--- a/extra/wordtimer/wordtimer-docs.factor
+++ b/extra/wordtimer/wordtimer-docs.factor
@@ -42,6 +42,6 @@ HELP: wordtimer-call
 
     
 ARTICLE: "wordtimer" "Word Timer"
-"The " { $vocab-link "wordtimer" } " vocabulary measures accumulated execution time for words. If you just want to profile the accumulated time taken by all words in a vocab you can use " { $vocab-link "profile-vocab" } ". If you need more fine grained control then do the following: First annotate individual words with the " { $link add-timer } " word or whole vocabularies with " { $link add-timers } ". Then use " { $link wordtimer-call } " to invoke a quotation and print out the timings." ;
+"The " { $vocab-link "wordtimer" } " vocabulary measures accumulated execution time for words. If you just want to profile the accumulated time taken by all words in a vocab you can use " { $link profile-vocab } ". If you need more fine grained control then do the following: First annotate individual words with the " { $link add-timer } " word or whole vocabularies with " { $link add-timers } ". Then use " { $link wordtimer-call } " to invoke a quotation and print out the timings." ;
     
 ABOUT: "wordtimer"