TL 2012 w/o dev, 6.1.0, other version numbers

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

21 files changed, 332 insertions, 330 deletions

diff --git a/Build/source/texk/dvipsk/NEWS b/Build/source/texk/dvipsk/NEWS
index 9cb9763e6f0..ecd11e63f9c 100644
--- a/Build/source/texk/dvipsk/NEWS
+++ b/Build/source/texk/dvipsk/NEWS
@@ -3,13 +3,13 @@ This file records noteworthy changes.  (Public domain.)
    Requires Kpathsea to build.
 
 dvips 5.992 (TeX Live 2012):
-  c config file include directive.
+  `c' config file include directive.
 
-dvips 5.991 (TeX Live 2011, 5 July 2011):
+dvips 5.991 (TeX Live 2011):
   Type 1 parsing bug fixes.
   Integer overflow bug fix.
 
-dvips 5.99 (TeX Live 2010, 22 July 2010):
+dvips 5.99 (TeX Live 2010):
    Use the type1 path to search for Type 1 fonts.
    Support for Japanese pTeX.
    Numeric overflow and sprintf checks.
diff --git a/Build/source/texk/dvipsk/afm2tfm.c b/Build/source/texk/dvipsk/afm2tfm.c
index e9ef486151b..e1965c6c17e 100644
--- a/Build/source/texk/dvipsk/afm2tfm.c
+++ b/Build/source/texk/dvipsk/afm2tfm.c
@@ -1505,9 +1505,9 @@ writevpl(void)
 static void
 version(FILE *f)
 {
-  fputs ("afm2tfm(k) (dvips(k) 5.991) 8.1\n", f);
+  fputs ("afm2tfm(k) (dvips(k) 5.992) 8.2\n", f);
   fprintf (f, "%s\n", kpathsea_version_string);
-  fputs ("Copyright 2011 Radical Eye Software.\n\
+  fputs ("Copyright 2012 Radical Eye Software.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License\n\
 and the Dvips copyright.\n\
diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure
index 71e502ef607..06fb14510c9 100755
--- a/Build/source/texk/dvipsk/configure
+++ b/Build/source/texk/dvipsk/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvipsk 5.991.
+# Generated by GNU Autoconf 2.69 for dvipsk 5.992.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvipsk'
 PACKAGE_TARNAME='dvipsk'
-PACKAGE_VERSION='5.991'
-PACKAGE_STRING='dvipsk 5.991'
+PACKAGE_VERSION='5.992'
+PACKAGE_STRING='dvipsk 5.992'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1322,7 +1322,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvipsk 5.991 to adapt to many kinds of systems.
+\`configure' configures dvipsk 5.992 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1392,7 +1392,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvipsk 5.991:";;
+     short | recursive ) echo "Configuration of dvipsk 5.992:";;
    esac
   cat <<\_ACEOF
 
@@ -1507,7 +1507,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvipsk configure 5.991
+dvipsk configure 5.992
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2170,7 +2170,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvipsk $as_me 5.991, which was
+It was created by dvipsk $as_me 5.992, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7568,7 +7568,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvipsk'
- VERSION='5.991'
+ VERSION='5.992'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13298,7 +13298,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvipsk config.lt 5.991
+dvipsk config.lt 5.992
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -14888,7 +14888,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvipsk $as_me 5.991, which was
+This file was extended by dvipsk $as_me 5.992, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14954,7 +14954,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvipsk config.status 5.991
+dvipsk config.status 5.992
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvipsk/configure.ac b/Build/source/texk/dvipsk/configure.ac
index 2d20f9fd9ee..55c86c54ed5 100644
--- a/Build/source/texk/dvipsk/configure.ac
+++ b/Build/source/texk/dvipsk/configure.ac
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([dvipsk], [5.991], [tex-k@tug.org])
+AC_INIT([dvipsk], [5.992], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([dvips.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/dvipsk/dvips.c b/Build/source/texk/dvipsk/dvips.c
index 918d3ed3582..46f736e64b7 100644
--- a/Build/source/texk/dvipsk/dvips.c
+++ b/Build/source/texk/dvipsk/dvips.c
@@ -647,7 +647,7 @@ main(int argc, char **argv)
       } else if (strcmp (argv[1], "--version") == 0) {
         puts (BANNER);
         puts (kpathsea_version_string);
-        puts ("Copyright 2011 Radical Eye Software.\n\
+        puts ("Copyright 2012 Radical Eye Software.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License\n\
 and the Dvips copyright.\n\
diff --git a/Build/source/texk/dvipsk/dvips.h b/Build/source/texk/dvipsk/dvips.h
index 2a2114cb094..354a7625d7d 100644
--- a/Build/source/texk/dvipsk/dvips.h
+++ b/Build/source/texk/dvipsk/dvips.h
@@ -1,6 +1,6 @@
 /*   $Id$
  *   This is dvips, a freely redistributable PostScript driver
- *   for dvi files.  It is (C) Copyright 1986-2011 by Tomas Rokicki.
+ *   for dvi files.  It is (C) Copyright 1986-2012 by Tomas Rokicki.
  *   You may freely use, modify and/or distribute this program or any
  *   portion thereof.
  */
@@ -15,7 +15,7 @@
 #define CD_IDX(i)  ((i>=MAX_2BYTES_CODE ? MAX_2BYTES_CODE : i))
 
 #define BANNER \
-"This is dvips(k) 5.991 Copyright 2011 Radical Eye Software"
+"This is dvips(k) 5.992 Copyright 2012 Radical Eye Software"
 #define BANNER2 "(www.radicaleye.com)"
 #ifdef KPATHSEA
 #include "config.h"
diff --git a/Build/source/texk/dvipsk/dvips.info b/Build/source/texk/dvipsk/dvips.info
index 1deeb445536..fd8b2fac5ee 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.991 (April 2011), a program to
+This manual documents Dvips version 5.992 (May 2012), 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.991 (April 2011), a program to
+This manual documents Dvips version 5.992 (May 2012), a program to
 translate a DVI file into PostScript.  You may freely use, modify
 and/or distribute this file.
 
@@ -4721,82 +4721,82 @@ Index
 
 
 Tag Table:
-Node: Top561
-Node: Why Dvips1307
-Node: Installation4755
-Node: config.ps installation5776
-Node: PostScript font installation8400
-Node: Ghostscript installation11274
-Node: Diagnosing problems12371
-Node: Debug options13466
-Node: No output14492
-Node: Small or inverted15960
-Node: Printer errors16679
-Node: Long documents fail18011
-Node: Including graphics fails18352
-Node: Invoking Dvips19590
-Node: Basic usage20181
-Node: Command-line options21209
-Node: Option summary21658
-Node: Option details23854
-Node: Environment variables43218
-Node: Config files46177
-Node: Configuration file searching46860
-Node: Configuration file commands50160
-Node: Paper size and landscape57369
-Node: papersize special58967
-Node: Config file paper sizes60376
-Node: Paper trays64531
-Node: Interaction with PostScript65865
-Node: PostScript figures66518
-Node: Bounding box67244
-Node: \includegraphics70615
-Node: EPSF macros72906
-Node: EPSF scaling74876
-Node: EPSF clipping77446
-Node: psfile special78088
-Node: Dynamic creation of graphics80481
-Node: Fonts in figures81799
-Node: Header files83459
-Node: Including headers from TeX84665
-Node: Including headers from the command line86699
-Node: Headers and memory usage87799
-Node: Literal PS88509
-Node: " special89091
-Node: ps special89832
-Node: Literal headers91330
-Node: PostScript hooks92045
-Node: Literal examples94135
-Node: Hypertext95587
-Node: Hypertext caveats97145
-Node: Hypertext specials101542
-Node: PostScript fonts104176
-Node: Font concepts105292
-Node: Metric files106459
-Node: Glyph files109285
-Node: Virtual fonts111641
-Node: Encodings113531
-Node: PostScript typesetting115934
-Node: Making a font available119016
-Node: Invoking afm2tfm124046
-Node: Changing font encodings125016
-Node: Changing TeX encodings125806
-Node: Changing PostScript encodings126906
-Node: Changing both encodings128250
-Node: Reencoding with Afm2tfm128923
-Node: Encoding file format132027
-Node: Special font effects136230
-Node: Afm2tfm options138493
-Node: psfonts.map141478
-Node: Color146210
-Node: Color macro files147254
-Node: User-definable colors150452
-Node: Color subtleties151727
-Node: Ted Turner153378
-Node: Color device configuration154603
-Node: Color support details157045
-Node: Color specifications157423
-Node: Color specials158826
-Node: Index160955
+Node: Top559
+Node: Why Dvips1303
+Node: Installation4751
+Node: config.ps installation5772
+Node: PostScript font installation8396
+Node: Ghostscript installation11270
+Node: Diagnosing problems12367
+Node: Debug options13462
+Node: No output14488
+Node: Small or inverted15956
+Node: Printer errors16675
+Node: Long documents fail18007
+Node: Including graphics fails18348
+Node: Invoking Dvips19586
+Node: Basic usage20177
+Node: Command-line options21205
+Node: Option summary21654
+Node: Option details23850
+Node: Environment variables43214
+Node: Config files46173
+Node: Configuration file searching46856
+Node: Configuration file commands50156
+Node: Paper size and landscape57365
+Node: papersize special58963
+Node: Config file paper sizes60372
+Node: Paper trays64527
+Node: Interaction with PostScript65861
+Node: PostScript figures66514
+Node: Bounding box67240
+Node: \includegraphics70611
+Node: EPSF macros72902
+Node: EPSF scaling74872
+Node: EPSF clipping77442
+Node: psfile special78084
+Node: Dynamic creation of graphics80477
+Node: Fonts in figures81795
+Node: Header files83455
+Node: Including headers from TeX84661
+Node: Including headers from the command line86695
+Node: Headers and memory usage87795
+Node: Literal PS88505
+Node: " special89087
+Node: ps special89828
+Node: Literal headers91326
+Node: PostScript hooks92041
+Node: Literal examples94131
+Node: Hypertext95583
+Node: Hypertext caveats97141
+Node: Hypertext specials101538
+Node: PostScript fonts104172
+Node: Font concepts105288
+Node: Metric files106455
+Node: Glyph files109281
+Node: Virtual fonts111637
+Node: Encodings113527
+Node: PostScript typesetting115930
+Node: Making a font available119012
+Node: Invoking afm2tfm124042
+Node: Changing font encodings125012
+Node: Changing TeX encodings125802
+Node: Changing PostScript encodings126902
+Node: Changing both encodings128246
+Node: Reencoding with Afm2tfm128919
+Node: Encoding file format132023
+Node: Special font effects136226
+Node: Afm2tfm options138489
+Node: psfonts.map141474
+Node: Color146206
+Node: Color macro files147250
+Node: User-definable colors150448
+Node: Color subtleties151723
+Node: Ted Turner153374
+Node: Color device configuration154599
+Node: Color support details157041
+Node: Color specifications157419
+Node: Color specials158822
+Node: Index160951
 
 End Tag Table
diff --git a/Build/source/texk/dvipsk/dvips.texi b/Build/source/texk/dvipsk/dvips.texi
index 782412ecc79..382aeaefb4d 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.991
-@set month-year April 2011
+@set version 5.992
+@set month-year May 2012
 
 @copying
 This manual documents Dvips version @value{version}
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 9e249e3f07b..7d2187755ac 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Kpathsea 6.1.0dev.
+# Generated by GNU Autoconf 2.69 for Kpathsea 6.1.0.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Kpathsea'
 PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.1.0dev'
-PACKAGE_STRING='Kpathsea 6.1.0dev'
+PACKAGE_VERSION='6.1.0'
+PACKAGE_STRING='Kpathsea 6.1.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Kpathsea 6.1.0dev to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1398,7 +1398,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Kpathsea 6.1.0dev:";;
+     short | recursive ) echo "Configuration of Kpathsea 6.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1517,7 +1517,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Kpathsea configure 6.1.0dev
+Kpathsea configure 6.1.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2043,7 +2043,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Kpathsea $as_me 6.1.0dev, which was
+It was created by Kpathsea $as_me 6.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2424,16 +2424,16 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-KPSEVERSION=6.1.0dev
+KPSEVERSION=6.1.0
 
-$as_echo "#define KPSEVERSION \"kpathsea version 6.1.0dev\"" >>confdefs.h
+$as_echo "#define KPSEVERSION \"kpathsea version 6.1.0\"" >>confdefs.h
 
 
 KPSE_LT_VERSINFO=7:0:1
 
 
 
- WEB2CVERSION=2012/dev
+ WEB2CVERSION=2012
 
 
 am__api_version='1.12'
@@ -7453,7 +7453,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='kpathsea'
- VERSION='6.1.0dev'
+ VERSION='6.1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13581,7 +13581,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Kpathsea $as_me 6.1.0dev, which was
+This file was extended by Kpathsea $as_me 6.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13647,7 +13647,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Kpathsea config.status 6.1.0dev
+Kpathsea config.status 6.1.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info
index dd612bbc058..54e179d0f3d 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.info
+++ b/Build/source/texk/kpathsea/doc/kpathsea.info
@@ -4,7 +4,7 @@ makeinfo version 4.13 from ../../../../texk/kpathsea/doc/kpathsea.texi.
 This file documents the Kpathsea library for path searching.
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2007, 2008, 2009, 2010, 2011 Karl Berry & Olaf Weber.
+2005, 2007, 2008, 2009, 2010, 2011, 2012 Karl Berry & Olaf Weber.
 
    Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -39,8 +39,8 @@ Kpathsea library
 ****************
 
 This manual documents how to install and use the Kpathsea library for
-filename lookup.  It corresponds to version 6.0.1, released in
-September 2011.
+filename lookup.  It corresponds to version 6.1.0, released in
+May 2012.
 
 * Menu:
 
@@ -60,8 +60,8 @@ File: kpathsea.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up:
 1 Introduction
 **************
 
-This manual corresponds to version 6.0.1 of the Kpathsea library,
-released in September 2011.
+This manual corresponds to version 6.1.0 of the Kpathsea library,
+released in May 2012.
 
    The library's fundamental purpose is to return a filename from a
 list of directories specified by the user, similar to what shells do
@@ -4681,83 +4681,83 @@ Index
 
 
 Tag Table:
-Node: Top1621
+Node: Top1627
 Node: Introduction2269
-Node: History4096
-Node: Installation8188
-Node: Simple installation8978
-Node: Custom installation12561
-Node: Disk space13735
-Node: Kpathsea application distributions14619
-Node: Changing search paths15734
-Node: Default path features16916
-Node: Default path generation18999
-Node: Running configure20442
-Node: configure shells21493
-Node: configure options22545
-Node: configure environment24052
-Node: configure scenarios25854
-Node: Shared library27440
-Node: Running make28454
-Node: Installing files30501
-Node: Cleaning up32448
-Node: Filename database generation33496
-Node: mktex scripts34063
-Node: mktex configuration35340
-Node: mktex script names41159
-Node: mktex script arguments42550
-Node: Installation testing43436
-Node: Security43800
-Node: TeX directory structure46367
-Node: unixtex.ftp50789
-Node: Reporting bugs52123
-Node: Bug checklist52858
-Node: Mailing lists56555
-Node: Debugging57764
-Node: Logging62842
-Node: Common problems64712
-Node: Unable to find files65543
-Node: Slow path searching67954
-Node: Unable to generate fonts69331
-Node: TeX or Metafont failing71840
-Node: Empty Makefiles73719
-Node: XtStrings74956
-Node: dlopen75792
-Node: ShellWidgetClass76610
-Node: Pointer combination warnings78242
-Node: Path searching78631
-Node: Searching overview79278
-Node: Path sources82674
-Node: Config files83745
-Node: Path expansion87672
-Node: Default expansion88621
-Node: Variable expansion90691
-Node: Tilde expansion92094
-Node: Brace expansion93074
-Node: KPSE_DOT expansion93999
-Node: Subdirectory expansion94512
-Node: Filename database96863
-Node: ls-R97917
-Node: Filename aliases100811
-Node: Database format101989
-Node: Invoking kpsewhich103002
-Node: Path searching options103948
-Node: Specially-recognized files112165
-Node: Auxiliary tasks113521
-Node: Standard options115346
-Node: TeX support115702
-Node: Supported file formats116993
-Node: File lookup124547
-Node: Glyph lookup126296
-Node: Basic glyph lookup127420
-Node: Fontmap128299
-Node: Fallback font130916
-Node: Suppressing warnings131829
-Node: Programming132934
-Node: Programming overview133447
-Node: Calling sequence136141
-Node: Program-specific files142664
-Node: Programming with config files143687
-Node: Index144999
+Node: History4090
+Node: Installation8182
+Node: Simple installation8972
+Node: Custom installation12555
+Node: Disk space13729
+Node: Kpathsea application distributions14613
+Node: Changing search paths15728
+Node: Default path features16910
+Node: Default path generation18993
+Node: Running configure20436
+Node: configure shells21487
+Node: configure options22539
+Node: configure environment24046
+Node: configure scenarios25848
+Node: Shared library27434
+Node: Running make28448
+Node: Installing files30495
+Node: Cleaning up32442
+Node: Filename database generation33490
+Node: mktex scripts34057
+Node: mktex configuration35334
+Node: mktex script names41153
+Node: mktex script arguments42544
+Node: Installation testing43430
+Node: Security43794
+Node: TeX directory structure46361
+Node: unixtex.ftp50783
+Node: Reporting bugs52117
+Node: Bug checklist52852
+Node: Mailing lists56549
+Node: Debugging57758
+Node: Logging62836
+Node: Common problems64706
+Node: Unable to find files65537
+Node: Slow path searching67948
+Node: Unable to generate fonts69325
+Node: TeX or Metafont failing71834
+Node: Empty Makefiles73713
+Node: XtStrings74950
+Node: dlopen75786
+Node: ShellWidgetClass76604
+Node: Pointer combination warnings78236
+Node: Path searching78625
+Node: Searching overview79272
+Node: Path sources82668
+Node: Config files83739
+Node: Path expansion87666
+Node: Default expansion88615
+Node: Variable expansion90685
+Node: Tilde expansion92088
+Node: Brace expansion93068
+Node: KPSE_DOT expansion93993
+Node: Subdirectory expansion94506
+Node: Filename database96857
+Node: ls-R97911
+Node: Filename aliases100805
+Node: Database format101983
+Node: Invoking kpsewhich102996
+Node: Path searching options103942
+Node: Specially-recognized files112159
+Node: Auxiliary tasks113515
+Node: Standard options115340
+Node: TeX support115696
+Node: Supported file formats116987
+Node: File lookup124541
+Node: Glyph lookup126290
+Node: Basic glyph lookup127414
+Node: Fontmap128293
+Node: Fallback font130910
+Node: Suppressing warnings131823
+Node: Programming132928
+Node: Programming overview133441
+Node: Calling sequence136135
+Node: Program-specific files142658
+Node: Programming with config files143681
+Node: Index144993
 
 End Tag Table
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.texi b/Build/source/texk/kpathsea/doc/kpathsea.texi
index 1ade291e716..b8869cc18ed 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.texi
+++ b/Build/source/texk/kpathsea/doc/kpathsea.texi
@@ -2,14 +2,14 @@
 @setfilename kpathsea.info
 @settitle Kpathsea: A library for path searching
 
-@set version 6.0.1
-@set month-year September 2011
+@set version 6.1.0
+@set month-year May 2012
 
 @copying
 This file documents the Kpathsea library for path searching.
 
 Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2007, 2008, 2009, 2010, 2011 Karl Berry & Olaf Weber.
+2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012 Karl Berry & Olaf Weber.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c
index e0045d36080..5b1abbd65d2 100644
--- a/Build/source/texk/kpathsea/kpsewhich.c
+++ b/Build/source/texk/kpathsea/kpsewhich.c
@@ -1,7 +1,7 @@
 /* kpsewhich -- standalone path lookup and variable expansion for Kpathsea.
    Ideas from Thomas Esser, Pierre MacKay, and many others.
 
-   Copyright 1995-2011 Karl Berry & Olaf Weber.
+   Copyright 1995-2012 Karl Berry & Olaf Weber.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index d5f9a179480..13039058221 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -4,8 +4,8 @@
 % If you modify this original file, YOUR CHANGES WILL BE LOST when it is
 % updated.  Instead, put your changes -- and only your changes, not an
 % entire copy of the full texmf.cnf! -- in ../../texmf.cnf.  That is, if
-% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2011/texmf.cnf.
+% this file is installed in /some/path/to/texlive/2012/texmf/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2012/texmf.cnf.
 % 
 % What follows is a super-summary of what this .cnf file can
 % contain. Please read the Kpathsea manual for more information.
@@ -76,10 +76,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
 TEXMFHOME = ~/texmf
 
 % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2011/texmf-var
+TEXMFVAR = ~/.texlive2012/texmf-var
 
 % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2011/texmf-config
+TEXMFCONFIG = ~/.texlive2012/texmf-config
 
 % List all the texmf trees.
 %
diff --git a/Build/source/texk/kpathsea/version.ac b/Build/source/texk/kpathsea/version.ac
index 627f3264b75..964e585756b 100644
--- a/Build/source/texk/kpathsea/version.ac
+++ b/Build/source/texk/kpathsea/version.ac
@@ -19,4 +19,4 @@ dnl     append "dev", to distinguish binaries built between releases.
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current kpathsea version
-m4_define([kpse_version], [6.1.0dev])
+m4_define([kpse_version], [6.1.0])
diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure
index bef80b7dd08..935032f1815 100755
--- a/Build/source/texk/makeindexk/configure
+++ b/Build/source/texk/makeindexk/configure
@@ -12599,7 +12599,7 @@ ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
 
 
 
-$as_echo "#define TEX_LIVE_VERSION \"2012/dev\"" >>confdefs.h
+$as_echo "#define TEX_LIVE_VERSION \"2012\"" >>confdefs.h
 
 
 for ac_header in ctype.h types.h locale.h
diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure
index ee80b501cea..d8f0a0ca423 100755
--- a/Build/source/texk/ptexenc/configure
+++ b/Build/source/texk/ptexenc/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ptexenc 1.3.0dev.
+# Generated by GNU Autoconf 2.69 for ptexenc 1.3.0.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ptexenc'
 PACKAGE_TARNAME='ptexenc'
-PACKAGE_VERSION='1.3.0dev'
-PACKAGE_STRING='ptexenc 1.3.0dev'
+PACKAGE_VERSION='1.3.0'
+PACKAGE_STRING='ptexenc 1.3.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1323,7 +1323,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ptexenc 1.3.0dev to adapt to many kinds of systems.
+\`configure' configures ptexenc 1.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1393,7 +1393,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ptexenc 1.3.0dev:";;
+     short | recursive ) echo "Configuration of ptexenc 1.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1509,7 +1509,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ptexenc configure 1.3.0dev
+ptexenc configure 1.3.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1989,7 +1989,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ptexenc $as_me 1.3.0dev, which was
+It was created by ptexenc $as_me 1.3.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2370,9 +2370,9 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-PTEXENCVERSION=1.3.0dev
+PTEXENCVERSION=1.3.0
 
-$as_echo "#define PTEXENCVERSION \"ptexenc version 1.3.0dev\"" >>confdefs.h
+$as_echo "#define PTEXENCVERSION \"ptexenc version 1.3.0\"" >>confdefs.h
 
 
 PTEXENC_LT_VERSINFO=4:0:3
@@ -7395,7 +7395,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ptexenc'
- VERSION='1.3.0dev'
+ VERSION='1.3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13026,7 +13026,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-ptexenc config.lt 1.3.0dev
+ptexenc config.lt 1.3.0
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -14753,7 +14753,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ptexenc $as_me 1.3.0dev, which was
+This file was extended by ptexenc $as_me 1.3.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14819,7 +14819,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ptexenc config.status 1.3.0dev
+ptexenc config.status 1.3.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/ptexenc/version.ac b/Build/source/texk/ptexenc/version.ac
index 2f11af4ad18..13ac3b94bc0 100644
--- a/Build/source/texk/ptexenc/version.ac
+++ b/Build/source/texk/ptexenc/version.ac
@@ -19,4 +19,4 @@ dnl     append "dev", to distinguish binaries built between releases.
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current ptexenc version
-m4_define([ptexenc_version], [1.3.0dev])
+m4_define([ptexenc_version], [1.3.0])
diff --git a/Build/source/texk/web2c/NEWS b/Build/source/texk/web2c/NEWS
index cd4b47d0c37..8203e4ba07e 100644
--- a/Build/source/texk/web2c/NEWS
+++ b/Build/source/texk/web2c/NEWS
@@ -1,6 +1,9 @@
 This file records noteworthy changes.  (Public domain.)
 
-2011 (for TeX Collection 2011)
+2012 (for TeX Collection 2012)
+* Ditto.
+
+2011 (for TeX Collection 2011, 5 July 2011)
 * Doc changes and bug fixes.
 
 2010 (for TeX Collection 2010, 4 June 2010)
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 741be30eccc..3fadcf1574f 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C 2012/dev.
+# Generated by GNU Autoconf 2.69 for Web2C 2012.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Web2C'
 PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2012/dev'
-PACKAGE_STRING='Web2C 2012/dev'
+PACKAGE_VERSION='2012'
+PACKAGE_STRING='Web2C 2012'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1538,7 +1538,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Web2C 2012/dev to adapt to many kinds of systems.
+\`configure' configures Web2C 2012 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1612,7 +1612,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C 2012/dev:";;
+     short | recursive ) echo "Configuration of Web2C 2012:";;
    esac
   cat <<\_ACEOF
 
@@ -1814,7 +1814,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C configure 2012/dev
+Web2C configure 2012
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2727,7 +2727,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Web2C $as_me 2012/dev, which was
+It was created by Web2C $as_me 2012, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3108,7 +3108,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-WEB2CVERSION=2012/dev
+WEB2CVERSION=2012
 
 
 am__api_version='1.12'
@@ -8128,7 +8128,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='web2c'
- VERSION='2012/dev'
+ VERSION='2012'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20943,7 +20943,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Web2C config.lt 2012/dev
+Web2C config.lt 2012
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -23753,7 +23753,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Web2C $as_me 2012/dev, which was
+This file was extended by Web2C $as_me 2012, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23819,7 +23819,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Web2C config.status 2012/dev
+Web2C config.status 2012
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/web2c/doc/web2c.info b/Build/source/texk/web2c/doc/web2c.info
index cd6c23e5e81..1e5bf0428d3 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 2011, released in August 2011.
+corresponds to Web2c version 2012, released in May 2012.
 
 * Menu:
 
@@ -83,8 +83,7 @@ File: web2c.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up: Top
 1 Introduction
 **************
 
-This manual corresponds to version 2011 of Web2c, released in August
-2011.
+This manual corresponds to version 2012 of Web2c, released in May 2012.
 
    "Web2c" is the name of a TeX implementation, originally for Unix,
 but now also running under DOS, Amiga, and other operating systems. By
@@ -3647,7 +3646,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)
@@ -3690,7 +3689,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)
@@ -3706,7 +3705,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)
@@ -3775,7 +3774,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.
@@ -3889,7 +3888,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)
@@ -3926,12 +3925,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.
@@ -3947,7 +3946,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)
@@ -3981,7 +3980,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  59)
 * KRN property:                          tftopl invocation.   (line 102)
 * label font:                            gftodvi invocation.  (line  36)
@@ -3995,7 +3994,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)
@@ -4022,7 +4021,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.
@@ -4085,8 +4084,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)
@@ -4211,7 +4210,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)
@@ -4228,7 +4227,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)
@@ -4259,13 +4258,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)
@@ -4312,7 +4311,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)
@@ -4342,11 +4341,11 @@ Index
                                                               (line  59)
 * torture tests:                         Triptrap.            (line   6)
 * translation file for TeX, specifying:  Common options.      (line  98)
-* 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)
@@ -4398,7 +4397,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)
@@ -4443,74 +4442,74 @@ Index
 
 Tag Table:
 Node: Top2812
-Node: Introduction3808
-Node: Installation6982
-Node: configure options9146
-Node: Compile-time options11228
-Node: Additional targets12354
-Node: Triptrap13635
-Node: Runtime options15164
-Node: Commonalities16936
-Node: Option conventions17541
-Node: Common options18765
-Node: Path searching23172
-Node: Output file location24194
-Node: Three programs25519
-Node: Initial and virgin26273
-Node: Memory dumps27212
-Node: Creating memory dumps27668
-Node: Determining the memory dump to use28879
-Node: Hardware and memory dumps30466
-Node: Editor invocation32924
-Node: \input filenames33790
-Node: TeX36783
-Node: tex invocation37935
-Node: Initial TeX44905
-Node: Formats46394
-Node: Languages and hyphenation49333
-Node: MLTeX49763
-Node: \charsubdef51258
-Node: \tracingcharsubdef53584
-Node: TCX files54159
-Node: patgen invocation59583
-Node: Shell escapes60300
-Node: IPC and TeX63864
-Node: TeX extensions64434
-Node: Metafont65566
-Node: mf invocation66854
-Node: Initial Metafont70737
-Node: Modes72490
-Node: Online Metafont graphics74746
-Node: gftodvi invocation78161
-Node: mft invocation80994
-Node: MetaPost85049
-Node: mpost invocation85811
-Node: Initial MetaPost91069
-Node: dvitomp invocation91991
-Node: BibTeX92656
-Node: bibtex invocation93017
-Node: Basic BibTeX style files95342
-Node: WEB96684
-Node: tangle invocation97892
-Node: weave invocation100015
-Node: pooltype invocation101423
-Node: DVI utilities102553
-Node: dvicopy invocation103497
-Node: dvitype invocation104795
-Node: dvitype output example107150
-Node: Font utilities110201
-Node: Font file formats111381
-Node: gftopk invocation114680
-Node: pktogf invocation115884
-Node: pktype invocation117063
-Node: gftype invocation119898
-Node: tftopl invocation124414
-Node: pltotf invocation129048
-Node: vftovp invocation130113
-Node: vptovf invocation132397
-Node: Font utilities available elsewhere133451
-Node: Legalisms135859
-Node: References138030
-Node: Index142602
+Node: Introduction3805
+Node: Installation6976
+Node: configure options9140
+Node: Compile-time options11222
+Node: Additional targets12348
+Node: Triptrap13629
+Node: Runtime options15158
+Node: Commonalities16930
+Node: Option conventions17535
+Node: Common options18759
+Node: Path searching23166
+Node: Output file location24188
+Node: Three programs25513
+Node: Initial and virgin26267
+Node: Memory dumps27206
+Node: Creating memory dumps27662
+Node: Determining the memory dump to use28873
+Node: Hardware and memory dumps30460
+Node: Editor invocation32918
+Node: \input filenames33784
+Node: TeX36777
+Node: tex invocation37929
+Node: Initial TeX44899
+Node: Formats46388
+Node: Languages and hyphenation49327
+Node: MLTeX49757
+Node: \charsubdef51252
+Node: \tracingcharsubdef53578
+Node: TCX files54153
+Node: patgen invocation59577
+Node: Shell escapes60294
+Node: IPC and TeX63858
+Node: TeX extensions64428
+Node: Metafont65560
+Node: mf invocation66848
+Node: Initial Metafont70731
+Node: Modes72484
+Node: Online Metafont graphics74740
+Node: gftodvi invocation78155
+Node: mft invocation80988
+Node: MetaPost85043
+Node: mpost invocation85805
+Node: Initial MetaPost91063
+Node: dvitomp invocation91985
+Node: BibTeX92650
+Node: bibtex invocation93011
+Node: Basic BibTeX style files95336
+Node: WEB96678
+Node: tangle invocation97886
+Node: weave invocation100009
+Node: pooltype invocation101417
+Node: DVI utilities102547
+Node: dvicopy invocation103491
+Node: dvitype invocation104789
+Node: dvitype output example107144
+Node: Font utilities110195
+Node: Font file formats111375
+Node: gftopk invocation114674
+Node: pktogf invocation115878
+Node: pktype invocation117057
+Node: gftype invocation119892
+Node: tftopl invocation124408
+Node: pltotf invocation129042
+Node: vftovp invocation130107
+Node: vptovf invocation132391
+Node: Font utilities available elsewhere133445
+Node: Legalisms135853
+Node: References138024
+Node: Index142596
 
 End Tag Table
diff --git a/Build/source/texk/web2c/doc/web2c.texi b/Build/source/texk/web2c/doc/web2c.texi
index c3351012439..bbbd3bb6e8b 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 2011
-@set month-year August 2011
+@set version 2012
+@set month-year May 2012
 
 @c Define new indices for commands in auxiliary files, filenames, and options.
 @defcodeindex cm