sync with master, make header comments consistent

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

6 files changed, 16 insertions, 6 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index ecc546ef3ce..b738577c0d4 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-20  Karl Berry  <karl@tug.org>
+
+	* mktexdir,
+	* mktexupd,
+	* mktex.opt,
+	* mktexnam.opt: systematize header comments.
+
 2010-05-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpseaccess.test: Allow for unexpected test results.
diff --git a/Build/source/texk/kpathsea/mktex.opt b/Build/source/texk/kpathsea/mktex.opt
index 0e6254f2708..b1bd143e8ef 100644
--- a/Build/source/texk/kpathsea/mktex.opt
+++ b/Build/source/texk/kpathsea/mktex.opt
@@ -1,7 +1,7 @@
 # mktex.opt -- common mktex* options, etc.
 # Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set.
 # 
-# Originally written by Thomas Esser.
+# Originally written by Thomas Esser.  Public domain.
 # $Id$
  
 if test "x$1" = x--help || test "x$1" = x-help; then
diff --git a/Build/source/texk/kpathsea/mktexdir b/Build/source/texk/kpathsea/mktexdir
index 8096b8833cb..93ec4dbe5f1 100755
--- a/Build/source/texk/kpathsea/mktexdir
+++ b/Build/source/texk/kpathsea/mktexdir
@@ -1,5 +1,5 @@
 #!/bin/sh
-# mkinstalldirs --- make directory hierarchy (now mktexdir).
+# mkinstalldirs (now mktexdir) -- make directory hierarchy.
 # Author: Noah Friedman <friedman@prep.ai.mit.edu>, created: 1993-05-16.
 # Public domain.
 # 
diff --git a/Build/source/texk/kpathsea/mktexnam.opt b/Build/source/texk/kpathsea/mktexnam.opt
index 56b536ad2ab..32d98dfe5b7 100644
--- a/Build/source/texk/kpathsea/mktexnam.opt
+++ b/Build/source/texk/kpathsea/mktexnam.opt
@@ -2,6 +2,7 @@
 # Sourced from mktexnam.
 # 
 # Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
+# Public domain.
 # $Id$
 
 # Get 8.3 filenames like dpiNNN/NAME.pk.
diff --git a/Build/source/texk/kpathsea/mktexupd b/Build/source/texk/kpathsea/mktexupd
index 5124f5e34d8..54df6e0fb17 100755
--- a/Build/source/texk/kpathsea/mktexupd
+++ b/Build/source/texk/kpathsea/mktexupd
@@ -2,6 +2,8 @@
 # mktexupd -- update ls-R with a new entry.
 # 
 # Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
+# Public domain.
+# $Id$
 
 version='$Id$'
 usage="Usage: $0 DIR FILE.
diff --git a/Build/source/texk/tetex/fmtutil.cnf b/Build/source/texk/tetex/fmtutil.cnf
index 735e3ae269b..3b66b7caf41 100644
--- a/Build/source/texk/tetex/fmtutil.cnf
+++ b/Build/source/texk/tetex/fmtutil.cnf
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Mon Feb 15 03:24:46 2010
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue May 18 21:10:37 2010
 # $Id: fmtutil-hdr.cnf 13067 2009-05-12 22:04:17Z preining $
 # Originally written by Thomas Esser, 1998. Public domain.
 #
@@ -104,9 +104,9 @@ physe pdftex - physe.ini
 # from phyzzx:
 phyzzx pdftex - physe.ini
 #
-# For pTeX:
-ptex   ptex    -               --kanji=default ptex.ini
-platex ptex    language.dat    --kanji=default platex.ini
+# from ptex:
+ptex ptex - ptex.ini
+platex ptex language.ptx platex.ini
 #
 # from t2:
 #! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini