doc updates for 2010

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

12 files changed, 347 insertions, 732 deletions

diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index ab58308e5d7..56392617608 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-13  Karl Berry  <karl@tug.org>
+
+	* dvips.texi: update for 2010.
+
 2010-06-04  Karl Berry  <karl@tug.org>
 
 	* afm2tfm.c (version),
diff --git a/Build/source/texk/dvipsk/TODO b/Build/source/texk/dvipsk/TODO
index 0e82c6e853d..de738d4a773 100644
--- a/Build/source/texk/dvipsk/TODO
+++ b/Build/source/texk/dvipsk/TODO
@@ -24,3 +24,9 @@ Still todo:
   and all) and a Unix machine using TDS, make it be just a `make' away.
 - Improve diagnostics, especially when files not found.
 - Eliminate `extern' declarations; use header files properly
+
+Won't do:
+- would be nice to report the full path of config.ps and psfonts.map,
+etc., if !quiet, but unfortunately these are processed before the banner
+is printed.  Can't move the banner earlier because we have to know if we
+are being quiet or not.  So, leave as debugging output only.
diff --git a/Build/source/texk/dvipsk/dvips.info b/Build/source/texk/dvipsk/dvips.info
index 2d91b5d7801..16c074cfc55 100644
--- a/Build/source/texk/dvipsk/dvips.info
+++ b/Build/source/texk/dvipsk/dvips.info
@@ -1,7 +1,7 @@
 This is ../../../texk/dvipsk/dvips.info, produced by makeinfo version
 4.13 from ../../../texk/dvipsk/dvips.texi.
 
-This manual documents Dvips version 5.98 (May 2010), a program to
+This manual documents Dvips version 5.99 (July 2010), a program to
 translate a DVI file into PostScript.  You may freely use, modify
 and/or distribute this file.
 
@@ -18,7 +18,7 @@ File: dvips.info,  Node: Top,  Next: Why Dvips,  Up: (dir)
 Dvips
 *****
 
-This manual documents Dvips version 5.98 (May 2010), a program to
+This manual documents Dvips version 5.99 (July 2010), a program to
 translate a DVI file into PostScript.  You may freely use, modify
 and/or distribute this file.
 
@@ -4708,82 +4708,82 @@ Index
 
 
 Tag Table:
-Node: Top558
-Node: Why Dvips1301
-Node: Installation4749
-Node: config.ps installation5770
-Node: PostScript font installation8307
-Node: Ghostscript installation11181
-Node: Diagnosing problems12278
-Node: Debug options13373
-Node: No output14399
-Node: Small or inverted15867
-Node: Printer errors16586
-Node: Long documents fail17918
-Node: Including graphics fails18259
-Node: Invoking Dvips19497
-Node: Basic usage20088
-Node: Command-line options21072
-Node: Option summary21521
-Node: Option details23726
-Node: Environment variables43092
-Node: Config files46051
-Node: Configuration file searching46734
-Node: Configuration file commands50034
-Node: Paper size and landscape57147
-Node: papersize special58745
-Node: Config file paper sizes60154
-Node: Paper trays64309
-Node: Interaction with PostScript65643
-Node: PostScript figures66296
-Node: Bounding box67022
-Node: \includegraphics70393
-Node: EPSF macros72684
-Node: EPSF scaling74654
-Node: EPSF clipping77224
-Node: psfile special77866
-Node: Dynamic creation of graphics80259
-Node: Fonts in figures81577
-Node: Header files83237
-Node: Including headers from TeX84443
-Node: Including headers from the command line86477
-Node: Headers and memory usage87577
-Node: Literal PS88287
-Node: " special88869
-Node: ps special89610
-Node: Literal headers91108
-Node: PostScript hooks91823
-Node: Literal examples93913
-Node: Hypertext95365
-Node: Hypertext caveats96923
-Node: Hypertext specials101320
-Node: PostScript fonts103954
-Node: Font concepts105070
-Node: Metric files106237
-Node: Glyph files109063
-Node: Virtual fonts111419
-Node: Encodings113309
-Node: PostScript typesetting115712
-Node: Making a font available118794
-Node: Invoking afm2tfm123824
-Node: Changing font encodings124794
-Node: Changing TeX encodings125584
-Node: Changing PostScript encodings126684
-Node: Changing both encodings128028
-Node: Reencoding with Afm2tfm128701
-Node: Encoding file format131805
-Node: Special font effects136008
-Node: Afm2tfm options138271
-Node: psfonts.map141256
-Node: Color145988
-Node: Color macro files147032
-Node: User-definable colors150230
-Node: Color subtleties151505
-Node: Ted Turner153156
-Node: Color device configuration154381
-Node: Color support details156823
-Node: Color specifications157201
-Node: Color specials158604
-Node: Index160733
+Node: Top559
+Node: Why Dvips1303
+Node: Installation4751
+Node: config.ps installation5772
+Node: PostScript font installation8309
+Node: Ghostscript installation11183
+Node: Diagnosing problems12280
+Node: Debug options13375
+Node: No output14401
+Node: Small or inverted15869
+Node: Printer errors16588
+Node: Long documents fail17920
+Node: Including graphics fails18261
+Node: Invoking Dvips19499
+Node: Basic usage20090
+Node: Command-line options21074
+Node: Option summary21523
+Node: Option details23728
+Node: Environment variables43094
+Node: Config files46053
+Node: Configuration file searching46736
+Node: Configuration file commands50036
+Node: Paper size and landscape57149
+Node: papersize special58747
+Node: Config file paper sizes60156
+Node: Paper trays64311
+Node: Interaction with PostScript65645
+Node: PostScript figures66298
+Node: Bounding box67024
+Node: \includegraphics70395
+Node: EPSF macros72686
+Node: EPSF scaling74656
+Node: EPSF clipping77226
+Node: psfile special77868
+Node: Dynamic creation of graphics80261
+Node: Fonts in figures81579
+Node: Header files83239
+Node: Including headers from TeX84445
+Node: Including headers from the command line86479
+Node: Headers and memory usage87579
+Node: Literal PS88289
+Node: " special88871
+Node: ps special89612
+Node: Literal headers91110
+Node: PostScript hooks91825
+Node: Literal examples93915
+Node: Hypertext95367
+Node: Hypertext caveats96925
+Node: Hypertext specials101322
+Node: PostScript fonts103956
+Node: Font concepts105072
+Node: Metric files106239
+Node: Glyph files109065
+Node: Virtual fonts111421
+Node: Encodings113311
+Node: PostScript typesetting115714
+Node: Making a font available118796
+Node: Invoking afm2tfm123826
+Node: Changing font encodings124796
+Node: Changing TeX encodings125586
+Node: Changing PostScript encodings126686
+Node: Changing both encodings128030
+Node: Reencoding with Afm2tfm128703
+Node: Encoding file format131807
+Node: Special font effects136010
+Node: Afm2tfm options138273
+Node: psfonts.map141258
+Node: Color145990
+Node: Color macro files147034
+Node: User-definable colors150232
+Node: Color subtleties151507
+Node: Ted Turner153158
+Node: Color device configuration154383
+Node: Color support details156825
+Node: Color specifications157203
+Node: Color specials158606
+Node: Index160735
 
 End Tag Table
diff --git a/Build/source/texk/dvipsk/dvips.texi b/Build/source/texk/dvipsk/dvips.texi
index 4cf5f3bad7c..22f1d937f94 100644
--- a/Build/source/texk/dvipsk/dvips.texi
+++ b/Build/source/texk/dvipsk/dvips.texi
@@ -2,8 +2,8 @@
 @setfilename dvips.info
 @settitle Dvips: A DVI-to-PostScript translator
 
-@set version 5.98
-@set month-year May 2010
+@set version 5.99
+@set month-year July 2010
 
 @copying
 This manual documents Dvips version @value{version}
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 75dd7484a89..94fbb9a6dff 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-13  Karl Berry  <karl@tug.org>
+
+	* doc/unixtex.texi: reduce to current reality.
+
 2010-06-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* getopt.h [NO_KPSE_DLL]: Allow use of this file for chktex.
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info
index c8c68550638..def0252034c 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.info
+++ b/Build/source/texk/kpathsea/doc/kpathsea.info
@@ -40,7 +40,7 @@ Kpathsea library
 
 This manual documents how to install and use the Kpathsea library for
 filename lookup.  It corresponds to version 6.0.0, released in
-April 2010.
+July 2010.
 
 * Menu:
 
@@ -61,7 +61,7 @@ File: kpathsea.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up:
 **************
 
 This manual corresponds to version 6.0.0 of the Kpathsea library,
-released in April 2010.
+released in July 2010.
 
    The library's fundamental purpose is to return a filename from a
 list of directories specified by the user, similar to what shells do
@@ -1237,166 +1237,27 @@ File: kpathsea.info,  Node: unixtex.ftp,  Next: Reporting bugs,  Prev: TeX direc
 2.5 `unixtex.ftp': Obtaining TeX
 ================================
 
-This is `ftp://ftp.tug.org/tex/unixtex.ftp', last updated 26 December
-2003.  Also available as `http://www.tug.org/unixtex.ftp'.  The IP
-address is currently `[130.225.2.178]'.  It is also in Kpathsea source
-distributions as `etc/unixtex.ftp' (although the network version is
-usually newer).  Mail <tex-k@tug.org> with comments or questions.
-
-   Following are general instructions for Unix or other sites who wish
-to acquire the Web2c distribution, (plain) TeX, LaTeX (2e), BibTeX,
-Metafont, MetaPost, DVI processors for the X window system, PostScript,
-the PCL language in the HP LaserJet, and related programs.  They are
-oriented towards building from the original sources, though some
-information on alternative packages is included in the last section.
-See also `http://www.tug.org/web2c/', the Web2c and Kpathsea home page.
-
-   Please note that the Web2c distribution is a bare-bones distribution
-in source form, and building a complete installation from it is a
-non-trivial matter.  For most uses, it is a better idea to install a
-distribution with pre-packaged binaries for your platform.  The
-principal example of such a distribution is TeX Live
-(`http://www.tug.org/texlive/'), which is based on the Web2c sources.
-
-   Please consider joining the TeX Users Group (TUG) or another user
-group of your choice to help support the maintenance and development of
-the programs you retrieve.  See `http://www.tug.org/join.html' for
-information and the membership registration form, and
-`http://www.tug.org/usergroups.html' for a listing of all user groups.
-
-   For actual installation instructions after obtaining the necessary
-sources, see *note Installation::.  A copy is in the distribution file
-`kpathsea/INSTALL'.
+This is `ftp://ftp.tug.org/tex/unixtex.ftp', last updated 13 June 2010.
+Also available as `http://www.tug.org/unixtex.ftp'.  Email
+<tex-k@tug.org> with comments or questions.
 
-* Menu:
-
-* Electronic distribution::  CTAN and so forth.
-* CD-ROM distribution::
-* Other TeX packages::
-
-
-File: kpathsea.info,  Node: Electronic distribution,  Next: CD-ROM distribution,  Up: unixtex.ftp
-
-2.5.1 Electronic distribution
------------------------------
-
-In many places we refer to CTAN:.  This is _both_ a host name and a
-directory name.  Here are the primary locations:
-
-     `ftp://ctan.tug.org/tex-archive/'    (Vermont, USA)
-     `ftp://ftp.dante.de/tex-archive/'    (Germany)
-     `ftp://ftp.tex.ac.uk/tex-archive/'   (England)
-
-CTAN has many mirrors worldwide; see the top-level file
-`README.mirrors' from one of the sites above or see
-`http://www.tug.org/CTAN.sites'.
-
-   You can also access CTAN via the World Wide Web, electronic mail, or
-NFS.  The same `README.mirrors' file explains how.
-
-   You will need to retrieve some or all of the following archives,
-depending on your needs (don't forget to set binary mode for file
-transfers):
-
-`CTAN:/systems/web2c/web.tar.gz'
-     The original WEB source files, written primarily by Don Knuth.
-     Required unless you already have this `web' version.  (The WEB
-     sources change irregularly with respect to Web2c itself.)  Unpacks
-     into `web2c-VERSION'.
-
-`CTAN:/systems/web2c/web2c.tar.gz'
-     The Web2c system.  Required.  Also unpacks into `web2c-VERSION'.
-
-`CTAN:/systems/web2c/web2c-etex.tar.gz'
-     Additions to the Web2c system for building e-TeX.  Optional.
-     Unpacks into `web2c-VERSION'.
+   The principal free TeX distribution for Unix-like systems is TeX
+Live, `http://tug.org/texlive'.  Its web pages describe many ways to
+acquire TeX, over the Internet or on physical media, both the sources
+and precompiled binaries for many systems, either standalone or as part
+of various operating system distributions.
 
-`CTAN:/systems/web2c/etexlib.tar.gz'
-     Additions to the texmf tree needed to build e-TeX.  Optional.
-     Unpacks into `texmf/'.
-
-`CTAN:/systems/web2c/etexdoc.tar.gz'
-     Documentation for e-TeX as an addition to the texmf tree.
-     Optional.  Unpacks into `texmf/'.
-
-`CTAN:/systems/web2c/web2c-omega.tar.gz'
-     Additions to the Web2c system for building Omega.  Optional.
-     Unpacks into `web2c-VERSION'.
-
-`CTAN:/systems/web2c/omegalib.tar.gz'
-     Additions to the texmf tree needed to build Omega.  Optional.
-     Unpacks into `texmf/'.
-
-`CTAN:/systems/web2c/omegadoc.tar.gz'
-     Documentation for Omega as an addition to the texmf tree.
-     Optional.  Unpacks into `texmf/'.
-
-`CTAN:/systems/web2c/web2c-pdftex.tar.gz'
-     Additions to the Web2c system for building pdfTeX.  Optional.
-     Unpacks into `web2c-VERSION'.
-
-`CTAN:/systems/web2c/pdftexlib.tar.gz'
-     Additions to the texmf tree needed to build pdfTeX.  Optional.
-     Unpacks into `texmf/'.
-
-`CTAN:/dviware/xdvik/xdvik.tar.gz'
-     X window system DVI previewer.  Unpacks into `xdvik-VERSION'.
-     Optional.
-
-   Additional drivers, macro files, and other support are needed to
-build a working system.  These are available in teTeX.
-
-   All that said, the originating host for the software above is
-`ftp.tug.org'.  You can retrieve these distributions (but not much
-else) from the `tex/' directory on that host.
-
-
-File: kpathsea.info,  Node: CD-ROM distribution,  Next: Other TeX packages,  Prev: Electronic distribution,  Up: unixtex.ftp
-
-2.5.2 CD-ROM distribution
--------------------------
+   Web2C, Kpathsea, Dvips, and Dviljk are no longer released as a
+separate packages.  Their sources are now maintained as part of TeX
+Live.
 
-Numerous organizations distribute various TeX CD-ROM's (and DVD's):
-
-   * Virtually all the TeX user groups collaborate to produce the `TeX
-     Live' distribution once a year; see `http://www.tug.org/texlive/'
-     for more information.
-
-   * The Free Software Foundation's `Source Code CD-ROM' contains the
-     minimal TeX source distribution described in the previous section
-     (i.e., enough to print GNU documentation); email <gnu@gnu.org>.
-
-   * Most GNU/Linux distributions include some TeX package based on TeX
-     Live.
-
-   If you know of additional TeX distributions to add to this list,
-please inform <tex-k@tug.org>.
-
-
-File: kpathsea.info,  Node: Other TeX packages,  Prev: CD-ROM distribution,  Up: unixtex.ftp
-
-2.5.3 Other TeX packages
-------------------------
-
-Many other TeX implementations are available in `CTAN:/systems',
-including ready-to-run distributions for Unix, Amiga, Acorn, VMS,
-Macintosh, DOS, and Windows (in various forms).  Although Web2c has
-support in the source code for many operating systems, and in fact some
-of the other distributions are based on it, it's unlikely to work as
-distributed on anything but Unix.  (Please contribute improvements!)
-
-   The principal user-oriented Unix distribution based on Web2c is the
-teTeX distribution.  It includes complete sources, and runs on all
-modern Unix variants, including Linux. It contains many TeX-related
-programs besides those in the core Web2c.
-
-   The host labrea.stanford.edu is the original source for the files
+   The host ftp.cs.stanford.edu is the original source for the files
 for which Donald Knuth is directly responsible: `tex.web', `plain.tex',
 etc. However, unless you want to build your TeX library tree ab initio,
-it is more reliable and less work to retrieve these files as part of
-the above packages. In any case, labrea is not the canonical source for
-anything except what was created by Stanford TeX project, so do not
-rely on all the files available at that ftp site being up-to-date.
+it is more reliable and less work to retrieve these files as part of a
+larger package. In any case, that ftp site is not the canonical source
+for anything except what was created as part of Stanford TeX project,
+so do not rely on the other files available there being up-to-date.
 
 
 File: kpathsea.info,  Node: Reporting bugs,  Prev: unixtex.ftp,  Up: Installation
@@ -3891,7 +3752,6 @@ Index
 * absolute filenames:                    Searching overview.  (line  52)
 * ac_include, Autoconf extension:        Running configure.   (line   6)
 * access warnings:                       Searching overview.  (line  56)
-* Acorn TeX implementations:             Other TeX packages.  (line   6)
 * AFMFONTS:                              Supported file formats.
                                                               (line  20)
 * AFS:                                   Installing files.    (line  32)
@@ -3906,7 +3766,6 @@ Index
 * alphabetical order, not:               Subdirectory expansion.
                                                               (line   6)
 * Amiga support:                         Custom installation. (line  19)
-* Amiga TeX implementations:             Other TeX packages.  (line   6)
 * Andrew File System, installing with:   Installing files.    (line  32)
 * announcement mailing list:             Mailing lists.       (line   6)
 * ANSI C:                                TeX or Metafont failing.
@@ -3930,16 +3789,12 @@ Index
 * Babel:                                 Kpathsea application distributions.
                                                               (line  28)
 * Bach, Johann Sebastian:                Default expansion.   (line  41)
-* backbone of CTAN:                      Electronic distribution.
-                                                              (line   6)
 * backslash-newline:                     Config files.        (line  31)
 * bash, recommended for running configure: configure shells.  (line   6)
 * basic glyph lookup:                    Basic glyph lookup.  (line   6)
 * Berry, Karl:                           History.             (line  12)
 * BIBINPUTS:                             Supported file formats.
                                                               (line  28)
-* binary mode, for file transfers:       Electronic distribution.
-                                                              (line  20)
 * blank lines, in texmf.cnf:             Config files.        (line  29)
 * brace expansion:                       Brace expansion.     (line   6)
 * BSD universe:                          Running make.        (line  44)
@@ -3962,7 +3817,6 @@ Index
                                                               (line   6)
 * cc, compiling with:                    configure environment.
                                                               (line  11)
-* CD-ROM distributions:                  CD-ROM distribution. (line   6)
 * CFLAGS:                                configure environment.
                                                               (line  14)
 * ChangeLog entry:                       Bug checklist.       (line  55)
@@ -4032,10 +3886,6 @@ Index
 * CPPFLAGS:                              configure environment.
                                                               (line  22)
 * crashes, reporting:                    Bug checklist.       (line  61)
-* CTAN, defined:                         Electronic distribution.
-                                                              (line   6)
-* CTAN.sites:                            Electronic distribution.
-                                                              (line  13)
 * custom installation:                   Custom installation. (line   6)
 * CWEBINPUTS:                            Supported file formats.
                                                               (line  43)
@@ -4079,9 +3929,6 @@ Index
                                                               (line   6)
 * distributions, not compiling:          Kpathsea application distributions.
                                                               (line   6)
-* distributions, on CD-ROM:              CD-ROM distribution. (line   6)
-* distributions, via ftp:                Electronic distribution.
-                                                              (line   6)
 * dlclose:                               dlopen.              (line   6)
 * dlopen:                                dlopen.              (line   6)
 * dlsym:                                 dlopen.              (line   6)
@@ -4090,7 +3937,6 @@ Index
                                                               (line 173)
 * DOS compatible names:                  mktex configuration. (line  69)
 * DOS support:                           Custom installation. (line  19)
-* DOS TeX implementations:               Other TeX packages.  (line   6)
 * dosnames:                              mktex configuration. (line  68)
 * dot files:                             ls-R.                (line  33)
 * doubled colons:                        Default expansion.   (line   6)
@@ -4113,8 +3959,6 @@ Index
 * EC fonts, and dynamic source creation: mktex scripts.       (line   6)
 * elt-dirs.c:                            Subdirectory expansion.
                                                               (line  41)
-* email CTAN access:                     Electronic distribution.
-                                                              (line  17)
 * enabling mktex scripts:                mktex configuration. (line   6)
 * ENCFONTS:                              Supported file formats.
                                                               (line  51)
@@ -4191,12 +4035,9 @@ Index
                                                               (line 224)
 * fopen, redefined:                      Debugging.           (line  54)
 * format of external database:           Database format.     (line   6)
-* Free Software Foundation:              CD-ROM distribution. (line  12)
 * FreeBSD configure error:               Empty Makefiles.     (line   6)
 * FreeBSD shells and configure:          configure shells.    (line  19)
-* FSF Source Code CD-ROM:                CD-ROM distribution. (line  12)
-* ftp retrieval:                         Electronic distribution.
-                                                              (line   6)
+* ftp.cs.stanford.edu:                   unixtex.ftp.         (line  20)
 * ftp.tug.org:                           unixtex.ftp.         (line   6)
 * fundamental purpose of Kpathsea:       Introduction.        (line   6)
 * gcc, compiling with:                   configure environment.
@@ -4260,10 +4101,7 @@ Index
 * kdebug::                               Debugging.           (line 105)
 * kdefault.c:                            Default expansion.   (line  48)
 * Knuth, Donald E.:                      History.             (line   6)
-* Knuth, Donald E., archive of programs by: Other TeX packages.
-                                                              (line  18)
-* Knuth, Donald E., original author:     Electronic distribution.
-                                                              (line  25)
+* Knuth, Donald E., archive of programs by: unixtex.ftp.      (line  20)
 * Korn shell, losing with configure:     configure shells.    (line  14)
 * kpathsae_var_value:                    Programming with config files.
                                                               (line  10)
@@ -4310,7 +4148,6 @@ Index
 * kpsewhich:                             Invoking kpsewhich.  (line   6)
 * Kpsewhich, and debugging:              Debugging.           (line  31)
 * ksh, losing with configure:            configure shells.    (line  14)
-* labrea.stanford.edu:                   Other TeX packages.  (line  18)
 * LaserJet drive:                        Kpathsea application distributions.
                                                               (line  13)
 * last-resort font:                      Fallback font.       (line   6)
@@ -4336,7 +4173,6 @@ Index
 * lines, reading arbitrary-length:       Calling sequence.    (line 112)
 * Linux File System Standard:            mktex configuration. (line 114)
 * Linux shells and configure:            configure shells.    (line  19)
-* Linux, using Web2c:                    CD-ROM distribution. (line  16)
 * lndir for building symlink trees:      configure scenarios. (line  18)
 * loader options:                        configure environment.
                                                               (line  39)
@@ -4354,7 +4190,6 @@ Index
 * ls-R database file:                    ls-R.                (line   6)
 * ls-R, simplest build:                  ls-R.                (line  18)
 * Mach10 configure error:                Empty Makefiles.     (line   6)
-* Macintosh TeX implementations:         Other TeX packages.  (line   6)
 * MacKenzie, David <1>:                  Subdirectory expansion.
                                                               (line  22)
 * MacKenzie, David:                      History.             (line  45)
@@ -4387,8 +4222,6 @@ Index
                                                               (line  99)
 * MFTINPUTS:                             Supported file formats.
                                                               (line 103)
-* mirrors, FTP:                          Electronic distribution.
-                                                              (line  13)
 * MISCFONTS:                             Supported file formats.
                                                               (line 107)
 * mismatched checksum warnings:          Suppressing warnings.
@@ -4446,8 +4279,6 @@ Index
 * NeXT, lacking X11:                     Kpathsea application distributions.
                                                               (line   6)
 * NFS and ls-R:                          ls-R.                (line  40)
-* NFS CTAN access:                       Electronic distribution.
-                                                              (line  17)
 * nomfdrivers:                           mktex configuration. (line  93)
 * nomode:                                mktex configuration. (line  98)
 * non-English typesetting:               Kpathsea application distributions.
@@ -4458,9 +4289,6 @@ Index
 * null pointers, dereferencing:          Bug checklist.       (line  61)
 * numeric debugging values:              Debugging.           (line  34)
 * obtaining TeX:                         unixtex.ftp.         (line   6)
-* obtaining Web2c by ftp:                Electronic distribution.
-                                                              (line   6)
-* obtaining Web2c on CD-ROM:             CD-ROM distribution. (line   6)
 * OCPINPUTS:                             Supported file formats.
                                                               (line 127)
 * OFMFONTS:                              Supported file formats.
@@ -4477,7 +4305,6 @@ Index
 * options for debugging:                 Debugging.           (line   6)
 * options to configure:                  configure options.   (line  16)
 * OS/2 support:                          Custom installation. (line  19)
-* other TeX distributions:               Other TeX packages.  (line   6)
 * OTPINPUTS:                             Supported file formats.
                                                               (line 141)
 * overview of path searching:            Searching overview.  (line   6)
@@ -4533,7 +4360,6 @@ Index
 * PostScript fonts, additional:          Simple installation. (line  60)
 * precompiled executables, instead of installation: Simple installation.
                                                               (line   6)
-* precompiled Unix binaries:             Other TeX packages.  (line  13)
 * preprocessor options:                  configure environment.
                                                               (line  32)
 * preprocessor options, additional:      Running make.        (line  24)
@@ -4563,8 +4389,6 @@ Index
                                                               (line  26)
 * reading arbitrary-length lines:        Calling sequence.    (line 112)
 * README.CONFIGURE:                      Running configure.   (line  15)
-* README.mirrors:                        Electronic distribution.
-                                                              (line  13)
 * recording successful searches:         Logging.             (line   6)
 * relative filenames:                    Searching overview.  (line  52)
 * relative filenames in ls-R:            Installing files.    (line  40)
@@ -4668,12 +4492,10 @@ Index
 * testing, post-installation:            Installation testing.
                                                               (line   6)
 * tests, simple:                         Simple installation. (line  79)
-* teTeX:                                 Other TeX packages.  (line  13)
 * TeX directory structure <1>:           TeX directory structure.
                                                               (line   6)
 * TeX directory structure:               Default path features.
                                                               (line  41)
-* TeX distributions besides Web2c:       Other TeX packages.  (line   6)
 * TeX environment variables:             Supported file formats.
                                                               (line   6)
 * TeX failures:                          TeX or Metafont failing.
@@ -4682,7 +4504,6 @@ Index
 * TeX glyph lookup:                      Glyph lookup.        (line   6)
 * TeX help mailing list:                 Mailing lists.       (line  25)
 * TeX hierarchy, one:                    configure scenarios. (line  13)
-* TeX Live CD-ROM:                       CD-ROM distribution. (line   8)
 * TeX support:                           TeX support.         (line   6)
 * TeX Users Group:                       Introduction.        (line  39)
 * tex-file.c:                            File lookup.         (line  37)
@@ -4693,6 +4514,7 @@ Index
                                                               (line  24)
 * tex-k-request@tug.org:                 Mailing lists.       (line   7)
 * tex-k@tug.org (bug address):           Reporting bugs.      (line   8)
+* tex.web:                               unixtex.ftp.         (line  20)
 * TEX_HUSH <1>:                          Suppressing warnings.
                                                               (line   6)
 * TEX_HUSH:                              Searching overview.  (line  56)
@@ -4808,7 +4630,6 @@ Index
 * VFFONTS:                               Supported file formats.
                                                               (line 207)
 * VMS support:                           Custom installation. (line  19)
-* VMS TeX implementations:               Other TeX packages.  (line   6)
 * Vojta, Paul:                           History.             (line  30)
 * Walsh, Norman:                         History.             (line  57)
 * warning about unusable ls-R:           ls-R.                (line  45)
@@ -4827,9 +4648,6 @@ Index
 * whitespace, in fontmap files:          Fontmap.             (line  28)
 * whitespace, not ignored on continuation lines: Config files.
                                                               (line  31)
-* Windows TeX implementations:           Other TeX packages.  (line   6)
-* World Wide Web CTAN access:            Electronic distribution.
-                                                              (line  17)
 * www.tug.org:                           unixtex.ftp.         (line   6)
 * X11 previewer:                         Kpathsea application distributions.
                                                               (line  25)
@@ -4857,85 +4675,82 @@ Index
 
 Tag Table:
 Node: Top1615
-Node: Introduction2259
-Node: History4082
-Node: Installation8174
-Node: Simple installation8964
-Node: Custom installation12547
-Node: Disk space13721
-Node: Kpathsea application distributions14605
-Node: Changing search paths15720
-Node: Default path features16902
-Node: Default path generation18985
-Node: Running configure20428
-Node: configure shells21479
-Node: configure options22531
-Node: configure environment24038
-Node: configure scenarios25840
-Node: Shared library27426
-Node: Running make28440
-Node: Installing files30487
-Node: Cleaning up32434
-Node: Filename database generation33482
-Node: mktex scripts34049
-Node: mktex configuration35326
-Node: mktex script names41145
-Node: mktex script arguments42536
-Node: Installation testing43426
-Node: Security43790
-Node: TeX directory structure46357
-Node: unixtex.ftp50779
-Node: Electronic distribution52789
-Node: CD-ROM distribution55554
-Node: Other TeX packages56369
-Node: Reporting bugs57665
-Node: Bug checklist58400
-Node: Mailing lists62097
-Node: Debugging63306
-Node: Logging68384
-Node: Common problems70254
-Node: Unable to find files71085
-Node: Slow path searching73496
-Node: Unable to generate fonts74873
-Node: TeX or Metafont failing77382
-Node: Empty Makefiles79261
-Node: XtStrings80498
-Node: dlopen81334
-Node: ShellWidgetClass82152
-Node: Pointer combination warnings83784
-Node: Path searching84173
-Node: Searching overview84820
-Node: Path sources88216
-Node: Config files89287
-Node: Path expansion92932
-Node: Default expansion93881
-Node: Variable expansion95951
-Node: Tilde expansion97354
-Node: Brace expansion98334
-Node: KPSE_DOT expansion99439
-Node: Subdirectory expansion99952
-Node: Filename database102303
-Node: ls-R103357
-Node: Filename aliases106251
-Node: Database format107429
-Node: Invoking kpsewhich108442
-Node: Path searching options109388
-Node: Specially-recognized files117552
-Node: Auxiliary tasks118908
-Node: Standard options120733
-Node: TeX support121089
-Node: Supported file formats122380
-Node: File lookup129897
-Node: Glyph lookup131646
-Node: Basic glyph lookup132770
-Node: Fontmap133649
-Node: Fallback font136266
-Node: Suppressing warnings137179
-Node: Programming138284
-Node: Programming overview138797
-Node: Calling sequence141491
-Node: Program-specific files148014
-Node: Programming with config files149037
-Node: Index150349
+Node: Introduction2258
+Node: History4080
+Node: Installation8172
+Node: Simple installation8962
+Node: Custom installation12545
+Node: Disk space13719
+Node: Kpathsea application distributions14603
+Node: Changing search paths15718
+Node: Default path features16900
+Node: Default path generation18983
+Node: Running configure20426
+Node: configure shells21477
+Node: configure options22529
+Node: configure environment24036
+Node: configure scenarios25838
+Node: Shared library27424
+Node: Running make28438
+Node: Installing files30485
+Node: Cleaning up32432
+Node: Filename database generation33480
+Node: mktex scripts34047
+Node: mktex configuration35324
+Node: mktex script names41143
+Node: mktex script arguments42534
+Node: Installation testing43424
+Node: Security43788
+Node: TeX directory structure46355
+Node: unixtex.ftp50777
+Node: Reporting bugs52095
+Node: Bug checklist52830
+Node: Mailing lists56527
+Node: Debugging57736
+Node: Logging62814
+Node: Common problems64684
+Node: Unable to find files65515
+Node: Slow path searching67926
+Node: Unable to generate fonts69303
+Node: TeX or Metafont failing71812
+Node: Empty Makefiles73691
+Node: XtStrings74928
+Node: dlopen75764
+Node: ShellWidgetClass76582
+Node: Pointer combination warnings78214
+Node: Path searching78603
+Node: Searching overview79250
+Node: Path sources82646
+Node: Config files83717
+Node: Path expansion87362
+Node: Default expansion88311
+Node: Variable expansion90381
+Node: Tilde expansion91784
+Node: Brace expansion92764
+Node: KPSE_DOT expansion93869
+Node: Subdirectory expansion94382
+Node: Filename database96733
+Node: ls-R97787
+Node: Filename aliases100681
+Node: Database format101859
+Node: Invoking kpsewhich102872
+Node: Path searching options103818
+Node: Specially-recognized files111982
+Node: Auxiliary tasks113338
+Node: Standard options115163
+Node: TeX support115519
+Node: Supported file formats116810
+Node: File lookup124327
+Node: Glyph lookup126076
+Node: Basic glyph lookup127200
+Node: Fontmap128079
+Node: Fallback font130696
+Node: Suppressing warnings131609
+Node: Programming132714
+Node: Programming overview133227
+Node: Calling sequence135921
+Node: Program-specific files142444
+Node: Programming with config files143467
+Node: Index144779
 
 End Tag Table
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.texi b/Build/source/texk/kpathsea/doc/kpathsea.texi
index a386b5f7980..fade566d07f 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.texi
+++ b/Build/source/texk/kpathsea/doc/kpathsea.texi
@@ -3,7 +3,7 @@
 @settitle Kpathsea: A library for path searching
 
 @set version 6.0.0
-@set month-year April 2010
+@set month-year July 2010
 
 @copying
 This file documents the Kpathsea library for path searching.
diff --git a/Build/source/texk/kpathsea/doc/unixtex.texi b/Build/source/texk/kpathsea/doc/unixtex.texi
index bf47da2a317..b77e6ae005a 100644
--- a/Build/source/texk/kpathsea/doc/unixtex.texi
+++ b/Build/source/texk/kpathsea/doc/unixtex.texi
@@ -17,268 +17,29 @@ This
 @iftex
 chapter
 @end iftex
-is @uref{ftp://ftp.tug.org/tex/unixtex.ftp}, last updated 26 December
-2003.  Also available as @uref{http://www.tug.org/unixtex.ftp}.  The
-IP address is currently @code{[130.225.2.178]}.  It is also in
-Kpathsea source distributions as @file{etc/unixtex.ftp} (although the
-network version is usually newer).  Mail @email{tex-k@@tug.org}
-with comments or questions.
-
-Following are general instructions for Unix or other sites who wish to
-acquire the Web2c distribution, (plain) @TeX{}, La@TeX{} (2e),
-Bib@TeX{}, Metafont, MetaPost, DVI processors for the X window system,
-PostScript, the PCL language in the HP LaserJet, and related programs.
-They are oriented towards building from the original sources, though
-some information on alternative packages is included in the last
-section.  See also @uref{http://www.tug.org/web2c/}, the Web2c and
-Kpathsea home page.
-
-Please note that the Web2c distribution is a bare-bones distribution
-in source form, and building a complete installation from it is a
-non-trivial matter.  For most uses, it is a better idea to install a
-distribution with pre-packaged binaries for your platform.  The
-principal example of such a distribution is @TeX{} Live
-(@uref{http://www.tug.org/texlive/}), which is based on the
-Web2c sources.
-
-Please consider joining the @TeX{} Users Group (TUG) or another user
-group of your choice to help support the maintenance and development
-of the programs you retrieve.  See @uref{http://www.tug.org/join.html}
-for information and the membership registration form, and
-@uref{http://www.tug.org/usergroups.html} for a listing of all user groups.
-
-For actual installation instructions after obtaining the necessary
-sources, see @ref{Installation}.  A copy is in the distribution file
-@file{kpathsea/INSTALL}.
-
-@menu
-* Electronic distribution::  CTAN and so forth.
-* CD-ROM distribution::
-* Other TeX packages::
-@end menu
-
-@c * Tape distribution::
-@c used to be in this menu.
-
-@node Electronic distribution
-@subsection Electronic distribution
-
-@cindex ftp retrieval
-@cindex obtaining Web2c by ftp
-@cindex distributions, via ftp
-
-@cindex CTAN, defined
-@cindex backbone of CTAN
-In many places we refer to @var{CTAN:}.  This is @emph{both} a host name
-and a directory name.  Here are the primary locations:
-
-@example
-@uref{ftp://ctan.tug.org/tex-archive/}    @r{(Vermont, USA)}
-@uref{ftp://ftp.dante.de/tex-archive/}    @r{(Germany)}
-@uref{ftp://ftp.tex.ac.uk/tex-archive/}   @r{(England)}
-@end example
-
-@noindent
-@flindex README.mirrors
-@flindex CTAN.sites
-@cindex mirrors, FTP
-CTAN has many mirrors worldwide; see the top-level file
-@file{README.mirrors} from one of the sites above or see
-@uref{http://www.tug.org/CTAN.sites}.
-
-@cindex World Wide Web CTAN access
-@cindex email CTAN access
-@cindex NFS CTAN access
-You can also access CTAN via the World Wide Web, electronic
-mail, or NFS.  The same @file{README.mirrors} file explains how.
-
-@cindex binary mode, for file transfers
-You will need to retrieve some or all of the following archives,
-depending on your needs (don't forget to set binary mode for file
-transfers):
-
-@table @asis
-@item @file{@var{CTAN:}/systems/web2c/web.tar.gz}
-@cindex Knuth, Donald E., original author
-The original WEB source files, written primarily by Don Knuth.  Required
-unless you already have this @file{web} version.  (The WEB sources
-change irregularly with respect to Web2c itself.)  Unpacks into
-@file{web2c-@var{version}}.
-
-@item @file{@var{CTAN:}/systems/web2c/web2c.tar.gz}
-The Web2c system.  Required.  Also unpacks into
-@file{web2c-@var{version}}.
-
-@item @file{@var{CTAN:}/systems/web2c/web2c-etex.tar.gz}
-Additions to the Web2c system for building e-@TeX{}.  Optional.  Unpacks
-into @file{web2c-@var{version}}.
-
-@item @file{@var{CTAN:}/systems/web2c/etexlib.tar.gz}
-Additions to the texmf tree needed to build e-@TeX{}.  Optional.
-Unpacks into @file{texmf/}.
-
-@item @file{@var{CTAN:}/systems/web2c/etexdoc.tar.gz}
-Documentation for e-@TeX{} as an addition to the texmf tree.  Optional.
-Unpacks into @file{texmf/}.
-
-@item @file{@var{CTAN:}/systems/web2c/web2c-omega.tar.gz}
-Additions to the Web2c system for building Omega.  Optional.  Unpacks
-into @file{web2c-@var{version}}.
-
-@item @file{@var{CTAN:}/systems/web2c/omegalib.tar.gz}
-Additions to the texmf tree needed to build Omega.  Optional.  Unpacks
-into @file{texmf/}.
-
-@item @file{@var{CTAN:}/systems/web2c/omegadoc.tar.gz}
-Documentation for Omega as an addition to the texmf tree.  Optional.
-Unpacks into @file{texmf/}.
-
-@item @file{@var{CTAN:}/systems/web2c/web2c-pdftex.tar.gz}
-Additions to the Web2c system for building pdf@TeX{}.  Optional.
-Unpacks into @file{web2c-@var{version}}.
-
-@item @file{@var{CTAN:}/systems/web2c/pdftexlib.tar.gz}
-Additions to the texmf tree needed to build pdf@TeX{}.  Optional.
-Unpacks into @file{texmf/}.
-
-@item @file{@var{CTAN:}/dviware/xdvik/xdvik.tar.gz}
-X window system DVI previewer.  Unpacks into @file{xdvik-@var{version}}.
-Optional.
-@end table
-
-Additional drivers, macro files, and other support are needed to build
-a working system.  These are available in te@TeX{}.
-
-All that said, the originating host for the software above is
-@file{ftp.tug.org}.  You can retrieve these distributions (but not much
-else) from the @file{tex/} directory on that host.
-
-
-@node CD-ROM distribution
-@subsection CD-ROM distribution
-
-@cindex CD-ROM distributions
-@cindex obtaining Web2c on CD-ROM
-@cindex distributions, on CD-ROM
-
-Numerous organizations distribute various @TeX{} CD-ROM's (and DVD's):
-
-@itemize @bullet
-@item
-@cindex @TeX{} Live CD-ROM
-Virtually all the @TeX{} user groups collaborate to produce the
-@cite{@TeX{} Live} distribution once a year; see
-@uref{http://www.tug.org/texlive/} for more information.
-
-@item
-@cindex Free Software Foundation
-@cindex FSF Source Code CD-ROM
-The Free Software Foundation's @cite{Source Code CD-ROM} contains the
-minimal @TeX{} source distribution described in the previous section
-(i.e., enough to print GNU documentation); email
-@email{gnu@@gnu.org}.
-
-@c Commented out: the information is outdated in way or another.
-
-@c @item
-@c The Gateway@! CD-ROM set contains a runnable NetBSD/Amiga distribution
-@c and sources; see @url{http://www.netbsd.org/Sites/cdroms.html}.
-
-@c @item
-@c The InfoMagic CD-ROM is a copy of CTAN (see previous section); see
-@c @url{http://www.infomagic.com}.
-
-@c @item
-@c @cindex 4all@TeX{} Live CD-ROM
-@c @cindex NTG
-@c NTG (Dutch-speaking @TeX{} user group) produced the 4all@TeX{} CD-ROM;
-@c email @email{ntg@@nic.surfnet.nl}, or see
-@c @url{http://www.ntg.nl/4allcd/}.  This is a runnable system.
-
-@c @item
-@c @cindex Prime Time @TeX{}cetera CD-ROM
-@c The Prime Time @TeX{}cetera CD-ROM is also a copy of CTAN; email
-@c @email{ptf@@ctcl.com} or see @url{http://www.ptf.com/ptf/}.
-
-@c @item
-@c @cindex Walnut Creek @TeX{} CD-ROM
-@c Walnut Creek's @TeX{} CD-ROM is also a copy of CTAN; email
-@c @email{info@@cdrom.com} or see
-@c @url{http://www.cdrom.com:/titles/tex.html}.
-
-@item
-@cindex Linux, using Web2c
-Most GNU/Linux distributions include some @TeX{} package based on
-@TeX{} Live.
-@end itemize
-
-If you know of additional @TeX{} distributions to add to this
-list, please inform @email{tex-k@@tug.org}.
-
-@ignore
-
-@node Tape distribution
-@subsection Tape distribution
-
-@cindex tape distribution
-@cindex obtaining @TeX{} on tape
-@cindex distributions, on tape
-
-@cindex Northwest Computing Support Center
-@flindex unixtex@@u.washington.edu
-@cindex support organization
-You can obtain a complete @TeX{} distribution, including Web2c, on tape.
-Contact:
-@display
-Pierre MacKay / Denny Hall, Mail Stop DH-10 / Department of Classics
-University of Washington / Seattle, WA 98195 / USA
-phone: 206-543-2268; email: @email{unixtex@@u.washington.edu}
-@end display
-
-At this writing, the distribution is available in @code{tar} format on
-4@dmn{mm} DAT cartridges, and the
-cost is US$210.  Make checks payable to the University of Washington,
-drawn on a U.S. bank.  Purchase orders are acceptable, but they carry an
-extra charge of $10 to pay for invoice processing.  Overseas sites,
-please add $20 for shipment via air parcel post, or $30 for shipment via
-courier.
-
-@end ignore
-
-@node Other TeX packages
-@subsection Other @TeX{} packages
-
-@cindex other @TeX{} distributions
-@cindex @TeX{} distributions besides Web2c
-
-@cindex Amiga @TeX{} implementations
-@cindex Acorn @TeX{} implementations
-@cindex VMS @TeX{} implementations
-@cindex Macintosh @TeX{} implementations
-@cindex DOS @TeX{} implementations
-@cindex Windows @TeX{} implementations
-Many other @TeX{} implementations are available in
-@file{@var{CTAN:}/systems}, including ready-to-run distributions for
-Unix, Amiga, Acorn, VMS, Macintosh, DOS, and Windows (in various forms).
-Although Web2c has support in the source code for many operating
-systems, and in fact some of the other distributions are based on it,
-it's unlikely to work as distributed on anything but Unix.  (Please
-contribute improvements!)
-
-@cindex te@TeX{}
-@cindex precompiled Unix binaries
-The principal user-oriented Unix distribution based on Web2c is the
-te@TeX{} distribution.  It includes complete sources, and runs on
-all modern Unix variants, including Linux. It contains many
-@TeX{}-related programs besides those in the core Web2c.
-
-@flindex labrea.stanford.edu
+is @uref{ftp://ftp.tug.org/tex/unixtex.ftp}, last updated 13 June
+2010.  Also available as @uref{http://www.tug.org/unixtex.ftp}.  Email
+@email{tex-k@@tug.org} with comments or questions.
+
+The principal free @TeX{} distribution for Unix-like systems is @TeX{}
+Live, on the web at @url{http://tug.org/texlive}.  The pages there
+describe many ways to acquire @TeX{}, over the Internet or on physical
+media, both the sources and precompiled binaries for many systems,
+either standalone or as part of various operating system
+distributions.
+
+Web2C, Kpathsea, Dvips, and Dviljk are no longer released as a
+separate packages.  Their sources are now maintained as part of @TeX{}
+Live.
+
+@flindex ftp.cs.stanford.edu
+@flindex tex.web
 @cindex Knuth, Donald E., archive of programs by
-The host @t{labrea.stanford.edu} is the original source for the files
+The host @t{ftp.cs.stanford.edu} is the original source for the files
 for which Donald Knuth is directly responsible: @file{tex.web},
 @file{plain.tex}, etc. However, unless you want to build your @TeX{}
 library tree ab initio, it is more reliable and less work to retrieve
-these files as part of the above packages. In any case, @t{labrea} is
-not the canonical source for anything except what was created by
-Stanford @TeX{} project, so do not rely on all the files available at
-that ftp site being up-to-date.
+these files as part of a larger package. In any case, that ftp site is
+not the canonical source for anything except what was created as part
+of Stanford @TeX{} project, so do not rely on the other files available
+there being up-to-date.
diff --git a/Build/source/texk/tetex/fmtutil b/Build/source/texk/tetex/fmtutil
index cb3579971a9..a1be58baa5c 100755
--- a/Build/source/texk/tetex/fmtutil
+++ b/Build/source/texk/tetex/fmtutil
@@ -126,8 +126,10 @@ Valid commands for fmtutil:
   --version                  show version info
   --help                     show this message
 
-The config file is named fmtutil.cnf, and
+The default config file is named fmtutil.cnf, and
 running  kpsewhich fmtutil.cnf  should show the active file.
+The command  kpsewhich --engine=/ --all foo.fmt  should show the
+locations of any and all foo.fmt files.
 
 For more information about fmt generation in TeX Live, try
 tlmgr --help or see http://tug.org/texlive/doc/tlmgr.html.
@@ -488,12 +490,13 @@ main()
       --test|--dolinks|--force)
           ;;
       "") break;;
-      *) abort "unknown option \`$1'. Try $progname --help for help";;
+      *) abort "unknown option \`$1'; try $progname --help if you need it";;
     esac
   do test $# -gt 0 && shift; done
 
   case "$cmd" in
-    help|"") help;;
+         "") abort "missing command; try $progname --help if you need it";;
+       help) help;;
     version) version;;
   esac
 
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index ce4483a839a..2c0bf8eb82e 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-13  Karl Berry  <karl@tug.org>
+
+	* doc/web2c.texi (mpost): mention .mps extension.
+
 2010-06-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* c-auto.h, config.h (removed): Obsolete, all mplibdir/ and
diff --git a/Build/source/texk/web2c/doc/web2c.info b/Build/source/texk/web2c/doc/web2c.info
index 16fcecaceb6..6b628f45a08 100644
--- a/Build/source/texk/web2c/doc/web2c.info
+++ b/Build/source/texk/web2c/doc/web2c.info
@@ -59,7 +59,7 @@ Web2c
 
 This document describes how to install and use the programs in the Web2c
 implementation of the TeX system, especially for Unix systems.  It
-corresponds to Web2c version 2009, released in February 2010.
+corresponds to Web2c version 2010, released in July 2010.
 
 * Menu:
 
@@ -83,8 +83,7 @@ File: web2c.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up: Top
 1 Introduction
 **************
 
-This manual corresponds to version 2009 of Web2c, released in February
-2010.
+This manual corresponds to version 2010 of Web2c, released in July 2010.
 
    "Web2c" is the name of a TeX implementation, originally for Unix,
 but now also running under DOS, Amiga, and other operating systems. By
@@ -2075,8 +2074,8 @@ structure.  See also:
    * `http://cm.bell-labs.com/who/hobby/MetaPost.html' (the
      MetaPost author's home page);
 
-   * `http://tug.org/metapost.html' (papers, packages, and
-     related information).
+   * `http://tug.org/metapost' (papers, packages, and       related
+     information).
 
    Also, a standard MetaPost package for drawing graphs is documented in
 AT&T technical report CSTR-164, available as the file `mpgraph.ps',
@@ -2148,6 +2147,12 @@ only standard PostScript fonts.  MetaPost reads the same `psfonts.map'
 file as Dvips, to determine PostScript fonts that need to be downloaded
 (*note psfonts.map: (dvips)psfonts.map.).
 
+   It is posible for pdfTeX to read MetaPost output directly; this is
+in contrast to general EPSF files, which have to be converted for use
+with PDF output.  The easiest way is to name the MetaPost output files
+with the `.mps' extension.  Then the LaTeX `\includegraphics' command,
+for example, will be able to read them, even when outputting PDF.
+
    MetaPost can write output files, via the `write' primitive; this
 opens a security hole.  *Note tex invocation::.
 
@@ -3602,11 +3607,11 @@ Index
 * -show-opcodes:                         dvitype invocation.  (line  56)
 * -strict:                               tangle invocation.   (line  46)
 * -style=MFTFILE:                        mft invocation.      (line  68)
-* -T:                                    mpost invocation.    (line 112)
+* -T:                                    mpost invocation.    (line 118)
 * -terse:                                bibtex invocation.   (line  28)
-* -tex=TEXPROGRAM:                       mpost invocation.    (line 115)
+* -tex=TEXPROGRAM:                       mpost invocation.    (line 121)
 * -translate-file=TCXFILE:               Common options.      (line  96)
-* -troff:                                mpost invocation.    (line 112)
+* -troff:                                mpost invocation.    (line 118)
 * -underline:                            tangle invocation.   (line  41)
 * -uppercase:                            tangle invocation.   (line  35)
 * -x:                                    weave invocation.    (line  22)
@@ -3622,6 +3627,7 @@ Index
 * .mem:                                  Initial MetaPost.    (line   6)
 * .mf:                                   mf invocation.       (line  24)
 * .mp:                                   mpost invocation.    (line  31)
+* .mps files and PDF:                    mpost invocation.    (line  89)
 * .NNN PostScript figures:               mpost invocation.    (line  37)
 * .NNNgf generic fonts:                  mf invocation.       (line  34)
 * .tcx character translation files <1>:  TCX files.           (line   6)
@@ -3664,7 +3670,7 @@ Index
                                                               (line  16)
 * accented character:                    TCX files.           (line   6)
 * accents, hyphenating words with:       MLTeX.               (line   6)
-* acknowledgements:                      Introduction.        (line  51)
+* acknowledgements:                      Introduction.        (line  50)
 * acm.bst:                               Basic BibTeX style files.
                                                               (line  19)
 * Ada, WEB for:                          WEB.                 (line  13)
@@ -3707,7 +3713,7 @@ Index
 * BDF and GF conversion:                 Font utilities available elsewhere.
                                                               (line  15)
 * beginfig:                              mpost invocation.    (line  37)
-* Berry, Karl:                           Introduction.        (line  41)
+* Berry, Karl:                           Introduction.        (line  40)
 * BIBINPUTS, search path for bib files:  bibtex invocation.   (line  18)
 * bibliographies, creating:              BibTeX.              (line   6)
 * bibliography:                          References.          (line   6)
@@ -3723,7 +3729,7 @@ Index
 * blank lines, in TCX files:             TCX files.           (line  67)
 * boxes, memory for:                     Runtime options.     (line  20)
 * breakpoints, memory for:               Runtime options.     (line  20)
-* Breitenlohner, Peter:                  Introduction.        (line   9)
+* Breitenlohner, Peter:                  Introduction.        (line   8)
 * BSTINPUTS, search path for bst files:  bibtex invocation.   (line  18)
 * btex for MetaPost labels:              mpost invocation.    (line  50)
 * btxdoc.bib:                            bibtex invocation.   (line  48)
@@ -3792,7 +3798,7 @@ Index
 * cross-references, omitting:            weave invocation.    (line  22)
 * current directory, used for output:    Output file location.
                                                               (line   6)
-* Curtis, Pavel:                         Introduction.        (line  41)
+* Curtis, Pavel:                         Introduction.        (line  40)
 * CWEB:                                  WEB.                 (line  13)
 * Cweb:                                  WEB.                 (line  13)
 * date and time, in memory dumps:        Hardware and memory dumps.
@@ -3906,7 +3912,7 @@ Index
 * fraction routines:                     Compile-time options.
                                                               (line  22)
 * Free Software Foundation documentation system: Formats.     (line  47)
-* freedom of Web2c:                      Introduction.        (line  23)
+* freedom of Web2c:                      Introduction.        (line  22)
 * ftp.math.utah.edu:                     bibtex invocation.   (line  54)
 * generating source specials:            tex invocation.      (line 136)
 * geometric designs:                     Metafont.            (line   6)
@@ -3943,12 +3949,12 @@ Index
 * headerbyte information:                tftopl invocation.   (line  96)
 * height, in pixels:                     pktype invocation.   (line  62)
 * help, online:                          Common options.      (line  11)
-* Henry, Patrick:                        Introduction.        (line  23)
+* Henry, Patrick:                        Introduction.        (line  22)
 * Herberts, Mathias:                     Online Metafont graphics.
                                                               (line  20)
 * hex character codes, in TCX files:     TCX files.           (line  78)
-* history:                               Introduction.        (line  41)
-* Hobby, John:                           Introduction.        (line   9)
+* history:                               Introduction.        (line  40)
+* Hobby, John:                           Introduction.        (line   8)
 * horizontal escapement <1>:             gftype invocation.   (line 107)
 * horizontal escapement:                 pktype invocation.   (line  57)
 * hp2627:                                Online Metafont graphics.
@@ -3964,7 +3970,7 @@ Index
 * hyphenation and languages:             Languages and hyphenation.
                                                               (line   6)
 * hyphenation patterns, creating:        patgen invocation.   (line   6)
-* ice cream:                             Introduction.        (line  23)
+* ice cream:                             Introduction.        (line  22)
 * identifier case:                       tangle invocation.   (line  35)
 * identifier collisions:                 tangle invocation.   (line  46)
 * identifier length:                     tangle invocation.   (line  27)
@@ -3998,7 +4004,7 @@ Index
 * kerning table, in TFM files:           tftopl invocation.   (line 102)
 * keyboard character code, translating:  TCX files.           (line 102)
 * Knuth, Donald E. <1>:                  mft invocation.      (line  58)
-* Knuth, Donald E.:                      Introduction.        (line   9)
+* Knuth, Donald E.:                      Introduction.        (line   8)
 * KPATHSEA_DEBUG:                        Common options.      (line  60)
 * KRN property:                          tftopl invocation.   (line 102)
 * label font:                            gftodvi invocation.  (line  36)
@@ -4012,7 +4018,7 @@ Index
 * left side bearing <1>:                 gftype invocation.   (line  82)
 * left side bearing:                     pktype invocation.   (line  66)
 * legalisms:                             Legalisms.           (line   6)
-* licensing terms:                       Introduction.        (line  23)
+* licensing terms:                       Introduction.        (line  22)
 * LIG property:                          tftopl invocation.   (line 102)
 * ligature table, in TFM files:          tftopl invocation.   (line 102)
 * LIGTABLE property:                     tftopl invocation.   (line 102)
@@ -4039,7 +4045,7 @@ Index
 * magnification:                         dvicopy invocation.  (line  20)
 * main_memory:                           Runtime options.     (line  15)
 * Make targets, additional:              Additional targets.  (line   6)
-* Martin, Rick:                          Introduction.        (line  51)
+* Martin, Rick:                          Introduction.        (line  50)
 * Mathematical Reviews:                  Formats.             (line  39)
 * mathematical typesetting:              TeX.                 (line   6)
 * mem file, determining:                 Determining the memory dump to use.
@@ -4106,8 +4112,8 @@ Index
 * mode_setup:                            Modes.               (line  15)
 * modes file needed for Metafont:        Modes.               (line   6)
 * modes.mf recommended modes file:       Modes.               (line  10)
-* Morgan, Tim:                           Introduction.        (line  41)
-* Morris, Bob:                           Introduction.        (line  51)
+* Morgan, Tim:                           Introduction.        (line  40)
+* Morris, Bob:                           Introduction.        (line  50)
 * MPEDIT:                                Editor invocation.   (line  10)
 * mpgraph.ps:                            mpost invocation.    (line  19)
 * mpman.ps:                              mpost invocation.    (line   6)
@@ -4158,6 +4164,7 @@ Index
 * path searching:                        Path searching.      (line   6)
 * path searching debugging:              Common options.      (line  60)
 * PDF:                                   TeX extensions.      (line  20)
+* PDF, and .mps files:                   mpost invocation.    (line  89)
 * pdfTeX:                                TeX extensions.      (line  20)
 * permissions, legal:                    Legalisms.           (line   6)
 * PFA and PFB conversion:                Font utilities available elsewhere.
@@ -4220,7 +4227,7 @@ Index
                                                               (line  32)
 * program names, special <1>:            tex invocation.      (line 110)
 * program names, special:                Common options.      (line  45)
-* prologues:                             mpost invocation.    (line 112)
+* prologues:                             mpost invocation.    (line 118)
 * prologues, and EPSF output:            mpost invocation.    (line  83)
 * proof mode:                            mf invocation.       (line  48)
 * proof sheets, of fonts:                gftodvi invocation.  (line   6)
@@ -4234,7 +4241,7 @@ Index
 * pxtoch:                                Font utilities available elsewhere.
                                                               (line  23)
 * Raichle, Bernd:                        MLTeX.               (line   6)
-* reading, additional:                   Introduction.        (line  59)
+* reading, additional:                   Introduction.        (line  58)
 * readonly directory, running TeX in:    Output file location.
                                                               (line  15)
 * reallocation of arrays:                Runtime options.     (line  36)
@@ -4251,7 +4258,7 @@ Index
 * restricted shell escapes:              Shell escapes.       (line   6)
 * right side bearing <1>:                gftype invocation.   (line  82)
 * right side bearing:                    pktype invocation.   (line  66)
-* Rokicki, Tomas:                        Introduction.        (line  41)
+* Rokicki, Tomas:                        Introduction.        (line  40)
 * run length encoded bitmaps <1>:        gftype invocation.   (line  89)
 * run length encoded bitmaps:            pktype invocation.   (line  76)
 * runtime options:                       Runtime options.     (line   6)
@@ -4263,6 +4270,7 @@ Index
 * security, and \openout:                tex invocation.      (line  51)
 * security, and output files:            tex invocation.      (line  51)
 * security, and shell escapes:           Shell escapes.       (line   6)
+* security, and write:                   mpost invocation.    (line  95)
 * shapes:                                Metafont.            (line   6)
 * sharing memory dumps:                  Hardware and memory dumps.
                                                               (line   6)
@@ -4281,13 +4289,13 @@ Index
 * sockets:                               IPC and TeX.         (line   6)
 * space-terminated filenames:            \input filenames.    (line  10)
 * Spiderweb:                             WEB.                 (line  13)
-* Stallman, Richard:                     Introduction.        (line  51)
+* Stallman, Richard:                     Introduction.        (line  50)
 * starting page <1>:                     dvitype invocation.  (line  50)
 * starting page:                         dvicopy invocation.  (line  28)
 * Steele Jr., Guy L.:                    Hardware and memory dumps.
                                                               (line  34)
 * stopping at the first error:           Common options.      (line  41)
-* strategy, overall:                     Introduction.        (line  17)
+* strategy, overall:                     Introduction.        (line  16)
 * string numbers, displaying:            pooltype invocation. (line   6)
 * string pool, writing:                  tangle invocation.   (line  16)
 * string representation:                 pooltype invocation. (line  30)
@@ -4334,7 +4342,7 @@ Index
 * TeX, input files found:                tex invocation.      (line  20)
 * TeX, invocation:                       tex invocation.      (line   6)
 * TeX, Metafont, and MetaPost:           Three programs.      (line   6)
-* TeX, Web2c implementation of:          Introduction.        (line   9)
+* TeX, Web2c implementation of:          Introduction.        (line   8)
 * tex.fmt:                               Initial TeX.         (line  15)
 * TEXBIB, search path for bib files:     bibtex invocation.   (line  18)
 * TEXEDIT:                               Editor invocation.   (line  10)
@@ -4364,11 +4372,11 @@ Index
                                                               (line  59)
 * torture tests:                         Triptrap.            (line   6)
 * translation file for TeX, specifying:  Common options.      (line  96)
-* translation from WEB to C:             Introduction.        (line  17)
+* translation from WEB to C:             Introduction.        (line  16)
 * trap Make target:                      Additional targets.  (line  41)
 * trap test:                             Triptrap.            (line   6)
 * trapman.tex:                           Triptrap.            (line   6)
-* Trickey, Howard:                       Introduction.        (line  41)
+* Trickey, Howard:                       Introduction.        (line  40)
 * trip Make target:                      Additional targets.  (line  41)
 * trip test:                             Triptrap.            (line   6)
 * tripman.tex:                           Triptrap.            (line   6)
@@ -4421,7 +4429,7 @@ Index
 * WEB programs, compiling:               tangle invocation.   (line   6)
 * WEB programs, typesetting:             weave invocation.    (line   6)
 * WEB2C, search path for TCX files:      TCX files.           (line  36)
-* Weber, Olaf:                           Introduction.        (line  41)
+* Weber, Olaf:                           Introduction.        (line  40)
 * webmac.tex:                            weave invocation.    (line  22)
 * webman.tex:                            WEB.                 (line  13)
 * whitespace, in TCX files:              TCX files.           (line  69)
@@ -4466,74 +4474,74 @@ Index
 
 Tag Table:
 Node: Top2812
-Node: Introduction3810
-Node: Installation6986
-Node: configure options9150
-Node: Compile-time options11232
-Node: Additional targets12358
-Node: Triptrap13639
-Node: Runtime options15168
-Node: Commonalities16940
-Node: Option conventions17545
-Node: Common options18769
-Node: Path searching23281
-Node: Output file location24303
-Node: Three programs25563
-Node: Initial and virgin26322
-Node: Memory dumps27422
-Node: Creating memory dumps27889
-Node: Determining the memory dump to use29150
-Node: Hardware and memory dumps30774
-Node: Editor invocation33243
-Node: \input filenames33973
-Node: TeX36966
-Node: tex invocation38112
-Node: Initial TeX45082
-Node: Formats46571
-Node: Languages and hyphenation49510
-Node: MLTeX49940
-Node: \charsubdef51435
-Node: \tracingcharsubdef53761
-Node: TCX files54336
-Node: patgen invocation59760
-Node: Shell escapes60477
-Node: IPC and TeX64041
-Node: TeX extensions64611
-Node: Metafont65743
-Node: mf invocation67031
-Node: Initial Metafont70914
-Node: Modes72667
-Node: Online Metafont graphics74923
-Node: gftodvi invocation78338
-Node: mft invocation81160
-Node: MetaPost85215
-Node: mpost invocation85977
-Node: Initial MetaPost90885
-Node: dvitomp invocation92696
-Node: BibTeX93361
-Node: bibtex invocation93722
-Node: Basic BibTeX style files96047
-Node: WEB97389
-Node: tangle invocation98597
-Node: weave invocation100720
-Node: pooltype invocation102128
-Node: DVI utilities103258
-Node: dvicopy invocation104202
-Node: dvitype invocation105500
-Node: dvitype output example107855
-Node: Font utilities110906
-Node: Font file formats112086
-Node: gftopk invocation115385
-Node: pktogf invocation116589
-Node: pktype invocation117768
-Node: gftype invocation120603
-Node: tftopl invocation125119
-Node: pltotf invocation129753
-Node: vftovp invocation130818
-Node: vptovf invocation133102
-Node: Font utilities available elsewhere134156
-Node: Legalisms136564
-Node: References138735
-Node: Index143117
+Node: Introduction3806
+Node: Installation6978
+Node: configure options9142
+Node: Compile-time options11224
+Node: Additional targets12350
+Node: Triptrap13631
+Node: Runtime options15160
+Node: Commonalities16932
+Node: Option conventions17537
+Node: Common options18761
+Node: Path searching23273
+Node: Output file location24295
+Node: Three programs25555
+Node: Initial and virgin26314
+Node: Memory dumps27414
+Node: Creating memory dumps27881
+Node: Determining the memory dump to use29142
+Node: Hardware and memory dumps30766
+Node: Editor invocation33235
+Node: \input filenames33965
+Node: TeX36958
+Node: tex invocation38104
+Node: Initial TeX45074
+Node: Formats46563
+Node: Languages and hyphenation49502
+Node: MLTeX49932
+Node: \charsubdef51427
+Node: \tracingcharsubdef53753
+Node: TCX files54328
+Node: patgen invocation59752
+Node: Shell escapes60469
+Node: IPC and TeX64033
+Node: TeX extensions64603
+Node: Metafont65735
+Node: mf invocation67023
+Node: Initial Metafont70906
+Node: Modes72659
+Node: Online Metafont graphics74915
+Node: gftodvi invocation78330
+Node: mft invocation81152
+Node: MetaPost85207
+Node: mpost invocation85969
+Node: Initial MetaPost91227
+Node: dvitomp invocation93038
+Node: BibTeX93703
+Node: bibtex invocation94064
+Node: Basic BibTeX style files96389
+Node: WEB97731
+Node: tangle invocation98939
+Node: weave invocation101062
+Node: pooltype invocation102470
+Node: DVI utilities103600
+Node: dvicopy invocation104544
+Node: dvitype invocation105842
+Node: dvitype output example108197
+Node: Font utilities111248
+Node: Font file formats112428
+Node: gftopk invocation115727
+Node: pktogf invocation116931
+Node: pktype invocation118110
+Node: gftype invocation120945
+Node: tftopl invocation125461
+Node: pltotf invocation130095
+Node: vftovp invocation131160
+Node: vptovf invocation133444
+Node: Font utilities available elsewhere134498
+Node: Legalisms136906
+Node: References139077
+Node: Index143459
 
 End Tag Table
diff --git a/Build/source/texk/web2c/doc/web2c.texi b/Build/source/texk/web2c/doc/web2c.texi
index d42b6853333..59a715243bd 100644
--- a/Build/source/texk/web2c/doc/web2c.texi
+++ b/Build/source/texk/web2c/doc/web2c.texi
@@ -11,8 +11,8 @@ The latest version is available from ftp://ftp.tug.org/tex/texinfo.tex.}
 \fi
 @end tex
 
-@set version 2009
-@set month-year February 2010
+@set version 2010
+@set month-year July 2010
 
 @c Define new indices for commands in auxiliary files, filenames, and options.
 @defcodeindex cm
@@ -2423,7 +2423,7 @@ also:
 @itemize @bullet
 @item @url{http://cm.bell-labs.com/who/hobby/MetaPost.html} (the
       MetaPost author's home page);
-@item @url{http://tug.org/metapost.html} (papers, packages, and
+@item @url{http://tug.org/metapost} (papers, packages, and
       related information).
 @end itemize
 
@@ -2534,6 +2534,16 @@ only standard PostScript fonts.  MetaPost reads the same
 @file{psfonts.map} file as Dvips, to determine PostScript fonts that
 need to be downloaded (@pxref{psfonts.map,,, dvips, Dvips}).
 
+@cindex PDF, and @code{.mps} files
+@cindex @code{.mps} files and PDF
+It is posible for pdf@TeX{} to read MetaPost output directly; this is
+in contrast to general EPSF files, which have to be converted for use
+with PDF output.  The easiest way is to name the MetaPost output files
+with the @code{.mps} extension.  Then the @LaTeX{}
+@code{\includegraphics} command, for example, will be able to read
+them, even when outputting PDF.
+
+@cindex security, and @code{write}
 MetaPost can write output files, via the @code{write} primitive; this
 opens a security hole.  @xref{tex invocation}.