summaryrefslogtreecommitdiff
path: root/Master/texmf-doc/source
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-doc/source')
-rw-r--r--Master/texmf-doc/source/texlive/texlive-en/Makefile2
-rw-r--r--Master/texmf-doc/source/texlive/texlive-en/texlive-en.tex4
-rw-r--r--Master/texmf-doc/source/texlive/texlive-fr/Makefile5
-rw-r--r--Master/texmf-doc/source/texlive/texlive-fr/tex-live.sty2
4 files changed, 7 insertions, 6 deletions
diff --git a/Master/texmf-doc/source/texlive/texlive-en/Makefile b/Master/texmf-doc/source/texlive/texlive-en/Makefile
index 3c65981bd85..43341098535 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/Makefile
+++ b/Master/texmf-doc/source/texlive/texlive-en/Makefile
@@ -5,7 +5,7 @@ lang = english
all: pdf html
-env = TEXINPUTS=../texlive-common:; export TEXINPUTS;
+env = TEXINPUTS=../texlive-common:../texlive-en:; export TEXINPUTS;
pdf:
rm -f *.aux *.toc *.lof *.lot *.xref* *.tmp *.out
diff --git a/Master/texmf-doc/source/texlive/texlive-en/texlive-en.tex b/Master/texmf-doc/source/texlive/texlive-en/texlive-en.tex
index f2a7e39ee03..1ddafbfe1a2 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/texlive-en.tex
+++ b/Master/texmf-doc/source/texlive/texlive-en/texlive-en.tex
@@ -1492,8 +1492,8 @@ Urls for some other tools you may consider installing:
The Windows counterpart of a Unix home directory is the
\verb|%USERPROFILE%| directory. Under Windows XP and Windows 2000, this
-is usually \dirname{C:/Documents and Settings/<username>}, and under
-Windows Vista \dirname{C:/Users/<username>}. In the
+is usually \verb|C:\Documents and Settings\<username>|, and under
+Windows Vista \verb|C:\Users\<username>|. In the
\filename{texmf.cnf} file, and \KPS{} in general, \verb|~| will expand
appropriately on both Windows and Unix.
diff --git a/Master/texmf-doc/source/texlive/texlive-fr/Makefile b/Master/texmf-doc/source/texlive/texlive-fr/Makefile
index 95c8457ce86..519abf8798a 100644
--- a/Master/texmf-doc/source/texlive/texlive-fr/Makefile
+++ b/Master/texmf-doc/source/texlive/texlive-fr/Makefile
@@ -1,2 +1,5 @@
-include ../../english/texlive-en/Makefile
+include ../texlive-en/Makefile
+doc = texlive-fr
+lang = french
+
diff --git a/Master/texmf-doc/source/texlive/texlive-fr/tex-live.sty b/Master/texmf-doc/source/texlive/texlive-fr/tex-live.sty
deleted file mode 100644
index e201e6b27e6..00000000000
--- a/Master/texmf-doc/source/texlive/texlive-fr/tex-live.sty
+++ /dev/null
@@ -1,2 +0,0 @@
-\input{../../english/texlive-en/tex-live.sty}
-