doc,formatted

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

5 files changed, 41 insertions, 9 deletions

diff --git a/Build/extra/epstopdf/README b/Build/extra/epstopdf/README
index 17d89cfbaa0..bba7d18639b 100644
--- a/Build/extra/epstopdf/README
+++ b/Build/extra/epstopdf/README
@@ -18,7 +18,7 @@ options, so the problem can be reproduced.
 Various test files and a Makefile to exercise them are in the source
 repository, which is currently a subdirectory of the texlive Subversion
 repo, purely for the developers' convenience:
-  http://tug.org/svn/texlive/trunk/Build/source/extra/epstopdf/
+  http://tug.org/svn/texlive/trunk/Build/extra/epstopdf/
 
 The test-binary and test-bin2 files there were supplied by Akira Kakuto and
 Reinhard Kotucha.  They contain binary data.  They are public domain.
diff --git a/Build/source/README b/Build/source/README
index 1714afb38b2..379adfbb032 100644
--- a/Build/source/README
+++ b/Build/source/README
@@ -69,3 +69,32 @@ x86_64-linuxmusl:
   Binaries are taken from the CI testing on travis-ci
   see the source/.travis.yaml file for details on how to build,
   and tlpkg/bin/tl-update-bindir for updating binaries (in general).
+
+x86_64-linux-glibc2.12, on CentOS6:
+#!/bin/sh -x
+# Public domain.
+# in ~/.subversion/config: use-commit-times=yes
+# mkdir /usr/local/src/tl
+# cd !$
+# svn -q co svn://tug.org/texlive/branches/branch2018/Build/source
+# rm -rf source/libs/icu source/libs/poppler # to avoid configuring them
+#
+cd /usr/local/src/tl || exit 1
+#
+debug=-g # for debugging, no optimization
+#
+./Build \
+  $debug \
+  -C \
+  --disable-xetex \
+  --disable-luatex \
+  --disable-luajittex \
+  --disable-luatex53 \
+  --disable-dvisvgm \
+  --disable-bibtexu \
+  --disable-upmendex \
+  --disable-poppler \
+  --without-system-icu \
+  --without-system-poppler \
+  --enable-native-texlive-build \
+exit $?
diff --git a/Build/source/utils/README b/Build/source/utils/README
index 231a9aea4f1..b2fdea35e16 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -51,9 +51,9 @@ After building clisp as described below, run the TL
   Build --enable-xindy CLISP=$clisp_builddir/clisp
 to include xindy in the build.  It is disabled by default.
 
-xindy/README-clisp has alternative instructions with some extra
-information, especially for those building xindy on its own.  The
-process here is written for building clisp-for-xindy-for-TL.  The
+xindy/xindy-src/README-clisp has alternative instructions with some
+extra information, especially for those building xindy on its own. The
+process here is written for building clisp-for-xindy-for-TL. The
 differences are minimal.
 
 mkdir clisp; cd clisp
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index afdbdc2082c..c700cf742c6 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -114,7 +114,8 @@ if ($^O =~ /^MSWin/i) {
 our @AcceptedFallbackDownloaders = qw/curl wget/;
 our %FallbackDownloaderProgram = ( 'wget' => 'wget', 'curl' => 'curl');
 our %FallbackDownloaderArgs = (
-  'curl' => ['--user-agent', 'texlive/curl', '--retry', '10', '--fail', '--location',
+  'curl' => ['--user-agent', 'texlive/curl', '--retry', '10', 
+             '--fail', '--location',
              '--connect-timeout', "$NetworkTimeout", '--silent', '--output'],
   'wget' => ['--user-agent=texlive/wget', '--tries=10',
              "--timeout=$NetworkTimeout", '-q', '-O'],
@@ -143,7 +144,9 @@ our %Compressors = (
     "priority"        => 30,
   },
 );
-our $CompressorExtRegexp = "(" . join("|", map { $Compressors{$_}{'extension'} } keys(%Compressors)) . ")";
+our $CompressorExtRegexp = "("
+    . join("|", map { $Compressors{$_}{'extension'} } keys %Compressors)
+    . ")";
 
 # archive (not user) settings.
 # these can be overridden by putting them into 00texlive.config.tlpsrc
@@ -223,7 +226,7 @@ our %TLPDBOptions = (
 
 our %TLPDBSettings = (
   "platform" => [ "s", "Main platform for this computer" ],
-  "available_architectures" => [ "l", "All available/installed architectures" ],
+  "available_architectures" => [ "l","All available/installed architectures" ],
   "usertree" => [ "b", "This tree acts as user tree" ]
 );
 
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 218a7baf279..66638b76739 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -145,7 +145,7 @@ sub from_file {
 
     } elsif ($line =~ /^shortdesc\s*(.*)$/) {
       # although we would like to do this, hyphen-latin.tlpsrc contains
-      # multiple short/longdesc entries. Not worth following up.
+      # multiple short/longdesc, entries. Not worth following up.
       # $shortdesc
       #   && die "$srcfile:$lineno: second shortdesc not allowed: $line"
       #          . "(have $shortdesc)\n";
@@ -795,7 +795,7 @@ Catalogue.
 =item C<shortdesc>
 
 gives a one line description of the package. Subsequent entries will
-overwrite the former ones. In TeX Live only used for collections and
+overwrite the former ones. In TeX Live primarily used for collections and
 schemes.
 
 =item C<longdesc>