Texdoc 0.65 with more flexibility in the list of configuration files.

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

1 files changed, 41 insertions, 44 deletions

diff --git a/Master/texmf/texdoc/texdoc.cnf b/Master/texmf/texdoc/texdoc.cnf
index a849a0a0a1e..5c4fb44c8fb 100644
--- a/Master/texmf/texdoc/texdoc.cnf
+++ b/Master/texmf/texdoc/texdoc.cnf
@@ -2,17 +2,14 @@
 #
 # DO NOT edit this file!
 #
-# For your personal or local setting, use one of the following files:
-# (the star points to the recommended file for a user's personal settings)
-#     TEXMFHOME/texdoc/texdoc-<arch>.cnf
-# (*) TEXMFHOME/texdoc/texdoc.cnf
-#     TEXMFLOCAL/texdoc/texdoc-<arch>.cnf
-#     TEXMFLOCAL/texdoc/texdoc.cnf
-# where <arch> stands for your architecture (eg, win32, i386-linux,
-# powerpc-darwin).  You can get this list with variables expanded by typing
-#       texdoc -f
-# Those are read by texdoc in this order, and former values
-# override later ones.
+# 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, or just read it for inspiration).
+#
+# For system-wide confuguration or other uses, you may want to use the other
+# files listed, see the manual (texdoc texdoc) for details. The files are read
+# in the order they are printed. If a value is set multiple times, first wins.
 #
 # In those files, you can set your preferred viewer for various formats,
 # some nice names (alias) for specific documentation, and your preferred default
@@ -30,8 +27,8 @@
 #
 # %s is optional and stands for the filename.
 #
-# viewer_pdf = xpdf		# works
-# viewer_pdf = xpdf %s &	# works even better
+# viewer_pdf = xpdf             # works
+# viewer_pdf = xpdf %s &        # works even better
 
 # If you want to enable support for zipped documentation (see below),
 # you may want to adapt viewer_* so that it starts a subshell:
@@ -70,10 +67,10 @@
 # mode = view
 # interact_switch = true
 # alias_switch = true
-# ext_list = pdf, html, txt, ps, dvi,	# Note: empty string at end
-# badext_list = txt, 			# Note: empty string at end
-# verbosity_level = 2 	# Print: 0 nothing, 1 errors, 2 warnings, 3: infos
-# debug_list = 		# the empty list
+# ext_list = pdf, html, txt, ps, dvi,   # Note: empty string at end
+# badext_list = txt,                    # Note: empty string at end
+# verbosity_level = 2   # Print: 0 nothing, 1 errors, 2 warnings, 3: infos
+# debug_list =          # the empty list
 # machine_switch = false
 
 ### Score ###
@@ -133,26 +130,26 @@ alias faq-en = newfaq
 alias faq = newfaq
 
 # various lshort translations (keep the obvious ones for the tests)
-alias lshort = lshort-english/lshort 	# original
-alias lshort-bg = lshort-bg 		# bulgarian
-alias lshort-zh = lshort-zh-cn		# chinese
-alias lshort-nl = lshort-nl-1.3		# dutch
-alias lshort-en = -english/lshort	# english (original)
-alias lshort-fi = lyhyt2e		# finnish
-alias lshort-fr = lshort-fr		# french
-alias lshort-de = l2kurz		# german
-alias lshort-it = itlshort		# italian
-alias lshort-ja = jlshort		# japanese
-alias lshort-pl = polish/lshort2e	# polish
-alias lshort-pt = ptlshort		# portuguese
-alias lshort-ru = lshortru		# russian
-alias lshort-sk	= slshorte		# slovak
-alias lshort-sl = lshort-slovenian	# slovenian
-alias lshort-es	= -spanish/lshort	# spanish
-alias lshort-th = lsh132		# thai
-alias lshort-tr = lshort-tr		# turkish
-alias lshort-uk = lshort-ukr		# ukrainian (package ukr, booh)
-alias lshort-vi	= lshort-vi		# vietnamese
+alias lshort = lshort-english/lshort    # original
+alias lshort-bg = lshort-bg             # bulgarian
+alias lshort-zh = lshort-zh-cn          # chinese
+alias lshort-nl = lshort-nl-1.3         # dutch
+alias lshort-en = -english/lshort       # english (original)
+alias lshort-fi = lyhyt2e               # finnish
+alias lshort-fr = lshort-fr             # french
+alias lshort-de = l2kurz                # german
+alias lshort-it = itlshort              # italian
+alias lshort-ja = jlshort               # japanese
+alias lshort-pl = polish/lshort2e       # polish
+alias lshort-pt = ptlshort              # portuguese
+alias lshort-ru = lshortru              # russian
+alias lshort-sk = slshorte              # slovak
+alias lshort-sl = lshort-slovenian      # slovenian
+alias lshort-es = -spanish/lshort       # spanish
+alias lshort-th = lsh132                # thai
+alias lshort-tr = lshort-tr             # turkish
+alias lshort-uk = lshort-ukr            # ukrainian (package ukr, booh)
+alias lshort-vi = lshort-vi             # vietnamese
 
 
 # *TeX engines reference manuals, man pages and related
@@ -339,7 +336,6 @@ alias index = ind
 alias genfont1 = fntguide
 alias psnfss = psnfss2e
 alias astro = astrosym.txt
-alias braille = braille/summary
 alias brushscr = brushscr/AAA_readme
 alias ocherokee = cherokee
 alias cmsuper = cm-super/README
@@ -493,10 +489,11 @@ alias vrbexin = vrbexin.sty
 alias vruler = vruler.sty
 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 the development version)
+# 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
+# existence is a hack to make it easier to run the the development version, see
+# <http://tug.org/texdoc/dev/>.
+#
+# It is strongly recommended NOT to use it in any other circumstance.
 lastfile_switch = true
-
-# vim: ts=8 noexpandtab: