diagmac2 README update

git-svn-id: svn://tug.org/texlive/trunk@12810 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 23 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/diagmac2/README.diagmac2 b/Master/texmf-dist/doc/latex/diagmac2/README.diagmac2
index 0c40b231acd..c884f1df1fa 100644
--- a/Master/texmf-dist/doc/latex/diagmac2/README.diagmac2
+++ b/Master/texmf-dist/doc/latex/diagmac2/README.diagmac2
@@ -1,21 +1,20 @@
-diagmac2.sty is a small modification of the diagmac macros written
-by John Reynolds (http://www.cs.cmu.edu/~jcr/) in 1987 and available
-from his ftp site (ftp://ftp.cs.cmu.edu/user/jcr) since 2002. The only
-modifications to the original package is that restrictions on line
-slopes have been removed, on the assumption that the pict2e.sty package
-(http://www.ctan.org/get/macros/latex/contrib/pict2e.zip) is being
-used. The User's Manual (renamed here diagmac.txt) and the test file
-(diagmactest.tex) are as originally released by Reynolds, except for the
-replacement of
-
-\input diagmac  
-
-by
-
-\input{diagmac2.sty} 
-
-in the latter. The limitations on line slopes described in the third
-paragraph of the User's Manual can be ignored with diagmac2.
+John Reynolds's diagram macros (available from
+http://www.cs.cmu.edu/~jcr/ and at CTAN in macros/latex/contrib/misc)
+have been in use since 1987, particularly for commutative diagrams.
+Although originally written for use with latex209, they do work with
+more recent formats such as latex2e and pdflatex, but the diagmac macros
+are based on the original picture environment in latex and inherit its
+limitations on line slopes and circle diameters.
+
+diagmac2.sty is a modification of the macros to allow use of the pict2e
+package (available at CTAN in macros/latex/contrib) so that there are no
+restrictions on line slopes or circle diameters.
+
+The User's Manual (renamed here diagmac.txt) and the test file
+(diagmactest.tex) are as originally released by Reynolds. The
+limitations described in the third paragraph of the User's Manual can be
+ignored when diagmac2 is used. The diagmac2Example illustrates the use
+of line slopes that are not feasible with the original package.
 
 At Reynolds's ftp site, there is the following disclaimer:
 
@@ -23,7 +22,7 @@ At Reynolds's ftp site, there is the following disclaimer:
   many years. Acknowledgement of their usage is not necessary. However,
   neither I nor CMU accept any responsibility for the consequences of
   errors in these macros or their documentation. This is more than the
-  usual disclaimer; TEX is a beastly language for programming anything
+  usual disclaimer; TeX is a beastly language for programming anything
   complex, and I am not an expert in its use, so that there are probably
   errors lurking in the macros.
 
@@ -31,6 +30,9 @@ In fact, after more than 20 years of intensive use by dozens of
 enthusiastic users, it seems that not a single error has been
 discovered.
 
+I am interpreting Reynolds's statements as putting diagmac into the
+public domain. The licence for diagmac2.sty is LPPL.
+
 Bob Tennent
 School of Computing
 Queen's University
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index 9448bdf3685..476b5ee4da5 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -2,8 +2,8 @@ name luatex
 category TLCore
 execute BuildFormat luatex
 docpattern d texmf-dist/doc/luatex
-docpattern f texmf/doc/man/luatex.*
-docpattern f texmf/doc/man/texlua*
+docpattern f texmf/doc/man/man1/luatex.*
+docpattern f texmf/doc/man/man1/texlua*
 runpattern f texmf/fmtutil/format.luatex.cnf
 binpattern f/!hppa-hpux bin/${ARCH}/luatex
 binpattern f/!hppa-hpux bin/${ARCH}/pdfluatex