Links to words in apropos work better

basis/help/markup/markup.factor

@@ -147,6 +147,12 @@ ALIAS: $slot $snippet
 : $link ( element -- )
     first ($link) ;
 
+: ($word-link) ( word -- )
+    [ name>> ] keep write-link ;
+
+: $word-link ( element -- )
+    first ($word-link) ;
+
 : ($long-link) ( object -- )
     [ article-title ] [ >link ] bi write-link ;
 

basis/tools/apropos/apropos.factor

@@ -28,8 +28,6 @@ M: more-completions article-name
 M: more-completions article-content
     seq>> sort-values keys \ $completions prefix ;
 
-M: more-completions summary article-title ;
-
 : (apropos) ( str candidates title -- element )
     [
         [ completions ] dip '[

basis/tools/vocabs/browser/browser.factor

@@ -160,7 +160,7 @@ C: <vocab-author> vocab-author
 
 : words-table ( words -- )
     [
-        [ <$link> ]
+        [ 1array \ $word-link prefix ]
         [ stack-effect dup [ effect>string <$snippet> ] when ]
         bi 2array
     ] map