branch master updated: * INSTALL: integrate text from doc/README about *.tex installation. use https: for ftp.gnu.org link. * doc/README: eliminate file. * doc/Makefile.am (install-data-local): update reference to INSTALL.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 2b0d8d35de * INSTALL: integrate text from doc/README about *.tex 
installation. use https: for ftp.gnu.org link. * doc/README: eliminate file. * 
doc/Makefile.am (install-data-local): update reference to INSTALL.
2b0d8d35de is described below

commit 2b0d8d35dec29b8b97e9f502e206d59d057f09c1
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Aug 15 14:23:11 2023 +0100

    * INSTALL: integrate text from doc/README about *.tex installation.
    use https: for ftp.gnu.org link.
    * doc/README: eliminate file.
    * doc/Makefile.am (install-data-local): update reference to INSTALL.
---
 ChangeLog       |  7 +++++++
 INSTALL         | 43 ++++++++++++++++++++++++++++++++++++-------
 doc/Makefile.am |  2 +-
 doc/README      | 42 ------------------------------------------
 4 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3e8eddb0e..bfadcdeecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-08-15  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * INSTALL: integrate text from doc/README about *.tex installation.
+       use https: for ftp.gnu.org link.
+       * doc/README: eliminate file.
+       * doc/Makefile.am (install-data-local): update reference to INSTALL.
+
 2023-08-15  Gavin Smith <gavinsmith0123@gmail.com>
 
        * info/session.c: removed unused variable.
diff --git a/INSTALL b/INSTALL
index ca1c727671..b03f8a71c3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,16 +12,45 @@ Automake-based distribution, please read the file 
`INSTALL.generic'.
 Installation notes specific to Texinfo:
 
 * texinfo.tex and the other *.tex files are not installed by
-  `make install', because there is no reliable way to know where to
-  install them.  Instead, you have to run an additional make command
+  `make install', because TeX installations vary so widely.
+  Installing them in the wrong place would give a false sense of
+  security.   Instead, you have to run an additional make command
   after the normal make install:
+
     make TEXMF=/your/texmf install-tex
-  texinfo.tex is installed in ${TEXMF}/tex/texinfo/texinfo.tex, etc.
-  More information is available in doc/README.
 
-* On the other hand, if you're maintaining a TeX distribution and
-  keeping the files up to date yourself, you may not want to see the
-  installation warnings.
+  where TEXMF is a root of a TeX hierachy that follows the TeX
+  Directory Structure standard (http://tug.org/tds/).
+  texinfo.tex is installed in ${TEXMF}/tex/texinfo, epsf.tex
+  in ${TEXMF}/tex/generic/epsf/, etc.
+
+  (Alternatively, you can simply cp *.tex to the appropriate places.)
+
+  For information on how or where to install files, see your TeX
+  documentation in general (i.e. web2c and kpathsea manuals), and the
+  texmf.cnf file.
+
+  It is possible to put these .tex files in a `local' place instead of
+  overwriting existing ones.  You might find where this is by running
+  `kpsewhich -var-value TEXMFLOCAL'.
+
+  If you add files to your TeX installations, not just replace existing
+  ones, you very likely will also have to update your ls-R file; do this
+  by running the mktexlsr command.
+
+  An alternative is to copy texinfo.tex to the same directory as your
+  Texinfo manual, but this is not especially recommended.
+
+  You can get the latest texinfo.tex from
+  https://ftp.gnu.org/gnu/texinfo/texinfo.tex (and all GNU mirrors)
+  ftp://tug.org/tex/texinfo.tex (and all CTAN mirrors)
+  or from the gnulib project on Savannah (among other places).
+  If you have problems with the texinfo.tex in this distribution, please
+  check for a newer version.
+
+* If you're maintaining a TeX distribution and keeping the files up to
+  date yourself, you may not want to see the installation warnings.
+
   For that, run configure --disable-install-warnings, or set
   enable_install_warnings=no in the environment.
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2fe7892e36..3d79657ac8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -74,7 +74,7 @@ install-data-local:
        @echo "             texinfo.tex and txi-??.tex manually,"
        @echo "         perhaps in TEXMF/tex/texinfo/,"
        @echo "         where TEXMF is a root of your TeX tree."
-       @echo "         See doc/README for some considerations."
+       @echo "         See INSTALL for some considerations."
        @echo "         You can run make TEXMF=/your/texmf install-tex to do 
this."
        @echo
        @echo "         You may also need to install epsf.tex in"
diff --git a/doc/README b/doc/README
deleted file mode 100644
index 8e2f9d70e9..0000000000
--- a/doc/README
+++ /dev/null
@@ -1,42 +0,0 @@
-texinfo/doc/README
-
-  Copyright 2002-2021 Free Software Foundation, Inc.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-This directory contains documentation on the Texinfo system and the TeX
-sources needed to process Texinfo sources.
-
-The .tex files are not installed automatically because TeX
-installations vary so widely.  Installing them in the wrong place
-would give a false sense of security.  So to allow "\input texinfo"
-in your Texinfo files to find the correct version of texinfo.tex,
-you should simply cp *.tex to the appropriate place.
-
-If your installation follows the TeX Directory Structure
-standard (http://tug.org/tds/), this place will be the directory
-TEXMF/tex/texinfo/ for texinfo.tex, and TEXMF/tex/generic/epsf/ for
-epsf.tex, where TEXMF is a root of a TeX hierachy.
-
-It is possible to put these .tex files in a `local' place instead
-of overwriting existing ones.  You might find  where this is by running
-`kpsewhich -var-value TEXMFLOCAL'.
-
-If you add files to your TeX installations, not just replace existing
-ones, you very likely will also have to update your ls-R file; do
-this by running the mktexlsr command.
-
-For information on how or where to install files, see your TeX documentation
-in general (i.e. web2c and kpathsea manuals), and the texmf.cnf file.
-
-An alternative is to copy texinfo.tex to the same directory as your
-Texinfo manual, but this is not especially recommended.
-
-You can get the latest texinfo.tex from
-ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex (and all GNU mirrors)
-ftp://tug.org/tex/texinfo.tex (and all CTAN mirrors)
-or from the gnulib project on Savannah (among other places).
-If you have problems with the texinfo.tex in this distribution, please check
-for a newer version.