[Debian-tex-commits] SVN tex-common commit + diffs: r1925 -
tex-common/trunk/doc
Frank Küster
frank at alioth.debian.org
Fri Nov 3 13:29:29 CET 2006
Author: frank
Date: 2006-11-03 13:29:29 +0100 (Fri, 03 Nov 2006)
New Revision: 1925
Modified:
tex-common/trunk/doc/Makefile
tex-common/trunk/doc/TeX-on-Debian.sgml
Log:
- refine wording, as discussed on the list
- make Makefile more consistent
Modified: tex-common/trunk/doc/Makefile
===================================================================
--- tex-common/trunk/doc/Makefile 2006-11-03 12:21:38 UTC (rev 1924)
+++ tex-common/trunk/doc/Makefile 2006-11-03 12:29:29 UTC (rev 1925)
@@ -18,11 +18,12 @@
tex-on-debian-txt: TeX-on-Debian.sgml
debiandoc2text TeX-on-Debian.sgml
-tex-on-debian-html: TeX-on-Debian.sgml
+tex-on-debian-html: TeX-on-Debian.html
+tex-on-debian-pdf: TeX-on-Debian.pdf
+
+TeX-on-Debian.html: TeX-on-Debian.sgml
debiandoc2html TeX-on-Debian.sgml
-tex-on-debian-pdf: TeX-on-Debian.pdf
-
TeX-on-Debian.pdf: TeX-on-Debian.sgml tex-sed
debiandoc2latexpdf -s ./tex-sed TeX-on-Debian.sgml
Modified: tex-common/trunk/doc/TeX-on-Debian.sgml
===================================================================
--- tex-common/trunk/doc/TeX-on-Debian.sgml 2006-11-03 12:21:38 UTC (rev 1924)
+++ tex-common/trunk/doc/TeX-on-Debian.sgml 2006-11-03 12:29:29 UTC (rev 1925)
@@ -417,24 +417,17 @@
<ref id="sec-user-config-files"> we describe a per-user
configuration.
<p>
- These files contain configuration options from teTeX and/or
- TeX Live, possibly from you, and from other TeX-related
- packages. They are generated by scripts and should not
- &mdash in fact, except <file>texmf.cnf</file> may not &mdash
- be edited directly. Rather, you should edit the source
- files, or better add new ones.
+ The files <file>texmf.cnf</file>, <file>fmtutil.cnf</file>,
+ <file>updmap.cfg</file> and <file>language.dat</file>
+ contain configuration options from teTeX and/or TeX Live,
+ possibly from you, and from other TeX-related packages. They
+ are generated by scripts and should not &mdash in fact,
+ except <file>texmf.cnf</file> may not &mdash be edited
+ directly. Rather, you work with the source files in the
+ respective directories below <file>/etc/texmf/</file>.
</p>
<p>
- <prgn>update-texmf</prgn> is only available for root; if a
- user wants to maintain their own <file>texmf.cnf</file>,
- they can put it into <tt><var>TEXMFCONFIG</var>/web2c</tt> and must
- manually edit it. Since all <file>texmf.cnf</file> files
- are read, with earlier definitions taking precedence over
- later ones, it is best to keep only a minimal set of
- definitions in the user-specific file.
- </p>
- <p>
In order to make updates smooth, you should <em>avoid
editing</em> system-wide files as far as possible, and
instead <em>add new files</em> to change
@@ -513,13 +506,13 @@
overwritten</strong>
by <prgn>update-fmtutil</prgn>, <prgn>update-language</prgn>
and
- <prgn>update-updmap</prgn>, respectively. Furthermore, there is
- no built-in merge mechanism, these files are used on a
- first-found-first-used basis.
- Only the files in
- <file>/etc/texmf/updmap.d/</file>, <file>/etc/texmf/fmt.d/</file>
- and <file>/etc/texmf/language.d/</file> will be treated as
- configuration files.
+ <prgn>update-updmap</prgn>, respectively. Only the files
+ in <file>/etc/texmf/updmap.d/</file>, <file>/etc/texmf/fmt.d/</file>
+ and <file>/etc/texmf/language.d/</file> will be treated as
+ configuration files. Furthermore, there is no built-in
+ merge mechanism at runtime, the files <file>fmtutil.cnf</file>,
+ <file>updmap.cfg</file> and <file>language.dat</file> are
+ used on a first-found-first-used basis.
</p>
<p>
@@ -534,14 +527,13 @@
</p>
<p>
- <prgn>updmap(1)</prgn> and <prgn>updmap-sys</prgn> provide
- options for enabling or disabling font map files. When
- enabling a new map file that is not
- mentioned, <prgn>updmap</prgn> will first create or
- edit <file>10local.cfg</file> in the site-wide or
- user-specific <file>updmap.d</file> directory, as
- appropriate, and then call <prgn>update-updmap</prgn>.
- Note that <prgn>updmap</prgn>'s <tt>--edit</tt>
+ <prgn>updmap-sys(8)</prgn> provides options for enabling
+ or disabling font map files. When enabling a new map file
+ that is not mentioned, <prgn>updmap-sys</prgn> will first
+ create or edit <file>10local.cfg</file> in
+ the <file>/etc/texmf/updmap.d</file> directory and then
+ call <prgn>update-updmap</prgn>. Note
+ that <prgn>updmap-sys</prgn>'s <tt>--edit</tt>
and <tt>--syncwithtrees</tt> options cannot be used on a
Debian system.
@@ -551,33 +543,37 @@
<heading>
Per user configuration changes
</heading>
- <p>
- To override entries in the system wide configuration file
- <file>texmf.cnf</file>, a user only needs to add lines to
- <tt><var>HOME</var>/.texmf-config/web2c/texmf.cnf</tt>.
- Please only add those lines which are absolutely necessary.
+ <p>
+ <prgn>update-texmf</prgn> is only available for root; if a
+ user wants to maintain their own <file>texmf.cnf</file>,
+ they can put it into <tt><var>TEXMFCONFIG</var>/web2c</tt> and must
+ manually edit it. Since all <file>texmf.cnf</file> files
+ are read, with earlier definitions taking precedence over
+ later ones, it is best to keep only a minimal set of
+ definitions in the user-specific file.
</p>
<p>
In contrast to the above — TeX reading and merging all
<file>texmf.cnf</file> files — the <em>first</em> found occurrence of
one of the files <file>updmap.cfg</file>, <file>language.dat</file>,
- <file>fmtutil.cnf</file> are used. Thus, the other
- configuration update programs also work with files in
+ <file>fmtutil.cnf</file> are used. Thus, when called by a
+ user, the other configuration update programs also work
+ with files in
<tt><var>TEXMFCONFIG</var>/updmap.d</tt>,
<tt><var>TEXMFCONFIG</var>/fmt.d</tt> or
<tt><var>TEXMFCONFIG</var>/language.d</tt>, where
<var>TEXMFCONFIG</var> is usually
- <file><var>HOME</var>/.texmf-config</file>, combining
+ <file><var>HOME</var>/.texmf-config</file>. They combine
files in these directories with the files in the system-wide
directories &mdash naturally the user-specific ones take
precedence if the names are equal
(see <ref id="sec-user-specific-installation">) &mdash and
- dropping the respective config file into the user's
- <var>TEXMFCONFIG</var>, effectively overriding the system-wide
- config files. Note that
- changes to existing files made by packages updates will not
- be propagated to the user's files.
+ drop the respective generated file into the user's
+ <var>TEXMFVAR</var>, effectively overriding the
+ system-wide config files. Note that changes to existing
+ configuration file snippets made by package updates will
+ not be propagated to the user's files.
</p>
<sect>
@@ -944,7 +940,7 @@
<prgn>mktexlsr</prgn> or <prgn>texhash</prgn> (step 4), one has
to generate the map files in step 5. This is done by running the
program <prgn>updmap</prgn> instead of <prgn>updmap-sys</prgn>.
- The generated files are also created in directories below
+ The generated files are created in directories below
<var>TEXMFVAR</var>.
</item>
</list>
@@ -966,7 +962,7 @@
<p>
Keep in mind that you still have to call <prgn>update-updmap</prgn>
- with the above options whenever the system-wide installation
+ whenever the system-wide installation
changes. If you keep a changed copy of a file from the site-wide
directories, you need to manually merge any changes to this file, if
desired.
More information about the Debian-tex-commits
mailing list