texdoc update (aliases and minor things)

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

4 files changed, 22 insertions, 11 deletions

diff --git a/Master/texmf/doc/man/man1/texdoc.1 b/Master/texmf/doc/man/man1/texdoc.1
index 5d86dcc9efa..6383bb461ee 100644
--- a/Master/texmf/doc/man/man1/texdoc.1
+++ b/Master/texmf/doc/man/man1/texdoc.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH TEXDOC "1" "October 2009" "texdoc 0.47" "User Commands"
+.TH TEXDOC "1" "November 2009" "texdoc 0.47" "User Commands"
 .SH NAME
-texdoc \- finding & viewing TeX documentation
+texdoc \- find & view documentation in TeX Live
 .SH SYNOPSIS
 .B texdoc
 [\fIOPTIONS\fR]... [\fINAME\fR]...
diff --git a/Master/texmf/doc/man/man1/texdoc.man1.pdf b/Master/texmf/doc/man/man1/texdoc.man1.pdf
index 6f4f10b6a70..21e18691d2c 100644
--- a/Master/texmf/doc/man/man1/texdoc.man1.pdf
+++ b/Master/texmf/doc/man/man1/texdoc.man1.pdf
diff --git a/Master/texmf/scripts/texdoc/texdoc.tlu b/Master/texmf/scripts/texdoc/texdoc.tlu
index db494d3696f..e0a1e7d497c 100755
--- a/Master/texmf/scripts/texdoc/texdoc.tlu
+++ b/Master/texmf/scripts/texdoc/texdoc.tlu
@@ -1,5 +1,4 @@
 #!/usr/bin/env texlua
--- $Id$ -*-Lua-*-
 --[[
 Copyright 2008, 2009 Manuel Pégourié-Gonnard.
 
@@ -30,10 +29,6 @@ Previous work in the public domain:
 -- progname and version
 progname = 'texdoc'
 version = '0.47'
-if string.sub(version, -1) == '+' then
-    local svnrev = string.match('$Rev$', '%$Rev:%s*(%d*)%s*%$');
-    version = svnrev and version..' svn r'..svnrev or version..' git'
-end
 
 -- make sure to update setup_config_from_cl() accordingly
 -- and set a default value in setup_config_from_defaults() if relevant
@@ -852,7 +847,7 @@ function how_to_view (filename)
         viewext = string.match(filename,'.*%.(.*)$') or 'txt'
         if not config['viewer_'..viewext] then
             err_print ("cannot determine type of file\n\t"
-            ..filename.."Assuming text.  Set the `viewer_"..viewext..
+            ..filename.."\nAssuming text.  Set the `viewer_"..viewext..
             "' variable in texdoc.cnf to avoid this.", "warning")
             viewext = 'txt'
             if not config['viewer_'..viewext] then
diff --git a/Master/texmf/texdoc/texdoc.cnf b/Master/texmf/texdoc/texdoc.cnf
index 7640cd05a03..9dc352b9f0b 100644
--- a/Master/texmf/texdoc/texdoc.cnf
+++ b/Master/texmf/texdoc/texdoc.cnf
@@ -114,6 +114,22 @@ alias graphicx = grfguide
 alias color = grfguide
 alias epsfig = 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 
+
 # ams
 alias amsmath = amsldoc
 alias amslatex = amshelp
@@ -159,8 +175,8 @@ alias caption-ru = caption-rus
 alias caption-dev = caption.pdf
 
 # misc
-alias hyperref = hyperref/manual
-alias hyperref = hyperref.pdf
+alias hyperref = hyperref/manual.pdf
+alias hyperref-dev = hyperref.pdf
 alias fontinst = fontinstallationguide
 alias psfrag = pfgguide
 alias bibtex = btxdoc
@@ -481,7 +497,7 @@ alias wrapfig = wrapfig.sty
 # the next line has no effect when this file is installed as
 # TEXMFMAIN/texdoc/texdoc.cnf but is useful when it is installed as
 # TEXMFHOME/texdoc/texdoc-dist.cnf for the purpose of installing a newer
-# version of texdoc in one's home (eg, running texdoc from SVN)
+# version of texdoc in one's home (eg, running the development version)
 lastfile_switch = true
 
 # vim: ts=8 noexpandtab: