summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/install-tl33
-rw-r--r--Master/readme-html.dir/readme.en.html14
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl20
-rwxr-xr-xMaster/tlpkg/bin/tl-update-auto12
4 files changed, 49 insertions, 30 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 6051f2808dc..5dd4824f713 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1330,7 +1330,7 @@ sub do_cleanup
}
__END__
-
+
=head1 NAME
install-tl - the TeX Live Cross Platform Installer
@@ -1341,19 +1341,31 @@ install-tl [OPTION]...
install-tl.bat [OPTION]...
+=head1 DESCRIPTION
+
+The TeX Live installer works across all supported platforms and allows
+to install TeX Live from various media, including the network.
+
+Post-installation configuration, packages updates, and more, are now
+available through B<tlmgr>(1), the TeX Live Manager
+(L<http://tug.org/texlive/tlmgr.html>).
+
+The most up-to-date version of this documentation is on the Internet at
+L<http://tug.org/texlive/doc/install-tl.html>.
+
=head1 OPTIONS
=over 8
=item B<-gui>
-If possible, use the GUI installer. This requires the Perl/Tk module
-(L<http://tug.org/texlive/distro.html#perltk>; if Perl/Tk is not
-available, installation continues in text mode.
+If possible, use the GUI installer (default on Windows). This requires
+the Perl/Tk module (L<http://tug.org/texlive/distro.html#perltk>; if
+Perl/Tk is not available, installation continues in text mode.
=item B<-no-gui>
-Force using the text mode installer.
+Use the text mode installer (default except on Windows).
=item B<-lang> I<2-letter lang code>
@@ -1394,7 +1406,7 @@ services.)
=item B<-no-cls>
(only for text mode installer) do not clear the screen when entering
-a new menu, for debugging purposes.
+a new menu (for debugging purposes).
=item B<-portable>
@@ -1403,7 +1415,7 @@ scripts instead of this option. See below for details.
=item B<-non-admin>
-Windows: configure for the current user, not for all users
+Windows: configure for the current user, not for all users.
=item B<-print-arch>
@@ -1463,13 +1475,6 @@ Output version information and exit.
As usual, all options can be specified with either C<-> or C<-->, and
arguments can be be separated from their options by either a space or C<=>.
-=head1 DESCRIPTION
-
-The TeX Live installer works across all supported platforms and allows
-to install TeX Live from various media, including the network. See
-L<http://tug.org/texlive/tlmgr.html> for more.
-
-
=head1 PORTABLE USE
The TeX Live root directory contains a shell script C<tl-portable.sh>
diff --git a/Master/readme-html.dir/readme.en.html b/Master/readme-html.dir/readme.en.html
index 53eb58f177e..d4cb10a028e 100644
--- a/Master/readme-html.dir/readme.en.html
+++ b/Master/readme-html.dir/readme.en.html
@@ -24,12 +24,14 @@ href="../LICENSE.CTAN">LICENSE.CTAN</a> text files.
undertaking the installation. It includes step-by-step instructions, a
description of the top-level directories, and more.
-<p>English versions of the Guide are on the DVD in the
-<a href="../texmf-doc/doc/english">texmf-doc/doc/english/</a> hierarchy, in
-both <a href="../texmf-doc/doc/english/texlive-en/texlive-en.html">html</a>
-and <a href="../texmf-doc/doc/english/texlive-en/texlive-en.pdf">pdf</a>
-formats. Translations to other languages are also available under
-<a href="../texmf-doc/doc/">texmf-doc/doc/*</a>.
+<p>English versions of the Guide are in the full distribution (for
+example, on the DVD) in the <a
+href="../texmf-doc/doc/english">texmf-doc/doc/english/</a> hierarchy, in
+both <a
+href="../texmf-doc/doc/english/texlive-en/texlive-en.html">html</a> and
+<a href="../texmf-doc/doc/english/texlive-en/texlive-en.pdf">pdf</a>
+formats. Translations to other languages are also available under <a
+href="../texmf-doc/doc/">texmf-doc/doc/*</a>.
<p>We also provide a list of <a href="../doc.html">links to the
available PDF and HTML documentation</a> for the included packages and
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index dfa7f96a0fe..160725c7297 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1267,8 +1267,11 @@ tlmgr [I<option>]... I<action> [I<option>]... [I<operand>]...
B<tlmgr> manages an existing TeX Live installation, both packages and
configuration options. It performs many of the same actions as
-B<texconfig>(1), and more besides. (texconfig continues to included and
-supported, but tlmgr is now preferred.)
+B<texconfig>(1), and more besides. (texconfig continues to be included
+and supported, but tlmgr is now preferred.)
+
+The most up-to-date version of this documentation is on the Internet at
+L<http://tug.org/texlive/tlmgr.html>.
=head1 OPTIONS
@@ -1279,18 +1282,19 @@ The following options have to be given I<before> you specify the action.
=item B<--location> I<location>
Specifies the location from which packages should be installed or
-updated, overriding the location found in the installation's TLPDB.
+updated, overriding the location found in the installation's TeX Live
+Package Database (TLPDB).
-=item B<--gui>
+=item B<--gui> [I<action>]
You can give this option together with an action to be brought directly
-into the respective screen of the GUI. For example, calling
+into the respective screen of the GUI. For example, running
tlmgr --gui update
-will bring you directly into the update screen.
+starts you directly at the update screen.
-=item B<--gui-lang>
+=item B<--gui-lang> I<llcode>
Normally the GUI tries to deduce your language from the environment
(on Windows via the registry, on Unix via LC_MESSAGES). If that fails
@@ -1315,7 +1319,7 @@ release as well as the B<tlmgr> script itself.
Gives this help information (same as B<--help>).
-=item B<help>
+=item B<version>
Gives version information (same as B<--version>).
diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index 65a1b622246..abc8553df10 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -141,7 +141,7 @@ for gnuconf in config.guess config.sub; do
done
-# tlmgr man page autogenerated. Don't worry about a date difference.
+# tlmgr man page autogenerated. Arrange to ignore date differences.
#
# return 0 if files $1 and $2 are the same except for the first lines.
# (we need to ignore the timestamps in the generation lines.)
@@ -155,7 +155,9 @@ same_except_for_th ()
mandir=texmf/doc/man
manfile=$mandir/man1/tlmgr.1
-pod2man bin/i386-linux/tlmgr >$temp
+tlmgr=texmf/scripts/texlive/tlmgr.pl
+#
+pod2man $tlmgr >$temp
if same_except_for_th $manfile $temp; then
echo " `basename $manfile` ok."
rm -f $manfile.new
@@ -165,6 +167,12 @@ else
update_list="$update_list $mandir"
fi
+# Update the version on the web site; since these aren't checked in, we
+# can do it unconditionally.
+#
+pod2html $tlmgr >/home/httpd/html/texlive/doc/tlmgr.html
+pod2html install-tl >/home/httpd/html/texlive/doc/install-tl.html
+
# doc.html.
#