Update tlbuild.info

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

6 files changed, 323 insertions, 319 deletions

diff --git a/Build/source/README.4layout b/Build/source/README.4layout
index 9fb8774dbd3..4a7ced88113 100644
--- a/Build/source/README.4layout
+++ b/Build/source/README.4layout
@@ -197,13 +197,13 @@ library.  E.g., for 'libs/libpng':
      Provide the configure option '--with-system-libpng'.  Set and
      'AC_SUBST' 'make' variables for modules using this library (either
      an installed version or from the TeX Live tree): 'LIBPNG_INCLUDES'
-     for use in CPPFLAGS, 'LIBPNG_LIBS' for use in LDADD,
+     for use in 'CPPFLAGS', 'LIBPNG_LIBS' for use in 'LDADD',
      'LIBPNG_DEPEND' for use as dependency, and 'LIBPNG_RULE' defining
      'make' rules to rebuild the library.
 
  -- Macro: KPSE_ADD_FLAGS (NAME)
-     Temporarily extend CPPFLAGS and LIBS with the values required for
-     the library module 'NAME'.
+     Temporarily extend 'CPPFLAGS' and 'LIBS' with the values required
+     for the library module 'NAME'.
 
  -- Macro: KPSE_RESTORE_FLAGS
      Restore 'CPPFLAGS' and 'LIBS' to their original values.
@@ -354,11 +354,11 @@ installed by 'make install' together with the programs.  They are,
 however, not part of the TL DVD as distributed by TeX user groups, and
 have never been officially released for standalone use.
 
-   It is possible, and possibly even useful for distro builds (*note
+   It is possible, and perhaps even useful for distro builds (*note
 Distro builds::), to specify the configure option
-'--with-system-kpathsea' in order to use a system version of the library
-and it may then be necessary to specify '--with-kpathsea-includes'
-and/or '--with-kpathsea-libdir'.
+'--with-system-kpathsea' in order to use a system version of the
+library.  Programs outside the TL tree should use 'pkg-config' for the
+required flags.
 
    In addition to 'ac/withenable.ac' and 'ac/kpathsea.ac' there is a
 third fragment 'ac/mktex.ac' included by both 'ac/withenable.ac' and
diff --git a/Build/source/README.5configure b/Build/source/README.5configure
index 00a1309ee9e..9c71de33334 100644
--- a/Build/source/README.5configure
+++ b/Build/source/README.5configure
@@ -238,8 +238,8 @@ native TeX Live build, defaults are again defined in
 7.2.4 Configure options for 'texk/bibtex-x'
 -------------------------------------------
 
-The former programs 'bibtex8' and 'bibtexu' have been merged into the
-module 'bibtex-x' (extended BibTeX).
+The programs 'bibtex8' and 'bibtexu' have been merged into the module
+'bibtex-x' (extended BibTeX).
 
 '--disable-bibtex8'
 Do not build the 'bibtex8' program.
@@ -258,7 +258,7 @@ created by default.  In addition, 'dvipdfm' is created as a symlink to
 'dvipdfmx', with backward-compatible (very slightly different) behavior.
 
 '--disable-dvipdfmx'
-Do not build the 'dvipdfmx' program or create the 'dvipdfm' symlink.
+Do not build the 'dvipdfmx' program with the 'dvipdfm' symlink.
 
 '--disable-xdvipdfmx'
 Do not build the 'xdvipdfmx' program.
diff --git a/Build/source/doc/ChangeLog b/Build/source/doc/ChangeLog
index 55cc82e0c68..7c5c7c1e183 100644
--- a/Build/source/doc/ChangeLog
+++ b/Build/source/doc/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* build-tools.txt: Using bison 3.0.4 and libtool 2.4.6.
+	* tlbuild.texi: Minor updates.
+
 2015-01-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* build-tools.txt: Using bison 3.0.3 and libtool 2.4.5.
diff --git a/Build/source/doc/tlbuild.info b/Build/source/doc/tlbuild.info
index 5355561f1ad..711214b7d6c 100644
--- a/Build/source/doc/tlbuild.info
+++ b/Build/source/doc/tlbuild.info
@@ -754,13 +754,13 @@ library.  E.g., for 'libs/libpng':
      Provide the configure option '--with-system-libpng'.  Set and
      'AC_SUBST' 'make' variables for modules using this library (either
      an installed version or from the TeX Live tree): 'LIBPNG_INCLUDES'
-     for use in CPPFLAGS, 'LIBPNG_LIBS' for use in LDADD,
+     for use in 'CPPFLAGS', 'LIBPNG_LIBS' for use in 'LDADD',
      'LIBPNG_DEPEND' for use as dependency, and 'LIBPNG_RULE' defining
      'make' rules to rebuild the library.
 
  -- Macro: KPSE_ADD_FLAGS (NAME)
-     Temporarily extend CPPFLAGS and LIBS with the values required for
-     the library module 'NAME'.
+     Temporarily extend 'CPPFLAGS' and 'LIBS' with the values required
+     for the library module 'NAME'.
 
  -- Macro: KPSE_RESTORE_FLAGS
      Restore 'CPPFLAGS' and 'LIBS' to their original values.
@@ -936,11 +936,11 @@ installed by 'make install' together with the programs.  They are,
 however, not part of the TL DVD as distributed by TeX user groups, and
 have never been officially released for standalone use.
 
-   It is possible, and possibly even useful for distro builds (*note
+   It is possible, and perhaps even useful for distro builds (*note
 Distro builds::), to specify the configure option
-'--with-system-kpathsea' in order to use a system version of the library
-and it may then be necessary to specify '--with-kpathsea-includes'
-and/or '--with-kpathsea-libdir'.
+'--with-system-kpathsea' in order to use a system version of the
+library.  Programs outside the TL tree should use 'pkg-config' for the
+required flags.
 
    In addition to 'ac/withenable.ac' and 'ac/kpathsea.ac' there is a
 third fragment 'ac/mktex.ac' included by both 'ac/withenable.ac' and
@@ -1478,8 +1478,8 @@ File: tlbuild.info,  Node: Configure options for 'texk/bibtex-x',  Next: Configu
 7.2.4 Configure options for 'texk/bibtex-x'
 -------------------------------------------
 
-The former programs 'bibtex8' and 'bibtexu' have been merged into the
-module 'bibtex-x' (extended BibTeX).
+The programs 'bibtex8' and 'bibtexu' have been merged into the module
+'bibtex-x' (extended BibTeX).
 
 '--disable-bibtex8'
 Do not build the 'bibtex8' program.
@@ -1501,7 +1501,7 @@ created by default.  In addition, 'dvipdfm' is created as a symlink to
 'dvipdfmx', with backward-compatible (very slightly different) behavior.
 
 '--disable-dvipdfmx'
-Do not build the 'dvipdfmx' program or create the 'dvipdfm' symlink.
+Do not build the 'dvipdfmx' program with the 'dvipdfm' symlink.
 
 '--disable-xdvipdfmx'
 Do not build the 'xdvipdfmx' program.
@@ -4905,290 +4905,290 @@ Node: Macros for programs27277
 Node: Macros for compilers28089
 Node: Macros for libraries29523
 Node: Macros for library and header flags29949
-Node: Macros for Windows31821
-Node: Library modules33398
-Node: 'png' library33895
-Node: 'zlib' library36188
-Node: 'freetype' library36709
-Node: 'kpathsea' library37243
-Node: Program modules38668
-Node: 't1utils' package39104
-Node: 'xindy' package39671
-Node: 'xdvik' package40856
-Node: 'asymptote'41935
-Node: Extending TeX Live42390
-Node: Adding a new program module42758
-Node: Adding a new generic library module44277
-Node: Adding a new TeX-specific library module46490
-Node: Configure options47177
-Node: Global configure options48568
-Node: '--disable-native-texlive-build'49136
-Node: '--prefix' '--bindir' ...50132
-Node: '--disable-largefile'50680
-Node: '--disable-missing'51373
-Node: '--enable-compiler-warnings='LEVEL51780
-Node: '--enable-cxx-runtime-hack'52525
-Node: '--enable-maintainer-mode'52958
-Node: '--enable-multiplatform'53493
-Node: '--enable-shared'54037
-Node: '--enable-silent-rules'54414
-Node: '--without-ln-s'54876
-Node: '--without-x'55233
-Node: Program-specific configure options55425
-Node: '--enable-PROG' '--disable-PROG'56088
-Node: '--disable-all-pkgs'56371
-Node: Configure options for 'texk/web2c'57365
-Node: Configure options for 'texk/bibtex-x'59823
-Node: Configure options for 'texk/dvipdfm-x'60379
-Node: Configure options for 'texk/dvisvgm'61163
-Node: Configure options for 'texk/texlive'62055
-Node: Configure options for 'texk/xdvik'62482
-Node: Configure options for 'utils/xindy'63092
-Node: Library-specific configure options63997
-Node: Configure options for 'kpathsea'65012
-Node: Configure options for system 'poppler'65725
-Node: Variables for configure66522
-Node: Cross compilation67950
-Node: Cross configuring69249
-Node: Cross problems70922
-Node: Coding conventions72783
-Node: Declarations and definitions73452
-Node: Const75634
-Node: install-tl77497
-Node: install-tl NAME77838
-Node: install-tl SYNOPSIS77996
-Node: install-tl DESCRIPTION78204
-Node: install-tl REFERENCES79205
-Node: install-tl OPTIONS79721
-Ref: install-tl *-gui* [[=]_module_]80075
-Ref: install-tl 'text'80284
-Ref: install-tl 'wizard'80407
-Ref: install-tl 'perltk'80561
-Ref: install-tl *-no-gui*80995
-Ref: install-tl *-lang* _llcode_81076
-Ref: install-tl *-repository* _url|path_81763
-Ref: install-tl *-select-repository*83574
-Ref: install-tl *-all-options*84010
-Ref: install-tl *-custom-bin* _path_84317
-Ref: install-tl *-debug-translation*84972
-Ref: install-tl *-force-platform* _platform_85191
-Ref: install-tl *-help*, *--help*, *-?*85435
-Ref: install-tl *-in-place*85828
-Ref: install-tl *-logfile* _file_86355
-Ref: install-tl *-no-cls*86706
-Ref: install-tl *-non-admin*86837
-Ref: install-tl *--persistent-downloads*86942
-Ref: install-tl *--no-persistent-downloads*86970
-Ref: install-tl *-portable*87578
-Ref: install-tl *-print-platform*87717
-Ref: install-tl *-profile* _profile_87910
-Ref: install-tl *-q*89404
-Ref: install-tl *-scheme* _scheme_89466
-Ref: install-tl *-v*89940
-Ref: install-tl *-version*, *--version*90101
-Node: install-tl ENVIRONMENT VARIABLES90232
-Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'90621
-Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'90823
-Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'90929
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'90960
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'90989
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'91019
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'91053
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'91084
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'91112
-Ref: install-tl 'NOPERLDOC'91167
-Node: install-tl AUTHORS AND COPYRIGHT91231
-Node: tlmgr91589
-Node: tlmgr NAME92026
-Node: tlmgr SYNOPSIS92151
-Node: tlmgr DESCRIPTION92341
-Node: tlmgr EXAMPLES93437
-Ref: tlmgr 'tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet'93728
-Ref: tlmgr 'tlmgr update --list'93909
-Ref: tlmgr 'tlmgr update --all'94002
-Ref: tlmgr 'tlmgr info' _pkg_94158
-Node: tlmgr OPTIONS94364
-Ref: tlmgr *--repository* _url|path_94884
-Ref: tlmgr *--gui* [_action_]95609
-Ref: tlmgr *--gui-lang* _llcode_96016
-Ref: tlmgr *--debug-translation*96699
-Ref: tlmgr *--machine-readable*96902
-Ref: tlmgr *--no-execute-actions*97170
-Ref: tlmgr *--package-logfile* _file_97363
-Ref: tlmgr *--pause*97618
-Ref: tlmgr *--persistent-downloads*97773
-Ref: tlmgr *--no-persistent-downloads*97801
-Ref: tlmgr *--pin-file*98295
-Ref: tlmgr *--usermode*98513
-Ref: tlmgr *--usertree* _dir_98633
-Node: tlmgr ACTIONS99183
-Node: tlmgr help100415
-Node: tlmgr version100891
-Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...101209
-Ref: tlmgr *--backupdir* _directory_102303
-Ref: tlmgr *--all*102500
-Ref: tlmgr *--clean*[=_N_]102722
-Ref: tlmgr *--dry-run*103019
-Node: tlmgr candidates _pkg_103139
-Ref: tlmgr *candidates _pkg_* 1103426
-Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]103570
-Ref: tlmgr *files*104013
-Ref: tlmgr *depends*104148
-Ref: tlmgr *executes*104490
-Ref: tlmgr *runfiles*104608
-Ref: tlmgr *--use-svn*104720
-Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]104837
-Node: tlmgr dump-tlpdb [--local|--remote]106909
-Ref: tlmgr *--local*107419
-Ref: tlmgr *--remote*107458
-Node: tlmgr generate [_option_]... _what_107880
-Ref: tlmgr *generate language*108121
-Ref: tlmgr *generate language.dat*108146
-Ref: tlmgr *generate language.def*108171
-Ref: tlmgr *generate language.dat.lua*108200
-Ref: tlmgr *generate fmtutil*108220
-Ref: tlmgr *--dest* _output_file_110457
-Ref: tlmgr *--localcfg* _local_conf_file_111033
-Ref: tlmgr *--rebuild-sys*111156
-Node: tlmgr gui112017
-Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]112261
-Ref: tlmgr *--list*113466
-Ref: tlmgr *--only-installed*113745
-Ref: tlmgr *--taxonomy*113960
-Ref: tlmgr *--keyword*113972
-Ref: tlmgr *--functionality*113990
-Ref: tlmgr *--characterization*114011
-Node: tlmgr init-usertree114224
-Node: tlmgr install [_option_]... _pkg_...114650
-Ref: tlmgr *--file*115014
-Ref: tlmgr *--reinstall*115240
-Ref: tlmgr *--no-depends*115620
-Ref: tlmgr *--no-depends-at-all*115779
-Ref: tlmgr *--dry-run* 1116177
-Ref: tlmgr *--force*116295
-Node: tlmgr option116501
-Ref: tlmgr *option [show]*116674
-Ref: tlmgr *option showall*116692
-Ref: tlmgr *option _key_ [_value_]*116718
-Node: tlmgr paper120566
-Ref: tlmgr *paper [a4|letter]*120751
-Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*120825
-Node: tlmgr path [--w32mode=user|admin] [add|remove]121852
-Node: tlmgr pinning123335
-Ref: tlmgr 'pinning show'123642
-Ref: tlmgr 'pinning add' _repo_ _pkgglob_...123715
-Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...123834
-Ref: tlmgr 'pinning remove _repo_ --all'123987
-Node: tlmgr platform list|add|remove _platform_...124041
-Node: tlmgr platform set _platform_124289
-Node: tlmgr platform set auto124517
-Ref: tlmgr *--dry-run* 2125634
-Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...125743
-Node: tlmgr print-platform127045
-Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]127517
-Ref: tlmgr *--all* 1128413
-Ref: tlmgr *--backupdir* _directory_ 1128607
-Ref: tlmgr *--dry-run* 3128763
-Ref: tlmgr *--force* 1128880
-Node: tlmgr remove [_option_]... _pkg_...128908
-Ref: tlmgr *--no-depends* 1129431
-Ref: tlmgr *--no-depends-at-all* 1129493
-Ref: tlmgr *--force* 2129549
-Ref: tlmgr *--dry-run* 4130021
-Node: tlmgr repository130128
-Ref: tlmgr *repository list*130336
-Ref: tlmgr *repository list _path|tag_*130366
-Ref: tlmgr *repository add _path_ [_tag_]*130399
-Ref: tlmgr *repository remove _path|tag_*130431
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*130485
-Node: tlmgr search [_option_...] _what_131569
-Node: tlmgr search [_option_...] --file _what_132080
-Node: tlmgr search [_option_...] --taxonomy _what_132331
-Node: tlmgr search [_option_...] --keyword _what_132642
-Node: tlmgr search [_option_...] --functionality _what_132960
-Node: tlmgr search [_option_...] --characterization _what_133298
-Node: tlmgr search [_option_...] --all _what_133638
-Ref: tlmgr *--global*134086
-Ref: tlmgr *--word*134198
-Ref: tlmgr *--list* 1134437
-Ref: tlmgr *--file* 1134783
-Ref: tlmgr *--taxonomy* 1134840
-Ref: tlmgr *--keyword* 1134852
-Ref: tlmgr *--functionality* 1134870
-Ref: tlmgr *--characterization* 1134891
-Ref: tlmgr *--all* 2135046
-Node: tlmgr uninstall135129
-Ref: tlmgr *--force* 3135383
-Node: tlmgr update [_option_]... [_pkg_]...135439
-Ref: tlmgr *--all* 3135810
-Ref: tlmgr *--self*137551
-Ref: tlmgr *--dry-run* 5138315
-Ref: tlmgr *--list* [_pkg_]138492
-Ref: tlmgr *--exclude* _pkg_139181
-Ref: tlmgr *--no-auto-remove* [_pkg_]...139874
-Ref: tlmgr *--no-auto-install* [_pkg_]...140325
-Ref: tlmgr *--reinstall-forcibly-removed*140981
-Ref: tlmgr *--backup* and *--backupdir* _directory_141545
-Ref: tlmgr *--no-depends* 2142726
-Ref: tlmgr *--no-depends-at-all* 2142929
-Ref: tlmgr *--force* 4142985
-Node: tlmgr USER MODE143411
-Node: tlmgr user mode install146222
-Node: tlmgr user mode backup; restore; remove; update147169
-Node: tlmgr user mode generate; option; paper147611
-Node: tlmgr CONFIGURATION FILE FOR TLMGR147987
-Node: tlmgr TAXONOMIES149078
-Ref: tlmgr '--keyword' 2149704
-Ref: tlmgr '--functionality' 2149789
-Ref: tlmgr '--characterization' 2149945
-Ref: tlmgr '--taxonomy' 2150086
-Node: tlmgr MULTIPLE REPOSITORIES150627
-Node: tlmgr Pinning152348
-Node: tlmgr GUI FOR TLMGR154323
-Node: tlmgr Main display155545
-Node: tlmgr Display configuration area155797
-Ref: tlmgr Status156158
-Ref: tlmgr Category156322
-Ref: tlmgr Match156508
-Ref: tlmgr Selection156768
-Ref: tlmgr Display configuration buttons156972
-Node: tlmgr Package list area157155
-Ref: tlmgr a checkbox157739
-Ref: tlmgr package name157875
-Ref: tlmgr local revision (and version)157974
-Ref: tlmgr remote revision (and version)158349
-Ref: tlmgr short description158646
-Node: tlmgr Main display action buttons158691
-Ref: tlmgr Update all installed158957
-Ref: tlmgr Update159329
-Ref: tlmgr Install159379
-Ref: tlmgr Remove159565
-Ref: tlmgr Backup159743
-Node: tlmgr Menu bar159900
-Ref: tlmgr 'tlmgr' menu160097
-Ref: tlmgr 'Options menu'160405
-Ref: tlmgr 'Actions menu'161488
-Ref: tlmgr 'Help menu'161916
-Node: tlmgr MACHINE-READABLE OUTPUT162049
-Node: tlmgr Machine-readable 'update' and 'install' output162865
-Ref: tlmgr 'location-url' _location_164147
-Ref: tlmgr 'total-bytes' _count_164363
-Ref: tlmgr _pkgname_164773
-Ref: tlmgr _status_164983
-Ref: tlmgr 'd'165061
-Ref: tlmgr 'f'165121
-Ref: tlmgr 'u'165300
-Ref: tlmgr 'r'165346
-Ref: tlmgr 'a'165469
-Ref: tlmgr 'i'165647
-Ref: tlmgr 'I'165766
-Ref: tlmgr _localrev_165868
-Ref: tlmgr _serverrev_165975
-Ref: tlmgr _size_166087
-Ref: tlmgr _runtime_166256
-Ref: tlmgr _esttot_166326
-Node: tlmgr Machine-readable 'option' output166359
-Node: tlmgr AUTHORS AND COPYRIGHT166877
-Node: Index167224
+Node: Macros for Windows31829
+Node: Library modules33406
+Node: 'png' library33903
+Node: 'zlib' library36196
+Node: 'freetype' library36717
+Node: 'kpathsea' library37251
+Node: Program modules38654
+Node: 't1utils' package39090
+Node: 'xindy' package39657
+Node: 'xdvik' package40842
+Node: 'asymptote'41921
+Node: Extending TeX Live42376
+Node: Adding a new program module42744
+Node: Adding a new generic library module44263
+Node: Adding a new TeX-specific library module46476
+Node: Configure options47163
+Node: Global configure options48554
+Node: '--disable-native-texlive-build'49122
+Node: '--prefix' '--bindir' ...50118
+Node: '--disable-largefile'50666
+Node: '--disable-missing'51359
+Node: '--enable-compiler-warnings='LEVEL51766
+Node: '--enable-cxx-runtime-hack'52511
+Node: '--enable-maintainer-mode'52944
+Node: '--enable-multiplatform'53479
+Node: '--enable-shared'54023
+Node: '--enable-silent-rules'54400
+Node: '--without-ln-s'54862
+Node: '--without-x'55219
+Node: Program-specific configure options55411
+Node: '--enable-PROG' '--disable-PROG'56074
+Node: '--disable-all-pkgs'56357
+Node: Configure options for 'texk/web2c'57351
+Node: Configure options for 'texk/bibtex-x'59809
+Node: Configure options for 'texk/dvipdfm-x'60358
+Node: Configure options for 'texk/dvisvgm'61137
+Node: Configure options for 'texk/texlive'62029
+Node: Configure options for 'texk/xdvik'62456
+Node: Configure options for 'utils/xindy'63066
+Node: Library-specific configure options63971
+Node: Configure options for 'kpathsea'64986
+Node: Configure options for system 'poppler'65699
+Node: Variables for configure66496
+Node: Cross compilation67924
+Node: Cross configuring69223
+Node: Cross problems70896
+Node: Coding conventions72757
+Node: Declarations and definitions73426
+Node: Const75608
+Node: install-tl77471
+Node: install-tl NAME77812
+Node: install-tl SYNOPSIS77970
+Node: install-tl DESCRIPTION78178
+Node: install-tl REFERENCES79179
+Node: install-tl OPTIONS79695
+Ref: install-tl *-gui* [[=]_module_]80049
+Ref: install-tl 'text'80258
+Ref: install-tl 'wizard'80381
+Ref: install-tl 'perltk'80535
+Ref: install-tl *-no-gui*80969
+Ref: install-tl *-lang* _llcode_81050
+Ref: install-tl *-repository* _url|path_81737
+Ref: install-tl *-select-repository*83548
+Ref: install-tl *-all-options*83984
+Ref: install-tl *-custom-bin* _path_84291
+Ref: install-tl *-debug-translation*84946
+Ref: install-tl *-force-platform* _platform_85165
+Ref: install-tl *-help*, *--help*, *-?*85409
+Ref: install-tl *-in-place*85802
+Ref: install-tl *-logfile* _file_86329
+Ref: install-tl *-no-cls*86680
+Ref: install-tl *-non-admin*86811
+Ref: install-tl *--persistent-downloads*86916
+Ref: install-tl *--no-persistent-downloads*86944
+Ref: install-tl *-portable*87552
+Ref: install-tl *-print-platform*87691
+Ref: install-tl *-profile* _profile_87884
+Ref: install-tl *-q*89378
+Ref: install-tl *-scheme* _scheme_89440
+Ref: install-tl *-v*89914
+Ref: install-tl *-version*, *--version*90075
+Node: install-tl ENVIRONMENT VARIABLES90206
+Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'90595
+Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'90797
+Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'90903
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'90934
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'90963
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'90993
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'91027
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'91058
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'91086
+Ref: install-tl 'NOPERLDOC'91141
+Node: install-tl AUTHORS AND COPYRIGHT91205
+Node: tlmgr91563
+Node: tlmgr NAME92000
+Node: tlmgr SYNOPSIS92125
+Node: tlmgr DESCRIPTION92315
+Node: tlmgr EXAMPLES93411
+Ref: tlmgr 'tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet'93702
+Ref: tlmgr 'tlmgr update --list'93883
+Ref: tlmgr 'tlmgr update --all'93976
+Ref: tlmgr 'tlmgr info' _pkg_94132
+Node: tlmgr OPTIONS94338
+Ref: tlmgr *--repository* _url|path_94858
+Ref: tlmgr *--gui* [_action_]95583
+Ref: tlmgr *--gui-lang* _llcode_95990
+Ref: tlmgr *--debug-translation*96673
+Ref: tlmgr *--machine-readable*96876
+Ref: tlmgr *--no-execute-actions*97144
+Ref: tlmgr *--package-logfile* _file_97337
+Ref: tlmgr *--pause*97592
+Ref: tlmgr *--persistent-downloads*97747
+Ref: tlmgr *--no-persistent-downloads*97775
+Ref: tlmgr *--pin-file*98269
+Ref: tlmgr *--usermode*98487
+Ref: tlmgr *--usertree* _dir_98607
+Node: tlmgr ACTIONS99157
+Node: tlmgr help100389
+Node: tlmgr version100865
+Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...101183
+Ref: tlmgr *--backupdir* _directory_102277
+Ref: tlmgr *--all*102474
+Ref: tlmgr *--clean*[=_N_]102696
+Ref: tlmgr *--dry-run*102993
+Node: tlmgr candidates _pkg_103113
+Ref: tlmgr *candidates _pkg_* 1103400
+Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]103544
+Ref: tlmgr *files*103987
+Ref: tlmgr *depends*104122
+Ref: tlmgr *executes*104464
+Ref: tlmgr *runfiles*104582
+Ref: tlmgr *--use-svn*104694
+Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]104811
+Node: tlmgr dump-tlpdb [--local|--remote]106883
+Ref: tlmgr *--local*107393
+Ref: tlmgr *--remote*107432
+Node: tlmgr generate [_option_]... _what_107854
+Ref: tlmgr *generate language*108095
+Ref: tlmgr *generate language.dat*108120
+Ref: tlmgr *generate language.def*108145
+Ref: tlmgr *generate language.dat.lua*108174
+Ref: tlmgr *generate fmtutil*108194
+Ref: tlmgr *--dest* _output_file_110431
+Ref: tlmgr *--localcfg* _local_conf_file_111007
+Ref: tlmgr *--rebuild-sys*111130
+Node: tlmgr gui111991
+Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]112235
+Ref: tlmgr *--list*113440
+Ref: tlmgr *--only-installed*113719
+Ref: tlmgr *--taxonomy*113934
+Ref: tlmgr *--keyword*113946
+Ref: tlmgr *--functionality*113964
+Ref: tlmgr *--characterization*113985
+Node: tlmgr init-usertree114198
+Node: tlmgr install [_option_]... _pkg_...114624
+Ref: tlmgr *--file*114988
+Ref: tlmgr *--reinstall*115214
+Ref: tlmgr *--no-depends*115594
+Ref: tlmgr *--no-depends-at-all*115753
+Ref: tlmgr *--dry-run* 1116151
+Ref: tlmgr *--force*116269
+Node: tlmgr option116475
+Ref: tlmgr *option [show]*116648
+Ref: tlmgr *option showall*116666
+Ref: tlmgr *option _key_ [_value_]*116692
+Node: tlmgr paper120540
+Ref: tlmgr *paper [a4|letter]*120725
+Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*120799
+Node: tlmgr path [--w32mode=user|admin] [add|remove]121826
+Node: tlmgr pinning123309
+Ref: tlmgr 'pinning show'123616
+Ref: tlmgr 'pinning add' _repo_ _pkgglob_...123689
+Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...123808
+Ref: tlmgr 'pinning remove _repo_ --all'123961
+Node: tlmgr platform list|add|remove _platform_...124015
+Node: tlmgr platform set _platform_124263
+Node: tlmgr platform set auto124491
+Ref: tlmgr *--dry-run* 2125608
+Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...125717
+Node: tlmgr print-platform127019
+Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]127491
+Ref: tlmgr *--all* 1128387
+Ref: tlmgr *--backupdir* _directory_ 1128581
+Ref: tlmgr *--dry-run* 3128737
+Ref: tlmgr *--force* 1128854
+Node: tlmgr remove [_option_]... _pkg_...128882
+Ref: tlmgr *--no-depends* 1129405
+Ref: tlmgr *--no-depends-at-all* 1129467
+Ref: tlmgr *--force* 2129523
+Ref: tlmgr *--dry-run* 4129995
+Node: tlmgr repository130102
+Ref: tlmgr *repository list*130310
+Ref: tlmgr *repository list _path|tag_*130340
+Ref: tlmgr *repository add _path_ [_tag_]*130373
+Ref: tlmgr *repository remove _path|tag_*130405
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*130459
+Node: tlmgr search [_option_...] _what_131543
+Node: tlmgr search [_option_...] --file _what_132054
+Node: tlmgr search [_option_...] --taxonomy _what_132305
+Node: tlmgr search [_option_...] --keyword _what_132616
+Node: tlmgr search [_option_...] --functionality _what_132934
+Node: tlmgr search [_option_...] --characterization _what_133272
+Node: tlmgr search [_option_...] --all _what_133612
+Ref: tlmgr *--global*134060
+Ref: tlmgr *--word*134172
+Ref: tlmgr *--list* 1134411
+Ref: tlmgr *--file* 1134757
+Ref: tlmgr *--taxonomy* 1134814
+Ref: tlmgr *--keyword* 1134826
+Ref: tlmgr *--functionality* 1134844
+Ref: tlmgr *--characterization* 1134865
+Ref: tlmgr *--all* 2135020
+Node: tlmgr uninstall135103
+Ref: tlmgr *--force* 3135357
+Node: tlmgr update [_option_]... [_pkg_]...135413
+Ref: tlmgr *--all* 3135784
+Ref: tlmgr *--self*137525
+Ref: tlmgr *--dry-run* 5138289
+Ref: tlmgr *--list* [_pkg_]138466
+Ref: tlmgr *--exclude* _pkg_139155
+Ref: tlmgr *--no-auto-remove* [_pkg_]...139848
+Ref: tlmgr *--no-auto-install* [_pkg_]...140299
+Ref: tlmgr *--reinstall-forcibly-removed*140955
+Ref: tlmgr *--backup* and *--backupdir* _directory_141519
+Ref: tlmgr *--no-depends* 2142700
+Ref: tlmgr *--no-depends-at-all* 2142903
+Ref: tlmgr *--force* 4142959
+Node: tlmgr USER MODE143385
+Node: tlmgr user mode install146196
+Node: tlmgr user mode backup; restore; remove; update147143
+Node: tlmgr user mode generate; option; paper147585
+Node: tlmgr CONFIGURATION FILE FOR TLMGR147961
+Node: tlmgr TAXONOMIES149052
+Ref: tlmgr '--keyword' 2149678
+Ref: tlmgr '--functionality' 2149763
+Ref: tlmgr '--characterization' 2149919
+Ref: tlmgr '--taxonomy' 2150060
+Node: tlmgr MULTIPLE REPOSITORIES150601
+Node: tlmgr Pinning152322
+Node: tlmgr GUI FOR TLMGR154297
+Node: tlmgr Main display155519
+Node: tlmgr Display configuration area155771
+Ref: tlmgr Status156132
+Ref: tlmgr Category156296
+Ref: tlmgr Match156482
+Ref: tlmgr Selection156742
+Ref: tlmgr Display configuration buttons156946
+Node: tlmgr Package list area157129
+Ref: tlmgr a checkbox157713
+Ref: tlmgr package name157849
+Ref: tlmgr local revision (and version)157948
+Ref: tlmgr remote revision (and version)158323
+Ref: tlmgr short description158620
+Node: tlmgr Main display action buttons158665
+Ref: tlmgr Update all installed158931
+Ref: tlmgr Update159303
+Ref: tlmgr Install159353
+Ref: tlmgr Remove159539
+Ref: tlmgr Backup159717
+Node: tlmgr Menu bar159874
+Ref: tlmgr 'tlmgr' menu160071
+Ref: tlmgr 'Options menu'160379
+Ref: tlmgr 'Actions menu'161462
+Ref: tlmgr 'Help menu'161890
+Node: tlmgr MACHINE-READABLE OUTPUT162023
+Node: tlmgr Machine-readable 'update' and 'install' output162839
+Ref: tlmgr 'location-url' _location_164121
+Ref: tlmgr 'total-bytes' _count_164337
+Ref: tlmgr _pkgname_164747
+Ref: tlmgr _status_164957
+Ref: tlmgr 'd'165035
+Ref: tlmgr 'f'165095
+Ref: tlmgr 'u'165274
+Ref: tlmgr 'r'165320
+Ref: tlmgr 'a'165443
+Ref: tlmgr 'i'165621
+Ref: tlmgr 'I'165740
+Ref: tlmgr _localrev_165842
+Ref: tlmgr _serverrev_165949
+Ref: tlmgr _size_166061
+Ref: tlmgr _runtime_166230
+Ref: tlmgr _esttot_166300
+Node: tlmgr Machine-readable 'option' output166333
+Node: tlmgr AUTHORS AND COPYRIGHT166851
+Node: Index167198
 
 End Tag Table
diff --git a/Build/source/doc/tlbuild.texi b/Build/source/doc/tlbuild.texi
index ecebe12f2b5..27a5b28abf1 100644
--- a/Build/source/doc/tlbuild.texi
+++ b/Build/source/doc/tlbuild.texi
@@ -959,14 +959,14 @@ that provides make variables for that library.  E.g., for
 Provide the configure option @code{--with-system-libpng}.  Set and
 @code{AC_SUBST} @code{make} variables for modules using this library (either
 an installed version or from the @TL{} tree): @code{LIBPNG_INCLUDES} for use
-in CPPFLAGS, @code{LIBPNG_LIBS} for use in LDADD, @code{LIBPNG_DEPEND} for
-use as dependency, and @code{LIBPNG_RULE} defining @code{make} rules to
-rebuild the library.
+in @code{CPPFLAGS}, @code{LIBPNG_LIBS} for use in @code{LDADD},
+@code{LIBPNG_DEPEND} for use as dependency, and @code{LIBPNG_RULE} defining
+@code{make} rules to rebuild the library.
 @end defmac
 
 @defmac KPSE_ADD_FLAGS (@var{name})
-Temporarily extend CPPFLAGS and LIBS with the values required for the
-library module @code{@var{name}}.
+Temporarily extend @code{CPPFLAGS} and @code{LIBS} with the values required
+for the library module @code{@var{name}}.
 @end defmac
 
 @defmac KPSE_RESTORE_FLAGS
@@ -1184,11 +1184,10 @@ distributed by @TeX{} user groups, and have never been officially
 released for standalone use.
 
 @pindex --with-system-kpathsea
-It is possible, and possibly even useful for distro builds
-(@pxref{Distro builds}), to specify the configure option
-@code{--with-system-kpathsea} in order to use a system version of the
-library and it may then be necessary to specify
-@code{--with-kpathsea-includes} and/or @code{--with-kpathsea-libdir}.
+It is possible, and perhaps even useful for distro builds (@pxref{Distro
+builds}), to specify the configure option @code{--with-system-kpathsea} in
+order to use a system version of the library.  Programs outside the TL tree
+should use @code{pkg-config} for the required flags.
 
 @pindex kpathsea.ac
 @pindex mktex.ac
@@ -1817,8 +1816,8 @@ in @file{texk/web2c/ac/web2c.ac}.
 @pindex bibtex8
 @pindex bibtexu
 @pindex bibtex-x
-The former programs @code{bibtex8} and @code{bibtexu} have been merged
-into the module @code{bibtex-x} (extended Bib@TeX{}).
+The programs @code{bibtex8} and @code{bibtexu} have been merged into the
+module @code{bibtex-x} (extended Bib@TeX{}).
 
 @vindex --disable-bibtex8
 @noindent @code{--disable-bibtex8}@*Do not build the @file{bibtex8} program.
@@ -1844,7 +1843,7 @@ different) behavior.
 
 @vindex --disable-dvipdfmx
 @noindent @code{--disable-dvipdfmx}@*Do not build the @file{dvipdfmx}
-program or create the @file{dvipdfm} symlink.
+program with the @file{dvipdfm} symlink.
 
 @vindex --disable-xdvipdfmx
 @noindent @code{--disable-xdvipdfmx}@*Do not build the @file{xdvipdfmx}
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index f98a5a3d952..23be30e57c5 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,6 +1,6 @@
 2015-03-17  Khaled Hosny  <khaledhosny@eglug.org>
 
-	*  pdfcolor.c, pdfcolor.h, pdfdoc.c, pdfdraw.c, spc_util.c: Add sopt
+	* pdfcolor.c, pdfcolor.h, pdfdoc.c, pdfdraw.c, spc_util.c: Add spot
 	colors support, based on patch by Apostolos Syropoulos.
 
 2015-03-15  Khaled Hosny  <khaledhosny@eglug.org>