summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-18 22:26:17 +0000
committerKarl Berry <karl@freefriends.org>2020-01-18 22:26:17 +0000
commitc11a9cc039efb77bc43415ed95caae7c156e6a1f (patch)
tree5e302ad29ab1eda2acb284fb852f2fe7fef203ce
parent26e2bca9aea519f797964b514679a2aeddbc9866 (diff)
suggest invoking with perl install-tl; mention mactex
git-svn-id: svn://tug.org/texlive/trunk@53450 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/readme-html.dir/readme.en.html15
-rw-r--r--Master/readme-txt.dir/README.EN40
-rwxr-xr-xMaster/tlpkg/bin/htmltext2
3 files changed, 37 insertions, 20 deletions
diff --git a/Master/readme-html.dir/readme.en.html b/Master/readme-html.dir/readme.en.html
index c7b44c7aa81..ea23986ae30 100644
--- a/Master/readme-html.dir/readme.en.html
+++ b/Master/readme-html.dir/readme.en.html
@@ -1,5 +1,7 @@
<html><head>
<!-- $Id$ -->
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1">
<title>TeX Live</title></head><body>
<h2>Welcome to TeX Live</h2>
@@ -50,9 +52,16 @@ see the <i>Release history</i> section at the end of the documentation.
<h3>Installation</h3>
-<p>The installation script is named <tt>install-tl</tt>
-(<tt>install-tl-windows.bat</tt> on Windows), and it has two operation
-modes:
+<p>The installation script is named <tt>install-tl</tt> and is at the
+top level of the directory tree. You can invoke it with <tt>perl
+install-tl</tt>. On Windows, you can also simply run the companion batch
+file, <tt>install-tl-windows.bat</tt>. You can invoke it with <tt>perl
+install-tl</tt>. On Macs, you will probably want to install via <a
+href="https://tug.org/mactex/">MacTeX</a>, which has its own native
+installer (it's also available on the DVD, next to the <tt>texlive/</tt>
+you're in now.)
+
+<p><tt>install-tl</tt> has two operation modes:
<dl>
<dt><b>-gui</b></dt> (default on Windows and Macs) which does a simple
diff --git a/Master/readme-txt.dir/README.EN b/Master/readme-txt.dir/README.EN
index 9dea277ac9b..7a15f11977e 100644
--- a/Master/readme-txt.dir/README.EN
+++ b/Master/readme-txt.dir/README.EN
@@ -37,8 +37,15 @@ Welcome to TeX Live
Installation
- The installation script is named install-tl (install-tl-windows.bat on
- Windows), and it has two operation modes:
+ The installation script is named install-tl and is at the top level of
+ the directory tree. You can invoke it with perl install-tl. On Windows,
+ you can also simply run the companion batch file,
+ install-tl-windows.bat. You can invoke it with perl install-tl. On
+ Macs, you will probably want to install via [10]MacTeX, which has its
+ own native installer (it's also available on the DVD, next to the
+ texlive/ you're in now.)
+
+ install-tl has two operation modes:
-gui (default on Windows and Macs) which does a simple installation by
default, using a graphical interface, but allows for advanced
@@ -51,8 +58,8 @@ Welcome to TeX Live
performed with the tlmgr (TeX Live Package Manager) program, which
likewise has both GUI and text modes.
- You can give the command-line option --help to both [10]install-tl and
- [11]tlmgr for detailed information on both programs. See the
+ You can give the command-line option --help to both [11]install-tl and
+ [12]tlmgr for detailed information on both programs. See the
documentation links above for (much) more information.
Links
@@ -60,14 +67,14 @@ Welcome to TeX Live
Finally, a few related web pages, for your reference. These are not
included in TeX Live:
- * [12]tug.org/begin.html - if you are new to TeX and/or want
+ * [13]tug.org/begin.html - if you are new to TeX and/or want
introductory material.
- * [13]tug.org/interest.html - general list of TeX web resources,
+ * [14]tug.org/interest.html - general list of TeX web resources,
including documentation, systems, packages, fonts, and more.
- * [14]tug.org/ctan.html - one entry point into the Comprehensive TeX
+ * [15]tug.org/ctan.html - one entry point into the Comprehensive TeX
Archive Network (CTAN), which is an online repository of all things
TeX.
- * [15]tug.org/usergroups.html - list of TeX user groups around the
+ * [16]tug.org/usergroups.html - list of TeX user groups around the
world, with contact information. We strongly encourage you to join
the user group of your choice, to support TeX Live and other TeX
activities.
@@ -75,7 +82,7 @@ Welcome to TeX Live
Happy TeXing!
__________________________________________________________________
- [16]TeX Live home page.
+ [17]TeX Live home page.
References
@@ -88,10 +95,11 @@ References
7. file:../texmf-dist/doc/texlive/
8. file:../doc.html
9. https://tug.org/texlive/doc.html
- 10. https://tug.org/texlive/doc/install-tl.html
- 11. https://tug.org/texlive/tlmgr.html
- 12. https://tug.org/begin.html
- 13. https://tug.org/interest.html
- 14. https://tug.org/ctan.html
- 15. https://tug.org/usergroups.html
- 16. https://tug.org/texlive/
+ 10. https://tug.org/mactex/
+ 11. https://tug.org/texlive/doc/install-tl.html
+ 12. https://tug.org/texlive/tlmgr.html
+ 13. https://tug.org/begin.html
+ 14. https://tug.org/interest.html
+ 15. https://tug.org/ctan.html
+ 16. https://tug.org/usergroups.html
+ 17. https://tug.org/texlive/
diff --git a/Master/tlpkg/bin/htmltext b/Master/tlpkg/bin/htmltext
index b0391dab156..f7379744477 100755
--- a/Master/tlpkg/bin/htmltext
+++ b/Master/tlpkg/bin/htmltext
@@ -19,5 +19,5 @@ for url in "$@"; do
# Since the reference list is useful, we fix it up by hand instead of
# using -nolist.
lynx -dump -nocolor -hiddenlinks=ignore "$url" \
- | sed -e 's,file://localhost/tmp/,file:../,'
+ | sed -e 's,file://localhost/.*/Master/,file:../,'
done