sync Master <=> Build

update manpages

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

39 files changed, 58 insertions, 46 deletions

diff --git a/Master/texmf/doc/man/man1/aleph.1 b/Master/texmf/doc/man/man1/aleph.1
index 7b59059cccd..95d0d2fa72f 100644
--- a/Master/texmf/doc/man/man1/aleph.1
+++ b/Master/texmf/doc/man/man1/aleph.1
@@ -1,4 +1,4 @@
-.TH ALEPH 1 "1 March 2011" "Web2C 2011/dev"
+.TH ALEPH 1 "1 March 2011" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/amstex.1 b/Master/texmf/doc/man/man1/amstex.1
index 0118b4b31b7..52066ff32db 100644
--- a/Master/texmf/doc/man/man1/amstex.1
+++ b/Master/texmf/doc/man/man1/amstex.1
@@ -1,4 +1,4 @@
-.TH AMSTEX 1 "14 May 2010" "Web2C 2011/dev"
+.TH AMSTEX 1 "14 May 2010" "Web2C 2011"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
diff --git a/Master/texmf/doc/man/man1/bibtex.1 b/Master/texmf/doc/man/man1/bibtex.1
index 4b162973ba2..7a2bd647359 100644
--- a/Master/texmf/doc/man/man1/bibtex.1
+++ b/Master/texmf/doc/man/man1/bibtex.1
@@ -1,4 +1,4 @@
-.TH BIBTEX 1 "1 February 2010" "bibtex 0.99d" "Web2C 2011/dev"
+.TH BIBTEX 1 "1 February 2010" "bibtex 0.99d" "Web2C 2011"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
diff --git a/Master/texmf/doc/man/man1/ctie.1 b/Master/texmf/doc/man/man1/ctie.1
index 0d8682a7fe7..79f3cb88aca 100644
--- a/Master/texmf/doc/man/man1/ctie.1
+++ b/Master/texmf/doc/man/man1/ctie.1
@@ -1,4 +1,4 @@
-.TH CTIE 1 "7 April 2010" "Web2C 2011/dev"
+.TH CTIE 1 "7 April 2010" "Web2C 2011"
 .\"=====================================================================
 .SH NAME
 ctie \- merge or apply CWEB change files
diff --git a/Master/texmf/doc/man/man1/cweb.1 b/Master/texmf/doc/man/man1/cweb.1
index 0110b774b34..3bb751c7b43 100644
--- a/Master/texmf/doc/man/man1/cweb.1
+++ b/Master/texmf/doc/man/man1/cweb.1
@@ -1,4 +1,4 @@
-.TH CWEB 1 "7 April 2010" "Web2C 2011/dev"
+.TH CWEB 1 "7 April 2010" "Web2C 2011"
 .\"=====================================================================
 .SH NAME
 ctangle, cweave \- translate CWEB to C and/or TeX
diff --git a/Master/texmf/doc/man/man1/dvicopy.1 b/Master/texmf/doc/man/man1/dvicopy.1
index 51636c713e8..9c0b3f3cfc0 100644
--- a/Master/texmf/doc/man/man1/dvicopy.1
+++ b/Master/texmf/doc/man/man1/dvicopy.1
@@ -1,4 +1,4 @@
-.TH DVICOPY 1 TeX "24 January 1999" "Web2C 2011/dev"
+.TH DVICOPY 1 TeX "24 January 1999" "Web2C 2011"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
diff --git a/Master/texmf/doc/man/man1/dvitype.1 b/Master/texmf/doc/man/man1/dvitype.1
index 6f8a21c0adc..9263446986b 100644
--- a/Master/texmf/doc/man/man1/dvitype.1
+++ b/Master/texmf/doc/man/man1/dvitype.1
@@ -1,4 +1,4 @@
-.TH DVITYPE 1 "19 December 1994" "Web2C 2011/dev"
+.TH DVITYPE 1 "19 December 1994" "Web2C 2011"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
diff --git a/Master/texmf/doc/man/man1/eplain.1 b/Master/texmf/doc/man/man1/eplain.1
index d39373bfde9..be63fcda5d2 100644
--- a/Master/texmf/doc/man/man1/eplain.1
+++ b/Master/texmf/doc/man/man1/eplain.1
@@ -1,4 +1,4 @@
-.TH EPLAIN 1 "14 May 2010" "Web2C 2011/dev"
+.TH EPLAIN 1 "14 May 2010" "Web2C 2011"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
diff --git a/Master/texmf/doc/man/man1/etex.1 b/Master/texmf/doc/man/man1/etex.1
index f98bc90f65d..1cede7e4b7a 100644
--- a/Master/texmf/doc/man/man1/etex.1
+++ b/Master/texmf/doc/man/man1/etex.1
@@ -1,4 +1,4 @@
-.TH ETEX 1 "1 March 2011" "Web2C 2011/dev"
+.TH ETEX 1 "1 March 2011" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/gftodvi.1 b/Master/texmf/doc/man/man1/gftodvi.1
index e1ca6242042..1dd1aa32799 100644
--- a/Master/texmf/doc/man/man1/gftodvi.1
+++ b/Master/texmf/doc/man/man1/gftodvi.1
@@ -1,4 +1,4 @@
-.TH GFTODVI 1 "20 April 2007" "Web2C 2011/dev"
+.TH GFTODVI 1 "20 April 2007" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/gftopk.1 b/Master/texmf/doc/man/man1/gftopk.1
index ec4add06640..dd89d5d06e2 100644
--- a/Master/texmf/doc/man/man1/gftopk.1
+++ b/Master/texmf/doc/man/man1/gftopk.1
@@ -1,4 +1,4 @@
-.TH GFTOPK 1 "14 December 1993" "Web2C 2011/dev"
+.TH GFTOPK 1 "14 December 1993" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/gftype.1 b/Master/texmf/doc/man/man1/gftype.1
index 37bee8dd2fd..9c75f5e479c 100644
--- a/Master/texmf/doc/man/man1/gftype.1
+++ b/Master/texmf/doc/man/man1/gftype.1
@@ -1,4 +1,4 @@
-.TH GFTYPE 1 "14 December 1993" "Web2C 2011/dev"
+.TH GFTYPE 1 "14 December 1993" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/kpseaccess.1 b/Master/texmf/doc/man/man1/kpseaccess.1
index 3b59512d04d..b40a755041d 100644
--- a/Master/texmf/doc/man/man1/kpseaccess.1
+++ b/Master/texmf/doc/man/man1/kpseaccess.1
@@ -1,4 +1,4 @@
-.TH KPSEACCESS 1 "1 March 2011" "Kpathsea 6.0.1dev"
+.TH KPSEACCESS 1 "1 March 2011" "Kpathsea 6.0.1"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
diff --git a/Master/texmf/doc/man/man1/kpsereadlink.1 b/Master/texmf/doc/man/man1/kpsereadlink.1
index 3d2745e288f..2a47b31864c 100644
--- a/Master/texmf/doc/man/man1/kpsereadlink.1
+++ b/Master/texmf/doc/man/man1/kpsereadlink.1
@@ -1,4 +1,4 @@
-.TH KPSEREADLINK 1 "1 March 2011" "Kpathsea 6.0.1dev"
+.TH KPSEREADLINK 1 "1 March 2011" "Kpathsea 6.0.1"
 .\"=====================================================================
 .SH NAME
 kpsereadlink \- print contents of symbolic link
diff --git a/Master/texmf/doc/man/man1/kpsestat.1 b/Master/texmf/doc/man/man1/kpsestat.1
index a1477f28529..679a55a6f2d 100644
--- a/Master/texmf/doc/man/man1/kpsestat.1
+++ b/Master/texmf/doc/man/man1/kpsestat.1
@@ -1,4 +1,4 @@
-.TH KPSESTAT 1 "1 March 2011" "Kpathsea 6.0.1dev"
+.TH KPSESTAT 1 "1 March 2011" "Kpathsea 6.0.1"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
diff --git a/Master/texmf/doc/man/man1/kpsewhich.1 b/Master/texmf/doc/man/man1/kpsewhich.1
index 50e1a6b02df..8c254dbc481 100644
--- a/Master/texmf/doc/man/man1/kpsewhich.1
+++ b/Master/texmf/doc/man/man1/kpsewhich.1
@@ -1,4 +1,4 @@
-.TH KPSEWHICH 1 "1 March 2011" "Kpathsea 6.0.1dev"
+.TH KPSEWHICH 1 "1 March 2011" "Kpathsea 6.0.1"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
diff --git a/Master/texmf/doc/man/man1/latex.1 b/Master/texmf/doc/man/man1/latex.1
index 38d790a6b6a..18ae24fc7d8 100644
--- a/Master/texmf/doc/man/man1/latex.1
+++ b/Master/texmf/doc/man/man1/latex.1
@@ -1,4 +1,4 @@
-.TH LATEX 1 "14 May 2010" "Web2C 2011/dev"
+.TH LATEX 1 "14 May 2010" "Web2C 2011"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
diff --git a/Master/texmf/doc/man/man1/mf.1 b/Master/texmf/doc/man/man1/mf.1
index ec36d21dfdb..ce17b9c4771 100644
--- a/Master/texmf/doc/man/man1/mf.1
+++ b/Master/texmf/doc/man/man1/mf.1
@@ -1,5 +1,5 @@
 .\" t
-.TH MF 1 "1 March 2011" "Web2C 2011/dev"
+.TH MF 1 "1 March 2011" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/mft.1 b/Master/texmf/doc/man/man1/mft.1
index 771d7d6ed50..665293915e6 100644
--- a/Master/texmf/doc/man/man1/mft.1
+++ b/Master/texmf/doc/man/man1/mft.1
@@ -1,4 +1,4 @@
-.TH MFT 1 "14 December 1993" "Web2C 2011/dev"
+.TH MFT 1 "14 December 1993" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
diff --git a/Master/texmf/doc/man/man1/mktexlsr.1 b/Master/texmf/doc/man/man1/mktexlsr.1
index 8df080331f8..054fea3b879 100644
--- a/Master/texmf/doc/man/man1/mktexlsr.1
+++ b/Master/texmf/doc/man/man1/mktexlsr.1
@@ -1,4 +1,4 @@
-.TH MKTEXLSR 1 "1 March 2011" "Kpathsea 6.0.1dev"
+.TH MKTEXLSR 1 "1 March 2011" "Kpathsea 6.0.1"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
diff --git a/Master/texmf/doc/man/man1/mktexmf.1 b/Master/texmf/doc/man/man1/mktexmf.1
index 03ba4d4b341..41aaaf9be8f 100644
--- a/Master/texmf/doc/man/man1/mktexmf.1
+++ b/Master/texmf/doc/man/man1/mktexmf.1
@@ -1,4 +1,4 @@
-.TH MKTEXMF 1 "1 March 2011" "Kpathsea 6.0.1dev"
+.TH MKTEXMF 1 "1 March 2011" "Kpathsea 6.0.1"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
diff --git a/Master/texmf/doc/man/man1/mktexpk.1 b/Master/texmf/doc/man/man1/mktexpk.1
index 77a81768643..a6c3e1841b0 100644
--- a/Master/texmf/doc/man/man1/mktexpk.1
+++ b/Master/texmf/doc/man/man1/mktexpk.1
@@ -1,4 +1,4 @@
-.TH MKTEXPK 1 "1 March 2011" "Kpathsea 6.0.1dev"
+.TH MKTEXPK 1 "1 March 2011" "Kpathsea 6.0.1"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
diff --git a/Master/texmf/doc/man/man1/mktextfm.1 b/Master/texmf/doc/man/man1/mktextfm.1
index 302209956c0..56f9fb27027 100644
--- a/Master/texmf/doc/man/man1/mktextfm.1
+++ b/Master/texmf/doc/man/man1/mktextfm.1
@@ -1,4 +1,4 @@
-.TH MKTEXTFM 1 "1 March 2011" "Kpathsea 6.0.1dev"
+.TH MKTEXTFM 1 "1 March 2011" "Kpathsea 6.0.1"
 .\"=====================================================================
 .if n .ds MP MetaPost
 .if t .ds MP MetaPost
diff --git a/Master/texmf/doc/man/man1/patgen.1 b/Master/texmf/doc/man/man1/patgen.1
index 2514cbd2632..9c78a1aa77d 100644
--- a/Master/texmf/doc/man/man1/patgen.1
+++ b/Master/texmf/doc/man/man1/patgen.1
@@ -1,4 +1,4 @@
-.TH PATGEN 1 "7 April 2010" "Web2C 2011/dev"
+.TH PATGEN 1 "7 April 2010" "Web2C 2011"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
diff --git a/Master/texmf/doc/man/man1/pdfetex.1 b/Master/texmf/doc/man/man1/pdfetex.1
index aeb507be60c..8ca260a57b4 100644
--- a/Master/texmf/doc/man/man1/pdfetex.1
+++ b/Master/texmf/doc/man/man1/pdfetex.1
@@ -1,4 +1,4 @@
-.TH PDFETEX 1 "14 May 2010" "pdftex 1.40" "Web2C 2011/dev"
+.TH PDFETEX 1 "14 May 2010" "pdftex 1.40" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/pdftex.1 b/Master/texmf/doc/man/man1/pdftex.1
index 188d1878c4e..6ee1bae373a 100644
--- a/Master/texmf/doc/man/man1/pdftex.1
+++ b/Master/texmf/doc/man/man1/pdftex.1
@@ -1,4 +1,4 @@
-.TH PDFTEX 1 "1 March 2011" "pdftex 1.40" "Web2C 2011/dev"
+.TH PDFTEX 1 "1 March 2011" "pdftex 1.40" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/pktogf.1 b/Master/texmf/doc/man/man1/pktogf.1
index 89f0e570377..f936bb07114 100644
--- a/Master/texmf/doc/man/man1/pktogf.1
+++ b/Master/texmf/doc/man/man1/pktogf.1
@@ -1,4 +1,4 @@
-.TH PKTOGF 1 "14 December 1993" "Web2C 2011/dev"
+.TH PKTOGF 1 "14 December 1993" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/pktype.1 b/Master/texmf/doc/man/man1/pktype.1
index 169fe3d6f1b..ebf9f397f80 100644
--- a/Master/texmf/doc/man/man1/pktype.1
+++ b/Master/texmf/doc/man/man1/pktype.1
@@ -1,4 +1,4 @@
-.TH PKTYPE 1 "13 March 1996" "Web2C 2011/dev"
+.TH PKTYPE 1 "13 March 1996" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/pltotf.1 b/Master/texmf/doc/man/man1/pltotf.1
index 8258c0ab114..22da2f9b4b8 100644
--- a/Master/texmf/doc/man/man1/pltotf.1
+++ b/Master/texmf/doc/man/man1/pltotf.1
@@ -1,4 +1,4 @@
-.TH PLTOTF 1 "27 December 1992" "Web2C 2011/dev"
+.TH PLTOTF 1 "27 December 1992" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/pooltype.1 b/Master/texmf/doc/man/man1/pooltype.1
index 416d08c71b0..e02f62c7ec2 100644
--- a/Master/texmf/doc/man/man1/pooltype.1
+++ b/Master/texmf/doc/man/man1/pooltype.1
@@ -1,4 +1,4 @@
-.TH POOLTYPE 1 "27 December 1992" "Web2C 2011/dev"
+.TH POOLTYPE 1 "27 December 1992" "Web2C 2011"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
diff --git a/Master/texmf/doc/man/man1/tangle.1 b/Master/texmf/doc/man/man1/tangle.1
index fac3dc929e5..b659ec5a07c 100644
--- a/Master/texmf/doc/man/man1/tangle.1
+++ b/Master/texmf/doc/man/man1/tangle.1
@@ -1,4 +1,4 @@
-.TH TANGLE 1 "1 March 2011" "Web2C 2011/dev"
+.TH TANGLE 1 "1 March 2011" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/tex.1 b/Master/texmf/doc/man/man1/tex.1
index 9633aaa43ce..38a22a6ad97 100644
--- a/Master/texmf/doc/man/man1/tex.1
+++ b/Master/texmf/doc/man/man1/tex.1
@@ -1,4 +1,4 @@
-.TH TEX 1 "1 March 2011" "Web2C 2011/dev"
+.TH TEX 1 "1 March 2011" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/tftopl.1 b/Master/texmf/doc/man/man1/tftopl.1
index aabf0b48a46..0efb6beac95 100644
--- a/Master/texmf/doc/man/man1/tftopl.1
+++ b/Master/texmf/doc/man/man1/tftopl.1
@@ -1,4 +1,4 @@
-.TH TFTOPL 1 "17 December 1994" "Web2C 2011/dev"
+.TH TFTOPL 1 "17 December 1994" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/doc/man/man1/tie.1 b/Master/texmf/doc/man/man1/tie.1
index 9ef41558eb7..18ca10288f7 100644
--- a/Master/texmf/doc/man/man1/tie.1
+++ b/Master/texmf/doc/man/man1/tie.1
@@ -1,4 +1,4 @@
-.TH TIE 1 "7 April 2010" "Web2C 2011/dev"
+.TH TIE 1 "7 April 2010" "Web2C 2011"
 .\"=====================================================================
 .SH NAME
 tie \- merge or apply WEB change files
diff --git a/Master/texmf/doc/man/man1/vftovp.1 b/Master/texmf/doc/man/man1/vftovp.1
index 78335893ec6..0d20141e259 100644
--- a/Master/texmf/doc/man/man1/vftovp.1
+++ b/Master/texmf/doc/man/man1/vftovp.1
@@ -1,4 +1,4 @@
-.TH VFTOVP 1 "19 December 1994" "Web2C 2011/dev"
+.TH VFTOVP 1 "19 December 1994" "Web2C 2011"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
diff --git a/Master/texmf/doc/man/man1/vptovf.1 b/Master/texmf/doc/man/man1/vptovf.1
index 7cd227601f6..68a7b669b1a 100644
--- a/Master/texmf/doc/man/man1/vptovf.1
+++ b/Master/texmf/doc/man/man1/vptovf.1
@@ -1,4 +1,4 @@
-.TH VPTOVF 1 "16 December 1994" "Web2C 2011/dev"
+.TH VPTOVF 1 "16 December 1994" "Web2C 2011"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
diff --git a/Master/texmf/doc/man/man1/weave.1 b/Master/texmf/doc/man/man1/weave.1
index 940869a5ba6..c15d6e46459 100644
--- a/Master/texmf/doc/man/man1/weave.1
+++ b/Master/texmf/doc/man/man1/weave.1
@@ -1,4 +1,4 @@
-.TH WEAVE 1 "7 April 2010" "Web2C 2011/dev"
+.TH WEAVE 1 "7 April 2010" "Web2C 2011"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF M\s-2ETAFONT\s0
diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index f462563dc94..1cb0ee9b369 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -45,11 +45,14 @@
 % This is the parent directory of our several trees, i.e.,
 % /usr/local/texlive/YYYY in the original TeX Live distribution.
 %
+% All trees must be organized according to the TeX Directory Structure
+% (http://tug.org/tds), or files may not be found.
+%
 % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
 TEXMFROOT = $SELFAUTOPARENT
 
 % The tree containing runtime files related to the specific
-% distribution and version:
+% distribution and version.
 TEXMFMAIN = $TEXMFROOT/texmf
 
 % The main tree of packages, distribution-agnostic:
@@ -64,10 +67,10 @@ TEXMFSYSVAR = $TEXMFROOT/texmf-var
 % TEXMFSYSCONFIG, where *-sys store configuration data.
 TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
 
-% Per-user texmf trees.  To define more than one per-user tree, set this
-% to a list of directories in braces, as described above.
-% (This used to be HOMETEXMF.)
-% ~ expands to %USERPROFILE% on Window, $HOME otherwise.
+% Per-user texmf tree(s) -- organized per the TDS, as usual.  To define
+% more than one per-user tree, set this to a list of directories in
+% braces, as described above.  (This used to be HOMETEXMF.)  ~ expands
+% to %USERPROFILE% on Window, $HOME otherwise.
 TEXMFHOME = ~/texmf
 
 % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
@@ -205,18 +208,22 @@ TEXINPUTS.lambda        = .;$TEXMF/tex/{lambda,latex,generic,}//
 TEXINPUTS.lamed         = .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
 TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
 
-% pTeX
+% p(La)TeX.
 TEXINPUTS.ptex          = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}//
 TEXINPUTS.platex        = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}//
 
-% pBibTeX bibliographies and style files
+% ep(La)TeX.
+TEXINPUTS.eptex         = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}//
+TEXINPUTS.eplatex       = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}//
+
+% pBibTeX bibliographies and style files.
 BIBINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bib//
 BSTINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bst//
 
 % ConTeXt.
 TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
 
-% jadetex
+% jadetex.
 TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
 TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,latex,generic,}//
 
@@ -573,7 +580,8 @@ TEX = etex
 % interactive `e' option.  %d is replaced by the line number and %s by
 % the current filename.  The default is specified at compile-time, and
 % we let that stay in place since different platforms like different values.
-%TEXEDIT = vi +%d "%s"
+%TEXEDIT = vi +%d '%s'                    % default for Unix
+%TEXEDIT = texworks --position=+%d "%s"   % default for Windows
 %MFEDIT = ${TEXEDIT}
 %MPEDIT = ${TEXEDIT}
 
diff --git a/Master/texmf/xdvi/xdvi.cfg b/Master/texmf/xdvi/xdvi.cfg
index f058b6e2b62..f175e5a3f92 100644
--- a/Master/texmf/xdvi/xdvi.cfg
+++ b/Master/texmf/xdvi/xdvi.cfg
@@ -53,6 +53,10 @@ enc		8y	TeXnANSIEncoding	texnansi.enc
 % files, later entries will override earlier ones (and a warning
 % will be printed to stderr). 
 %
+% However, normally it isn't necessary to add any other map file here
+% because ps2pk.map is (normally) a generated file (by the updmap
+% script).  Instead, map files should be added to the updmap.cfg file.
+%
 % ps2pk has no "built-in" fonts, just like xdvik, so its map file is used
 % for xdvik too. For teTeX-1.0, psfonts.map is needed in addition.