texdoc(tk) alias/db update

git-svn-id: svn://tug.org/texlive/trunk@20734 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 254 insertions, 246 deletions

diff --git a/Master/texmf/texdoc/texdoc.cnf b/Master/texmf/texdoc/texdoc.cnf
index ff42db3a499..3e26908ce65 100644
--- a/Master/texmf/texdoc/texdoc.cnf
+++ b/Master/texmf/texdoc/texdoc.cnf
@@ -2,10 +2,10 @@
 #
 # DO NOT edit this file!
 #
-# For your personal or local setting, if you are a normal user, run 'texdoc -f'
-# and use the file indicated by a star. You may need to create it. DO NOT copy
-# the present file, please create a new one (you may want to copy/paste/edit
-# portions of the present file however, or just read it for inspiration).
+# For your personal settings, run 'texdoc -f' and use the file indicated by a
+# star; you may need to create it.  DO NOT copy the present file, please
+# create a new one (you may want to copy/paste/edit portions of the present
+# file however, or just read it for inspiration).
 #
 # For system-wide configuration or other uses, you may want to use the other
 # files listed, see the manual (texdoc texdoc) for details. The files are read
@@ -20,10 +20,14 @@
 #
 # For more details, see the texdoc manual (try `texdoc texdoc').
 
-### Viewer settings ###
+
+# General settings
+# ================
 
-# Defaults depend on what is available on you system, as well as you desktop
-# environment.  Here are a few examples.
+## Viewers
+
+# Defaults depend on what is available on your system, as well as your desktop
+# environment. Here are a few examples.
 #
 # %s is optional and stands for the filename.
 #
@@ -42,7 +46,7 @@
 # WARNING: for zip support your viewer needs to be blocking, i.e. it must not
 # return immediately: otherwise the temporary file will be deleted too early.
 
-### Zipped documentation support ###
+## Zipped documentation support
 
 # WARNING: support for zipped documents works only on Unix. Make sure that the
 # values of the associated options are adapted to your system.  Read the above
@@ -58,312 +62,333 @@
 # The unzipped data must be printed on stdout. Example:
 #
 # zipext_list = gz
-# unzip_gz = gzip -d -c
+# unzip_gz    = gzip -d -c
 
-### Other settings ###
+## User interaction
 
 # Built-in defaults (for reference):
 #
-# mode = view
+# mode             = view
 #
-# interact_switch = true
-# machine_switch = false
+# interact_switch  = true
+# machine_switch   = false
 #
-# verbosity_level = 2   # Print: 0 nothing, 1 errors, 2 warnings, 3: infos
-# debug_list =          # the empty list
+# verbosity_level  = 2  # Print: 0: nothing, 1: errors, 2: warnings, 3: infos
+# debug_list       =    # the empty list
+
+## Documentation searching
+
+# Built-in defaults (for reference):
 #
-# ext_list = pdf, html, txt, ps, dvi,   # Note: empty string at end
-# badext_list = txt,                    # Note: empty string at end
-# basename_list = readme
+# ext_list         = pdf, html, txt, ps, dvi, # Note: empty string at end
+# badext_list      = txt,                     # Note: empty string at end
+# basename_list    = readme
 # badbasename_list = readme
 
-## Known suffixes for documentation
+# Known suffixes for documentation
 suffix_list = doc, -doc, _doc, .doc, /doc, manual, /manual, -manual, userguide, /user_guide, -guide, -user, -man, notes
 
-### Score ###
+
+# Score adjustments
+# =================
 
+# Results are sorted by score (decreasing).
 # Only results with positive scores are displayed (unless mode is 'showall').
 # Results with score <= -100 are never displayed.
 #
-# You can adjust the score of results containing a pattern with adjscore,
-# either globally or only for specific keywords
+# The score of results containing a given pattern can be adjusted using the
+# 'adjscore' directive, either globally or only for specific queries.  It is
+# also possible to set the score directly in alias directives, see the next
+# section.
+#
+# As a general rule, use 'adjscore' if you only want to adjust the score of
+# particular results, and 'alias' if you want to add new results (possibly
+# adjusting their score) for a particular query.
+#
+# To override one of the settings below, use the 'noadjscore' directive in
+# your personal configuration file, see the manual for details.
 
-# Makefile's are never documentation, just as documents in src or source subdir
+## General adjustments
+
+# Makefile are never documentation, just as documents in src or source subdir
 # -1000 should be enough to kill them
 adjscore /Makefile = -1000
-adjscore /src/ = -1000
-adjscore /source/ = -1000
+adjscore /src/     = -1000
+adjscore /source/  = -1000
 
 # licence files aren't very likely to contain relevant documentation, but it
-# feels wrong to totally kill them...
+# feels wrong to totally kill them
 adjscore copying = -10
 adjscore license = -10
-adjscore gpl = -10
+adjscore gpl     = -10
 
-# tex-virtual-academy provides a lot of fake matches
+# tex-virtual-academy provides a lot of spurious matches
 adjscore /tex-virtual-academy-pl/ = -50
 
 # test and example files are not likely the best documentation
-adjscore test = -3
+adjscore test    = -3
 adjscore example = -3
-adjscore sample = -3
+adjscore sample  = -3
 
-# readme's usually deserve a negative score because they have a bad extension,
-# but they're still slightly better than other results with negative scores...
+# readme's usually get a negative score because they have a bad extension,
+# but they're still slightly better than other results with negative scores
 adjscore readme = 0.1
 
-# Uncomment this to make the man pages have a greater priority
+# uncomment this to make the man pages have a greater priority
 #adjscore .man1. = 5
 #adjscore .man5. = 5
 
-# 'texdoc' may look like "tex's documentation" but it isn't...
-adjscore(tex) texdoc = -10
+## Specific adjustments
+
+# 'texdoc' may look like "tex's documentation" but it isn't
+# similar problem with 'tex-*'
+adjscore(tex) texdoc   = -10
 adjscore(tex) tex-gyre = -10
-adjscore(tex) tex-ps = -10
+adjscore(tex) tex-ps   = -10
 
 # avoid too many results to be shown for 'latex'
 # package names
-adjscore(latex) guide-to-latex = -10 # only usefull with the book
-adjscore(latex) latex-web-companion = -10
-adjscore(latex) tufte-latex = -10
-adjscore(latex) cweb-latex = -10
-adjscore(latex) duerer-latex = -10
-adjscore(latex) cjw-latex = -10
-adjscore(latex) ocr-latex = -10
+adjscore(latex) cjw-latex                  = -10
+adjscore(latex) cweb-latex                 = -10
+adjscore(latex) duerer-latex               = -10
+adjscore(latex) guide-to-latex             = -10 # only useful with the book
+adjscore(latex) latex-web-companion        = -10
+adjscore(latex) ocr-latex                  = -10
+adjscore(latex) tufte-latex                = -10
 # file names
 adjscore(latex) Content_LaTeX_Package_Demo = -10
-adjscore(latex) example_latex = -10
-adjscore(latex) test_latex = -10
+adjscore(latex) example_latex              = -10
+adjscore(latex) test_latex                 = -10
 
 # beamer
-adjscore(beamer) beamer-tut-pt = -10
 adjscore(beamer) beamer-tut-pt/tutorialbeamer = +10
-adjscore(beamer) presentations = -10
-adjscore(beamer) beamer-FUBerlin = -3
+adjscore(beamer) beamer-FUBerlin              = -3
+adjscore(beamer) beamer-tut-pt                = -10
+adjscore(beamer) presentations                = -10
 
-# context
+# misc
 adjscore(context) circuitikz = -10
+adjscore(symbols) /staves/   = -5
 
-# it is also possible to set the score directly in alias directives
-# eg, fontinstallationguide is related to fontinst:
-alias(0.1) fontinst = fontinstallationguide
+
+# Aliases
+# =======
 
-### Aliases ###
+# Aliases allow to add results for a specific query, by making texdoc search
+# for additional keywords in the file name. Matches for the new keyword get a
+# very high score by default, but this can be adjusted.
+#
+# To override one of the settings below, use the 'noalias' directive in
+# your personal configuration file, see the manual for details.
 
 ## Essential documentation
 
-alias live = texlive-en
+alias live    = texlive-en
 alias texlive = texlive-en
-alias latex = latex-doc-ptr
 
 ## various stuff
 
 # a few useful general documents
 alias faq-en = newfaq
-alias faq = newfaq
-adjscore(symbols) /staves/ = -5
+alias faq    = newfaq
+alias latex  = latex-doc-ptr
 
 # various lshort translations
-adjscore(lshort) /lshort-english/ = +3  # original
-alias lshort-de = l2kurz                # german
-alias lshort-pl = lshort-polish/lshort2e # polish
-alias lshort-pt = ptlshort              # portuguese
-alias lshort-sk = slshorte              # slovak
-alias lshort-es = lshort-spanish/lshort # spanish
+adjscore(lshort) /lshort-english/ = +3                     # original
+alias lshort-de                   = l2kurz                 # german
+alias lshort-pl                   = lshort-polish/lshort2e # polish
+alias lshort-pt                   = ptlshort               # portuguese
+alias lshort-sk                   = slshorte               # slovak
+alias lshort-es                   = lshort-spanish/lshort  # spanish
 
 # *TeX engines reference manuals, man pages and related
-alias e-tex-ref = etex_man
-alias etex-ref = etex_man
+alias e-tex-ref  = etex_man
+alias etex-ref   = etex_man
 alias pdftex-ref = pdftex-a
 alias luatex-ref = luatexref-t
-alias etex-man = etex.man1
+
+# by default, <engine> = <engine>-ref (duplicated: no alias cascading)
+alias e-tex      = etex_man
+alias etex       = etex_man
+alias xetex      = XeTeX-reference
+alias luatex     = luatexref-t
+
+alias etex-man   = etex.man1
 alias pdftex-man = pdftex.man1
-#alias xetex-man = xetex.man1 # should exist...
+#alias xetex-man = xetex.man1 # XXX
 alias luatex-man = luatex.man1
-alias luatex-pkg = oberdiek/luatex.pdf
 
-# by default, <engine> = <engine>-ref (duplicated: no alias cascading)
-alias e-tex = etex_man
-alias etex = etex_man
-alias xetex = XeTeX-reference
-alias luatex = luatexref-t
+alias luatex-pkg = oberdiek/luatex.pdf
 
 # latex/basic classes
-alias article = classes
-alias report = classes
-alias book = classes
-#alias ltxguide = ???
-#alias minimal = ???
+alias article   = classes
+alias book      = classes
+alias report    = classes
+#alias ltxguide  = XXX
+#alias minimal   = XXX
 adjscore(minimal) europecv = -1000 # false positive
 
-# latex/basic packages, grouped by dtx
-alias bezier = latex209
-alias fleqn = latex209
-alias leqno = latex209
-alias openbib = latex209
-alias t1enc = latex209
-alias fix-cm = fixltx2e
-alias flafter = source2e
-alias tracefnt = source2e
-alias fontenc = source2e
-alias textcomp = source2e
-alias(20) fontenc = encguide
+# latex/basic packages, sorted by dtx
+alias doc          = base/doc
+alias shortvrb     = base/doc
+alias letter       = base/letter
+alias slides       = base/slides
+alias(20) fontenc  = encguide
 alias(20) textcomp = encguide
-alias makeidx = makeindx
-alias showidx = makeindx
-alias letter = base/letter
-alias slides = base/slides
-alias shortvrb = base/doc
-alias doc = base/doc
+alias fix-cm       = fixltx2e
+alias bezier       = latex209
+alias fleqn        = latex209
+alias leqno        = latex209
+alias openbib      = latex209
+alias t1enc        = latex209
+alias makeidx      = makeindx
+alias showidx      = makeindx
+alias flafter      = source2e
+alias fontenc      = source2e
+alias textcomp     = source2e
+alias tracefnt     = source2e
 # TODO: try to avoid the huge amount of false positives for `doc' itself.
 
 # latex's required graphics bundle
-alias graphics = grfguide
-alias graphicx = grfguide
-alias color = grfguide
-alias epsfig = grfguide
+alias color-dev    = color
+alias epsfig-dev   = epsfig
 alias graphics-dev = graphics
 alias graphicx-dev = graphicx
-alias color-dev = color
-alias epsfig-dev = epsfig
+alias color        = grfguide
+alias epsfig       = grfguide
+alias graphics     = grfguide
+alias graphicx     = grfguide
 
 # latex's required psnfss2e bundle
-alias mathpazo = psnfss2e
-alias mathptmx = psnfss2e
-alias helvet = psnfss2e
-alias avant = psnfss2e
-alias courier = psnfss2e
-alias chancery = psnfss2e
-alias bookman = psnfss2e
-alias newcent = psnfss2e
-alias charter = psnfss2e
-alias times = psnfss2e
-alias palatino = psnfss2e
-alias mathptm = psnfss2e
-alias mathpple = psnfss2e
-alias utopia = psnfss2e
+#alias avant     = psnfss2e
+#alias bookman   = psnfss2e
+#alias chancery  = psnfss2e
+alias charter   = psnfss2e
+alias courier   = psnfss2e
+#alias helvet    = psnfss2e
+alias mathpazo  = psnfss2e
+#alias mathpple  = psnfss2e
+#alias mathptm   = psnfss2e
+#alias mathptmx  = psnfss2e
+#alias newcent   = psnfss2e
+#alias palatino  = psnfss2e
+#alias times     = psnfss2e
+alias utopia    = psnfss2e
 
 # ams
-alias amsmath = amsldoc
-alias amsthm = amsthdoc
-alias amsfonts = amsfndoc
-alias amsrefs = amsrdoc
-alias amslatex2 = technote
-#
+alias amsfonts    = amsfndoc
+alias amslatex2   = technote
+alias amsmath     = amsldoc
+alias amsrefs     = amsrdoc
+alias amsthm      = amsthdoc
+alias amsart-dev  = amsclass
+alias amsbook-dev = amsclass
+alias amscls-dev  = amsclass
 alias amsmath-dev = amsmath
-alias amscls-dev = amsclass
-alias amsart-dev = amsclass
 alias amsproc-dev = amsclass
-alias amsbook-dev = amsclass
 
 # koma-script
-alias koma-script = scrguien
-alias koma = scrguien
-alias scrartcl = scrguien
-alias scrreprt = scrguien
-alias scrbook = scrguien
-alias typearea = scrguien
+alias koma           = scrguien
+alias koma-script    = scrguien
+alias scrartcl       = scrguien
+alias scrbook        = scrguien
+alias scrreprt       = scrguien
+alias typearea       = scrguien
+alias koma-de        = scrguide
 alias koma-script-de = scrguide
-alias koma-de = scrguide
-alias scrartcl-de = scrguide
-alias scrreprt-de = scrguide
-alias scrbook-de = scrguide
-alias typearea-de = scrguide
+alias scrartcl-de    = scrguide
+alias scrbook-de     = scrguide
+alias scrreprt-de    = scrguide
+alias typearea-de    = scrguide
 
 # tugboat package and classes
 alias tugboat = ltubguid
 
 # caption
-alias caption = caption-eng
+alias caption     = caption-eng
 alias caption-dev = caption.pdf
 
 # misc
-alias hyperref = hyperref/manual.pdf
-alias hyperref-dev = hyperref.pdf
-alias bibtex = btxdoc
-alias metapost = mpman
-alias(5) metapost = mpintro
-alias(5) metapost = mpgraph
-alias iso = isoman
-alias pstricks = pstricks-doc
-alias xstring-fr = xstring_doc_fr
-alias isomath = isomath.sty.pdf
-alias elsarticle = elsdoc
-alias afoot = arabtex-doc
-alias vntex = vntex # umbrella document (manual comes first due to catalogue)
-alias asymptote = asymptote # not mentioned in the catalogue currently
-alias nonfloat = nonfloat-en
-alias nonfloat-de = nonfloat
-alias subdocs = bezos
-alias dotlessi = bezos
-alias checkend = bezos
-alias arabicfont = bezos
-alias cm-super = cm-super/README
-alias cmsuper = cm-super/README
-alias(5) cmsuper = cm-super/FAQ
-alias cyrillic = cyrillic/00readme.txt
-alias lettrine = lettrine # to hide context/third/lettrine-doc.pdf
+alias afoot         = arabtex-doc
+alias asymptote     = asymptote # not mentioned in the catalogue currently
+alias arabicfont    = bezos
+alias bibtex        = btxdoc
+alias(5) cmsuper    = cm-super/FAQ
+alias cm-super      = cm-super/README
+alias cmsuper       = cm-super/README
+alias cyrillic      = cyrillic/00readme.txt
+alias elsarticle    = elsdoc
+alias(0.1) fontinst = fontinstallationguide
+alias hyperref      = hyperref/manual.pdf
+alias hyperref-dev  = hyperref.pdf
+alias iso           = isoman
+alias lettrine      = lettrine # to hide context/third/lettrine-doc.pdf
+alias(5) metapost   = mpgraph
+alias(5) metapost   = mpintro
+alias metapost      = mpman
+alias nonfloat-de   = nonfloat
+alias nonfloat      = nonfloat-en
+alias pstricks      = pstricks-doc
+alias xstring-fr    = xstring_doc_fr
 
 ## a few easy patterns
 
 # egrep 'manual\.pdf\>'
-alias t-angles = t-manual
+alias t-angles   = t-manual
 alias tree-dvips = tree-manual
 
 # egrep 'user\.pdf\>'
 alias cweb-latex = cweb-user
 
 # egrep 'doc\.pdf\>'
-alias barcode = eandoc.pdf
-alias enctex-cz = encdoc
-alias jurabib-de = jbgerdoc
-alias ofs = ofsdoc-e
-alias ofs-cz = ofsdoc
-alias pst-geo = pst-map3d-doc
-alias german = gerdoc
-alias ngerman = gerdoc
-alias pst-eucl = pst-eucl/euclide_english
+alias barcode     = eandoc.pdf
+alias enctex-cz   = encdoc
+alias german      = gerdoc
+alias ngerman     = gerdoc
+alias jurabib-de  = jbgerdoc
+alias ofs-cz      = ofsdoc
+alias ofs         = ofsdoc-e
 alias pst-eucl-fr = pst-eucl/euclide
+alias pst-eucl    = pst-eucl/euclide_english
+alias pst-geo     = pst-map3d-doc
 
 ## aliases basically borrowed from texdoctk.dat with some adaptations
 
-alias texguide = usrguide
-alias lehman = fontinstallationguide
-alias uktugfaq = newfaq
+alias akletter      = akletter/lettereng
+alias arydshln      = arydshln-man
+alias cv            = curve/curve
 alias datenumber-de = datenumber/docgerman
-alias index = ind
-alias psnfss = psnfss2e
-alias euro = eurosamp
-alias lmfonts = lm-info
-alias dutch = rapdoc
-alias montex = mlsquick
-alias(60) akademia = tex-virtual-academy-pl/index.html
-alias otibet = otibet/unidoc
-alias startex = startex/base/guide
-alias apmgraph = pmgraph
-alias tikz = pgfmanual
-alias treetex = tree_doc
-alias(5) xypic = xyrefer
-alias pbdiagram = pb-manual
-alias expressg = expeg
-alias arydshln = arydshln-man
-alias natbib2 = natnotes
-alias tangles = t-angles/t-manual
-alias mathenv = mdwtab
-alias gnlogic = gn-logic14
-alias labels(1) = envlab/elguide
-alias lineno = ulineno
-alias akletter = akletter/lettereng
-alias mltex = mltex/mltex.txt
-alias flcards = flashcards
-alias tex4ht = tex4ht/mn.html
-alias ppower4 = ppower4/report
-alias latex3 = ltx3info
-alias musictex = musicdoc
-alias kluwer = kluwer/usrman
-alias cv = curve/curve
-alias preprint = preprint/00readme.txt
-alias onrannual = onrannual/README
+alias labels(1)     = envlab/elguide
+alias euro          = eurosamp
+alias expressg      = expeg
+alias flcards       = flashcards
+alias lehman        = fontinstallationguide
+alias gnlogic       = gn-logic14
+alias index         = ind
+alias kluwer        = kluwer/usrman
+alias lmfonts       = lm-info
+alias latex3        = ltx3info
+alias mathenv       = mdwtab
+alias montex        = mlsquick
+alias mltex         = mltex/mltex.txt
+alias natbib2       = natnotes
+alias uktugfaq      = newfaq
+alias onrannual     = onrannual/README
+alias otibet        = otibet/unidoc
+alias pbdiagram     = pb-manual
+alias tikz          = pgfmanual
+alias apmgraph      = pmgraph
+alias ppower4       = ppower4/report
+alias preprint      = preprint/00readme.txt
+alias dutch         = rapdoc
+alias startex       = startex/base/guide
+alias tangles       = t-angles/t-manual
+alias tex4ht        = tex4ht/mn.html
+alias(60) akademia  = tex-virtual-academy-pl/index.html
+alias treetex       = tree_doc
+alias lineno        = ulineno
+alias texguide      = usrguide
+alias(5) xypic      = xyrefer
 
 ## packages from ctan/macros/latex/contrib/misc or with doc in .sty only
 
@@ -375,40 +400,25 @@ alias onrannual = onrannual/README
 # produce suitable documentation for all these packages (thanks to Philipp
 # Stephani and Robin Fairbairns mostly).
 
-alias(4.1) 3parttable = 3parttable.sty
-alias(4.1) bibcheck = bibcheck.sty
-alias(4.1) concrete = concrete.sty
-alias(4.1) linsys = linsys.sty
-alias(4.1) mitpress = mitpress.sty
-alias(4.1) morefloats = morefloats.sty
-alias(4.1) nextpage = nextpage.sty
-alias(4.1) parskip = parskip.sty
-alias(4.1) path = path.sty
-alias(4.1) printlen = printlen.sty
-alias(4.1) relsize = relsize.sty
-alias(4.1) romanneg = romanneg.sty
-alias(4.1) secdot = secdot.sty
-alias(4.1) section = section.sty
-alias(4.1) selectp = selectp.sty
-alias(4.1) sepnum = sepnum.sty
-alias(4.1) shadow = shadow.sty
-alias(4.1) showtags = showtags.sty
-alias(4.1) sphack = sphack.sty
-alias(4.1) statex2 = statex2.sty
-alias(4.1) statex = statex.sty
-alias(4.1) subfigmat = subfigmat.sty
+alias(4.1) 3parttable    = 3parttable.sty
+alias(4.1) bibcheck      = bibcheck.sty
+alias(4.1) concrete      = concrete.sty
+alias(4.1) linsys        = linsys.sty
+alias(4.1) mitpress      = mitpress.sty
+alias(4.1) nextpage      = nextpage.sty
+alias(4.1) statex2       = statex2.sty
+alias(4.1) statex        = statex.sty
 alias(4.1) texilikecover = texilikecover.sty
-alias(4.1) thrmappendix = thrmappendix.sty
-alias(4.1) topcapt = topcapt.sty
-alias(4.1) varwidth = varwidth.sty
-alias(4.1) verbasef = verbasef.sty
-alias(4.1) version = version.sty
-alias(4.1) vertbars = vertbars.sty
-alias(4.1) vrbexin = vrbexin.sty
-alias(4.1) wrapfig = wrapfig.sty
-alias(0) theoremref = theoremref.sty
-alias(0) shadethm = shadethm.sty
-
+alias(4.1) thrmappendix  = thrmappendix.sty
+alias(4.1) topcapt       = topcapt.sty
+alias(4.1) verbasef      = verbasef.sty
+alias(4.1) version       = version.sty
+alias(4.1) vrbexin       = vrbexin.sty
+alias(4.1) wrapfig       = wrapfig.sty
+
+
+# Final hack
+#
 # The next line has no effect when this file is installed as the last
 # configuration file (default) but is useful when you install it as the "tricky"
 # configuration file (usually TEXMFHOME/texdoc/texdoc-dist.cnf) whose mere
diff --git a/Master/texmf/texdoctk/texdoctk.dat b/Master/texmf/texdoctk/texdoctk.dat
index 0ddd511ec20..53e7a7fc363 100644
--- a/Master/texmf/texdoctk/texdoctk.dat
+++ b/Master/texmf/texdoctk/texdoctk.dat
@@ -244,7 +244,7 @@ dcolumn;Alignment on decimal point (dcolumn);latex/tools/dcolumn.pdf;tables
 delarray;Arrays with delimiters (delarray);latex/tools/delarray.pdf;
 colortbl;Coloured tables (colortbl);latex/colortbl/colortbl.pdf;
 arydshln;Dashed lines, horizontal and vertical (arydshln);latex/arydshln/arydshln-man.pdf;
-slashbox;Draw an oblique line in a `tabular' column;latex/slashbox/slashbox.dvi;
+slashbox;Draw an oblique line in a `tabular' column;latex/slashbox/slashbox.pdf;
 enumerate;Extended enumeration style (enumerate);latex/tools/enumerate.pdf;
 array;Extended tabular and array environments 1 (array);latex/tools/array.pdf;
 mdwtab;Extended tabular and array environments 2 (mdwtab);latex/mdwtools/mdwtab.pdf;
@@ -351,13 +351,12 @@ ushort;Underlines of various sizes (ushort);latex/ushort/ushort.pdf;
 ulem;Underlining styles (ulem);generic/ulem/ulem.pdf;
 umoline;Underline text allowing line breaking (umoline);latex/umoline/umoline.pdf;
 url;Typeset URLs, emails, paths etc. verbatim 1 (url);latex/url/url.pdf;
-path;Typeset URLs, emails, paths etc. verbatim 2 (path);latex/ltxmisc/path.sty;-0-
+path;Typeset URLs, emails, paths etc. verbatim 2 (path);generic/path/path-doc.pdf;-0-
 notes;Mark document sections with icons;latex/notes/notes.pdf;
 prelim2e;Mark preliminary versions of document (prelim2e);latex/ms/prelim2e.pdf;draft
 shapepar;Shaped paragraphs (shapepar);generic/shapepar/shapepar.pdf;
 todo;Appending a to-do list to a document;latex/todo/todo.pdf;
 @Typesetting labels
-adrlist;Address lists with LaTeX (adrlist);latex/adrlist/adrlist.pdf;
 labels;labels: Labels for envelopes;generic/midnight/labels.doc;
 labels1;EnvLab: Printing Envelopes and Labels;latex/envlab/elguide.pdf;
 cd;Creating CD labels (cd);latex/cd/cd.pdf;
@@ -425,9 +424,8 @@ texlive5;Russian;texlive/texlive-ru/texlive-ru.pdf;tutorial
 texlive6;Czech/Slovak;texlive/texlive-cz/texlive-cz.pdf;tutorial
 @Music
 musixtex;MusiXTeX: Using TeX to write music (musixtex);generic/musixtex/musixdoc.pdf;
-musixlyr;MusiXTeX extension for writing lyrics (musixlyr);latex/musixlyr/mxlyrdoc.dvi;
+musixlyr;MusiXTeX extension for writing lyrics (musixlyr);generic/musixlyr/mxlyrdoc.pdf;
 guitar;Typesetting guitar chords (guitar);latex/guitar/guitar.txt;
-musictex;MusicTeX: Typesetting music;generic/musictex/musicdoc.dvi;music
 @Compuscripts
 acmconf;ACM Proceedings (acmconf);latex/acmconf/acmconf.pdf;publishing
 acmtrans;ACM Transactions (acmtrans);latex/acmtrans/acmtr2e.pdf;publishing