aboutsummaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/Makefile2
-rw-r--r--usr.bin/at/Makefile2
-rw-r--r--usr.bin/at/at.c2
-rw-r--r--usr.bin/at/at.man2
-rw-r--r--usr.bin/at/panic.c2
-rw-r--r--usr.bin/at/parsetime.c2
-rw-r--r--usr.bin/at/perm.c2
-rw-r--r--usr.bin/calendar/calendars/calendar.all2
-rw-r--r--usr.bin/calendar/calendars/calendar.croatian2
-rw-r--r--usr.bin/calendar/calendars/calendar.german2
-rw-r--r--usr.bin/calendar/calendars/calendar.russian2
-rw-r--r--usr.bin/calendar/calendars/calendar.world2
-rw-r--r--usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all2
-rw-r--r--usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag2
-rw-r--r--usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte197
-rw-r--r--usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche32
-rw-r--r--usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur2
-rw-r--r--usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik2
-rw-r--r--usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft2
-rw-r--r--usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all2
-rw-r--r--usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici2
-rw-r--r--usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all2
-rw-r--r--usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common2
-rw-r--r--usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk2
-rw-r--r--usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox2
-rw-r--r--usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan2
-rw-r--r--usr.bin/calendar/ostern.c2
-rw-r--r--usr.bin/chat/Makefile2
-rw-r--r--usr.bin/chat/chat.82
-rw-r--r--usr.bin/chat/chat.c2
-rw-r--r--usr.bin/chpass/chpass.c2
-rw-r--r--usr.bin/chpass/pw_yp.c2
-rw-r--r--usr.bin/chpass/pw_yp.h2
-rw-r--r--usr.bin/colldef/Makefile2
-rw-r--r--usr.bin/colldef/data/Makefile2
-rw-r--r--usr.bin/colldef/parse.y2
-rw-r--r--usr.bin/colldef/scan.l2
-rw-r--r--usr.bin/compile_et/Makefile2
-rw-r--r--usr.bin/compile_et/compile_et.12
-rw-r--r--usr.bin/compile_et/compile_et.c2
-rw-r--r--usr.bin/compile_et/error_table.y2
-rw-r--r--usr.bin/compile_et/et_lex.lex.l2
-rw-r--r--usr.bin/compress/doc/revision.log8
-rw-r--r--usr.bin/cpp/cpp.sh2
-rw-r--r--usr.bin/devmenu/Makefile2
-rw-r--r--usr.bin/devmenu/devmenu.12
-rw-r--r--usr.bin/devmenu/devmenu.c2
-rw-r--r--usr.bin/devmenu/devmenu.h2
-rw-r--r--usr.bin/dig/dig.12
-rw-r--r--usr.bin/dig/dig.c2
-rw-r--r--usr.bin/ee/doc/new_curse.c4
-rw-r--r--usr.bin/ee/ee.12
-rw-r--r--usr.bin/ee/ee.c4
-rw-r--r--usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg2
-rw-r--r--usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg2
-rw-r--r--usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg2
-rw-r--r--usr.bin/fetch/fetch.12
-rw-r--r--usr.bin/fetch/main.c2
-rw-r--r--usr.bin/file/LEGAL.NOTICE2
-rw-r--r--usr.bin/file/MAINT2
-rw-r--r--usr.bin/file/Magdir/Localstuff2
-rw-r--r--usr.bin/file/Magdir/sgml2
-rw-r--r--usr.bin/file/Magdir/softquad2
-rw-r--r--usr.bin/file/Makefile2
-rw-r--r--usr.bin/file/PORTING2
-rw-r--r--usr.bin/file/README2
-rw-r--r--usr.bin/file/apprentice.c2
-rw-r--r--usr.bin/file/ascmagic.c2
-rw-r--r--usr.bin/file/compress.c2
-rw-r--r--usr.bin/file/cvsimport.sh2
-rw-r--r--usr.bin/file/file.12
-rw-r--r--usr.bin/file/file.c2
-rw-r--r--usr.bin/file/file.h2
-rw-r--r--usr.bin/file/fsmagic.c2
-rw-r--r--usr.bin/file/is_tar.c2
-rw-r--r--usr.bin/file/magic.52
-rw-r--r--usr.bin/file/names.h2
-rw-r--r--usr.bin/file/patchlevel.h5
-rw-r--r--usr.bin/file/print.c2
-rw-r--r--usr.bin/file/softmagic.c2
-rw-r--r--usr.bin/file/tar.h2
-rw-r--r--usr.bin/file2c/Makefile2
-rw-r--r--usr.bin/file2c/file2c.12
-rw-r--r--usr.bin/file2c/file2c.c2
-rw-r--r--usr.bin/gencat/Makefile2
-rw-r--r--usr.bin/getopt/Makefile2
-rw-r--r--usr.bin/host/host.12
-rw-r--r--usr.bin/host/host.c2
-rw-r--r--usr.bin/ipcrm/Makefile2
-rw-r--r--usr.bin/ipcrm/ipcrm.12
-rw-r--r--usr.bin/ipcrm/ipcrm.c2
-rw-r--r--usr.bin/ipcs/Makefile2
-rw-r--r--usr.bin/ipcs/ipcs.12
-rw-r--r--usr.bin/ipcs/ipcs.c2
-rw-r--r--usr.bin/keyinfo/keyinfo.pl2
-rw-r--r--usr.bin/killall/killall.12
-rwxr-xr-xusr.bin/killall/killall.pl2
-rw-r--r--usr.bin/ktrace/ktrace.c2
-rw-r--r--usr.bin/kzip/Makefile2
-rw-r--r--usr.bin/kzip/kzip.c2
-rw-r--r--usr.bin/lex/FlexLexer.h2
-rw-r--r--usr.bin/lex/Makefile2
-rw-r--r--usr.bin/lex/ccl.c2
-rw-r--r--usr.bin/lex/dfa.c2
-rw-r--r--usr.bin/lex/ecs.c2
-rw-r--r--usr.bin/lex/flex.skl2
-rw-r--r--usr.bin/lex/flexdef.h2
-rw-r--r--usr.bin/lex/gen.c2
-rw-r--r--usr.bin/lex/initscan.c4
-rw-r--r--usr.bin/lex/lib/Makefile2
-rw-r--r--usr.bin/lex/lib/libmain.c2
-rw-r--r--usr.bin/lex/lib/libyywrap.c2
-rw-r--r--usr.bin/lex/main.c2
-rw-r--r--usr.bin/lex/misc.c2
-rw-r--r--usr.bin/lex/nfa.c2
-rw-r--r--usr.bin/lex/parse.y2
-rw-r--r--usr.bin/lex/scan.l2
-rw-r--r--usr.bin/lex/skel.c2
-rw-r--r--usr.bin/lex/sym.c2
-rw-r--r--usr.bin/lex/tblcmp.c2
-rw-r--r--usr.bin/lex/yylex.c2
-rw-r--r--usr.bin/login/Makefile2
-rw-r--r--usr.bin/lsvfs/Makefile2
-rw-r--r--usr.bin/lsvfs/lsvfs.12
-rw-r--r--usr.bin/lsvfs/lsvfs.c2
-rw-r--r--usr.bin/m4/m4.12
-rw-r--r--usr.bin/make/Makefile2
-rw-r--r--usr.bin/make/PSD.doc/tutorial.ms2
-rw-r--r--usr.bin/make/pathnames.h2
-rw-r--r--usr.bin/make/str.c2
-rw-r--r--usr.bin/make/var.c22
-rw-r--r--usr.bin/mk_cmds/Makefile2
-rw-r--r--usr.bin/mklocale/data/Makefile2
-rw-r--r--usr.bin/modstat/Makefile2
-rw-r--r--usr.bin/modstat/modstat.82
-rw-r--r--usr.bin/modstat/modstat.c2
-rw-r--r--usr.bin/more/Makefile2
-rw-r--r--usr.bin/msgs/Makefile2
-rw-r--r--usr.bin/netstat/iso.c4
-rw-r--r--usr.bin/netstat/route.c2
-rw-r--r--usr.bin/nfsstat/nfsstat.12
-rw-r--r--usr.bin/nfsstat/nfsstat.c2
-rw-r--r--usr.bin/passwd/Makefile2
-rw-r--r--usr.bin/passwd/extern.h2
-rw-r--r--usr.bin/passwd/local_passwd.c2
-rw-r--r--usr.bin/passwd/passwd.c2
-rw-r--r--usr.bin/rdist/docmd.c2
-rw-r--r--usr.bin/rpcgen/Makefile2
-rw-r--r--usr.bin/rpcgen/rpc_clntout.c2
-rw-r--r--usr.bin/rpcgen/rpc_cout.c2
-rw-r--r--usr.bin/rpcgen/rpc_hout.c2
-rw-r--r--usr.bin/rpcgen/rpc_main.c2
-rw-r--r--usr.bin/rpcgen/rpc_parse.c2
-rw-r--r--usr.bin/rpcgen/rpc_parse.h2
-rw-r--r--usr.bin/rpcgen/rpc_scan.c2
-rw-r--r--usr.bin/rpcgen/rpc_scan.h2
-rw-r--r--usr.bin/rpcgen/rpc_svcout.c2
-rw-r--r--usr.bin/rpcgen/rpc_util.c2
-rw-r--r--usr.bin/rpcgen/rpc_util.h2
-rw-r--r--usr.bin/rpcgen/rpcgen.12
-rw-r--r--usr.bin/rpcinfo/Makefile2
-rw-r--r--usr.bin/rpcinfo/rpcinfo.82
-rw-r--r--usr.bin/rpcinfo/rpcinfo.c2
-rw-r--r--usr.bin/rsh/rsh.c2
-rw-r--r--usr.bin/rup/Makefile2
-rw-r--r--usr.bin/rup/rup.12
-rw-r--r--usr.bin/rup/rup.c2
-rw-r--r--usr.bin/ruptime/ruptime.c2
-rw-r--r--usr.bin/rusers/Makefile2
-rw-r--r--usr.bin/rusers/rusers.12
-rw-r--r--usr.bin/rusers/rusers.c2
-rw-r--r--usr.bin/rwall/Makefile2
-rw-r--r--usr.bin/rwall/rwall.12
-rw-r--r--usr.bin/rwall/rwall.c2
-rw-r--r--usr.bin/sgmlfmt/Makefile2
-rwxr-xr-xusr.bin/sgmlfmt/sgmlfmt.pl2
-rw-r--r--usr.bin/sgmls/Makefile2
-rw-r--r--usr.bin/sgmls/Makefile.inc2
-rw-r--r--usr.bin/sgmls/README2
-rw-r--r--usr.bin/sgmls/sgmls/Makefile2
-rw-r--r--usr.bin/strip/strip.c2
-rw-r--r--usr.bin/su/su.c2
-rw-r--r--usr.bin/talk/Makefile2
-rw-r--r--usr.bin/talk/get_iface.c2
-rw-r--r--usr.bin/tconv/Makefile2
-rw-r--r--usr.bin/vi/USD.doc/vi.ref/index270
-rw-r--r--usr.bin/wc/wc.c2
-rw-r--r--usr.bin/which/which.12
-rwxr-xr-xusr.bin/which/which.pl2
-rw-r--r--usr.bin/xinstall/install.12
-rw-r--r--usr.bin/xinstall/xinstall.c2
-rw-r--r--usr.bin/ypcat/Makefile2
-rw-r--r--usr.bin/ypcat/ypcat.12
-rw-r--r--usr.bin/ypmatch/Makefile2
-rw-r--r--usr.bin/ypmatch/ypmatch.12
-rw-r--r--usr.bin/ypwhich/Makefile2
196 files changed, 709 insertions, 213 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 1b730155a14a..48b1bbacac22 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.3 (Berkeley) 1/7/94
-# $Id: Makefile,v 1.52.4.4 1996/08/13 18:15:37 rgrimes Exp $
+# $Id: Makefile,v 1.52.4.5 1996/10/21 21:21:32 wosch Exp $
# XXX MISSING: deroff diction graph learn plot
# spell spline struct units xsend
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index e1e3096182e2..6eacdb0c7bb6 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1994/01/05 01:08:51 nate Exp $
+# $Id: Makefile,v 1.2 1995/04/12 02:42:22 ache Exp $
.include "${.CURDIR}/Makefile.inc"
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index d2e6e30efe5a..3f5bd0ba5e33 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -80,7 +80,7 @@
/* File scope variables */
-static char rcsid[] = "$Id: at.c,v 1.4 1995/04/27 19:27:41 ache Exp $";
+static char rcsid[] = "$Id: at.c,v 1.5 1995/05/30 06:29:21 rgrimes Exp $";
char *no_export[] =
{
"TERM", "TERMCAP", "DISPLAY", "_"
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index 21e789c01041..016cbf8f5911 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -1,4 +1,4 @@
-.\" $Id: at.man,v 1.3 1994/06/16 16:49:46 kernel Exp $
+.\" $Id: at.man,v 1.1 1995/04/12 02:42:31 ache Exp $
.Dd April 12, 1995
.Dt "AT" 1
.Os "FreeBSD 2.1"
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index 9d21e096b85c..ddd3b8abd59d 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -37,7 +37,7 @@
/* File scope variables */
-static char rcsid[] = "$Id: panic.c,v 1.2 1995/04/12 02:42:32 ache Exp $";
+static char rcsid[] = "$Id: panic.c,v 1.3 1995/05/30 06:29:23 rgrimes Exp $";
/* External variables */
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index c806eb6bbe93..6f35bc3ae8c7 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -130,7 +130,7 @@ static size_t sc_len; /* scanner - lenght of token buffer */
static int sc_tokid; /* scanner - token id */
static int sc_tokplur; /* scanner - is token plural? */
-static char rcsid[] = "$Id: parsetime.c,v 1.4 1995/05/30 06:29:25 rgrimes Exp $";
+static char rcsid[] = "$Id: parsetime.c,v 1.4.4.1 1996/09/25 12:03:27 jdp Exp $";
/* Local functions */
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 078af59269a8..13fc0c15ec2a 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -48,7 +48,7 @@
/* File scope variables */
-static char rcsid[] = "$Id: perm.c,v 1.1 1995/04/12 02:42:37 ache Exp $";
+static char rcsid[] = "$Id: perm.c,v 1.2 1995/05/30 06:29:26 rgrimes Exp $";
/* Function declarations */
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index 77856cc44a45..0c135c061069 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -1,7 +1,7 @@
/*
* International and national calendar files
*
- * $Id: calendar.all,v 1.2 1996/02/09 14:34:48 wosch Exp $
+ * $Id: calendar.all,v 1.3 1996/05/10 21:36:28 ache Exp $
*/
#ifndef _calendar_all_
diff --git a/usr.bin/calendar/calendars/calendar.croatian b/usr.bin/calendar/calendars/calendar.croatian
index 48e312075954..82b435df44a7 100644
--- a/usr.bin/calendar/calendars/calendar.croatian
+++ b/usr.bin/calendar/calendars/calendar.croatian
@@ -1,7 +1,7 @@
/*
* Croatian calendar files
*
- * $Id: calendar.croatian,v 1.2 1996/01/30 23:35:08 wosch Exp $
+ * $Id: calendar.croatian,v 1.1 1996/02/09 14:34:49 wosch Exp $
*/
#ifndef _calendar_croatian_
diff --git a/usr.bin/calendar/calendars/calendar.german b/usr.bin/calendar/calendars/calendar.german
index d45dc7ec95d4..ef13804709d3 100644
--- a/usr.bin/calendar/calendars/calendar.german
+++ b/usr.bin/calendar/calendars/calendar.german
@@ -1,7 +1,7 @@
/*
* German calendar file(s)
*
- * $Id: calendar.german,v 1.1 1996/01/29 00:32:57 wosch Exp $
+ * $Id: calendar.german,v 1.2 1996/01/30 23:35:08 wosch Exp $
*/
#ifndef _calendar_german_
diff --git a/usr.bin/calendar/calendars/calendar.russian b/usr.bin/calendar/calendars/calendar.russian
index 47f3fa9e7025..37cbd6da128e 100644
--- a/usr.bin/calendar/calendars/calendar.russian
+++ b/usr.bin/calendar/calendars/calendar.russian
@@ -1,7 +1,7 @@
/*
* Russian calendar files
*
- * $Id: calendar.croatian,v 1.1 1996/02/09 14:34:49 wosch Exp $
+ * $Id: calendar.russian,v 1.1 1996/05/10 21:36:31 ache Exp $
*/
#ifndef _calendar_russian_
diff --git a/usr.bin/calendar/calendars/calendar.world b/usr.bin/calendar/calendars/calendar.world
index 641b2b5701bc..edbdca3f64a2 100644
--- a/usr.bin/calendar/calendars/calendar.world
+++ b/usr.bin/calendar/calendars/calendar.world
@@ -1,7 +1,7 @@
/*
* World wide calendar files, except national calendars
*
- * $Id: calendar.world,v 1.1 1996/01/28 19:12:24 wosch Exp $
+ * $Id: calendar.world,v 1.1 1996/01/29 00:33:02 wosch Exp $
*/
#ifndef _calendar_world_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
index c41483c6ec9c..1882f8cf2433 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
@@ -1,7 +1,7 @@
/*
* deutscher Kalender
*
- * $Id: calendar.all,v 1.1 1996/01/29 00:34:11 wosch Exp $
+ * $Id: calendar.all,v 1.2 1996/01/30 23:36:43 wosch Exp $
*/
#ifndef _de_DE_ISO_8859_1_all_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
index e47d36a445a0..81443d87e767 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
@@ -1,7 +1,7 @@
/*
* Feiertage
*
- * $Id: calendar.feiertag,v 1.2 1996/02/02 06:05:13 wosch Exp $
+ * $Id: calendar.feiertag,v 1.3 1996/05/10 16:30:02 ache Exp $
*/
#ifndef _de_DE_ISO_8859_1_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
new file mode 100644
index 000000000000..6b5d78261685
--- /dev/null
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
@@ -0,0 +1,197 @@
+/*
+ * deutsche Geschichte
+ *
+ *
+ * Die Angaben wurden überwiegend entnommen aus dem Buch:
+ *
+ * Fragen an die deutsch Geschichte, Ideen, Kräfte, Entscheidungen von
+ * 1800 bis zur Gegenwart; historische Ausstellung im Reichstagsgebäude
+ * in Berlin; Katalog, 16. Auflage, Sonderausgabe - Bonn: Deutscher
+ * Bundestag, Referat Öffentlichkeitsarbeit, 1990
+ *
+ * English Title: Question on German history
+ *
+ * ISBN 3-924521-59-X
+ *
+ * $Id: calendar.geschichte,v 1.3 1996/05/10 16:30:05 ache Exp $
+ */
+
+#ifndef _de_DE_ISO_8859_1_geschichte_
+#define _de_DE_ISO_8859_1_geschichte_
+
+LANG=de_DE.ISO_8859-1
+
+/* 1800-1933 */
+07/11 Gründung der Rheinbundes, 1806
+10/14 Doppelschlacht bei Jena und Auerstedt, 1806
+10/16 Völkerschlacht bei Leipzig, 1813
+06/18 Niederlage Napoleons bei Waterloo, 1815
+10/18 Wartburgfest der Deutschen Burschenschaften, 1817
+01/01 Inkrafttreten des Vertrages über den deutschen. Zollverein, 1834
+12/07 erste deutsche Eisenbahn zwischen Nürnberg und Fürth, 1835
+06 Aufstand der schlesischen Weber, 1844
+12/21 Verabschiedung des Gesetzes über die Grundrechte des deutschen
+ Volkes durch die Frankfurter Nationalversammlung, 1848
+03/27 Annahme der deutschen Reichsverfassung in der Frankfurter
+ Paulskirche, Wahl von Friedrich Wilhelm IV von Preußen zum
+ deutschen Kaiser, 1849
+04/28 Ablehnung der deutschen Kaiserkrone durch den preußichen König, 1849
+07/03 Schlacht von Königgrätz
+07/13 Emser Depesche, 1870
+07/18 Verkündung des Dogmas von der päpstlichen Unfehlbarkeit
+ durch das I. Vatikanische Konzil
+01/18 Proklamation des deutschen Kaiserreiches in Versailles, 1871
+10/18 Verabschiedung des Sozialistengesetzes durch den Reichstag, 1878
+03/20 Entlassung von Bismarck als Reichskanzler und
+ preußischer Ministerpräsident, 1890
+06/21 Eröffnung des Nord-Ostsee-Kanals, 1895
+01/07 Billigung des Bürgerlichen Gesetzbuches (BGB) durch den Reichstag, 1896
+01/01 Bürgerliches Gesetzbuches tritt in Kraft, 1900
+06/28 Ermordung des österreichischen Thronfolgers Erzherzog Franz
+ Ferdinand durch serbische Nationalisten in Sarajewo, 1914
+07/28 Kriegserklärung Österreich-Ungarns an Serbien, 1914
+08/01 Deutsche Mobilmachung und Kriegserklärung an Rußland, 1914
+08/03 Deutsche Kriegserklärung an Frankreich, 1914
+08/04 Kriegserklärung Großbritaniens an Deutschland, 1914
+08/04 Bewilligung der Kriegskredite im Reichstag, 1914
+08/26 Schlacht bei Tannenberg, 1914
+02/21 Schlacht um Verdun, 1916
+03/08 Ausbruch der Revolution in Rußland, Abdankung von Zar Nikolaus II, 1917
+04/06 Kriegserklärung der USA an Deutschland
+12/15 Waffenstillstand zwisch Rußland und Deutschland, 1917
+03/03 Frieden von Brest-Litowsk, 1918
+11/03 Matrosenaufstand in Kiel, 1918
+11/09 Ausrufung der Republik durch Scheidemann (SPD), 1918
+02/11 Friedrich Ebert wird Reichspräsident, Weimar 1919
+06/28 Unterzeichnung des Versailler Vertrages, 1919
+03/21 Volksabstimmung in Oberschlesien, 1921
+04/16 Vertrag von Rapallo, 1922
+06/24 Ermordung von Reichsaußenminister Rathenau, 1922
+01/11 Besetzung des Ruhrgebietes durch Frankreich+Belgien, 1923
+09/10 Eintritt Deutschlands in den Völkerbund, 1926
+10/25 Schwarzer Freitag in New York, Beginn der Weltwirtschaftskrise, 1929
+
+
+/* II. Weltkrieg */
+10/14 Austritt auf dem Völkerbund, 1933
+03/16 Wiedereinführung der allgemeinen Wehrpflicht, 1935
+10/25 Deutsch-italienischer Vertrag, Achse Berlin-Rom, 1936
+11/25 Antikominternpakt zwischen Deutschland und Japan, 1936
+01/13 Volksabstimmung im Saargebiet über die Rückführung ins Reich, 1935
+03/12 Einmarsch deutscher Truppen in Österreich, 1938
+09/29 Münchner Abkommen, 1938
+03/15 Einmarsch deutscher Truppen in die Tschechoslowakei, 1939
+03/23 Rückgabe des Memelgebietes an Deutschland, 1939
+08/23 Abschluß des Hitler-Stalin-Paktes, 1939
+09/03 Kriegserklärung Großbritaniens und Frankreichs an Deutschland, 1939
+04/09 Besetzung Dänemarks, Invasion in Norwegen, 1940
+05/10 Deutscher Angriff auf Belgien, die Niederlande, Luxemburg
+ und Frankreich, 1940
+06/22 Angriff gegen die Sowjetunion, 1941
+12/11 Kriegserklärung Deutschlands an die USA, 1941
+01/14 Konferenz von Casablanca, 1943
+01/31 Kapitulation der 6. deutschen Armee in Stalingrad, 1943
+06/06 Alliierte Landung in Nordwestfrankreich, 1944
+02/04 Konferenz von Jalta, 4.-11.2. 1945
+04/25 Zusammentreffen von amerikanischen und sowjetischer Truppen
+ bei Torgau an der Elbe, 1945
+05/08 Bedingungslose Kapitulation von Deutschland, 1945
+07/01 Rückzug der britischen und amerikanischen Truppen aus
+ Sachsen, Thüringen und Mecklenburg, Einmarsch westlicher
+ Truppen in Berlin, 1945
+07/17 Potsdammer Konferenz, 1945
+09/01 Überfall auf Polen, Beginn des 2. Weltkrieges, 1939
+10/01 Verkündigung der Urteile im Nürnberger
+ Hauptkriegsverbrecherprozeß, 1946
+02/25 Auflösung der Landes Preußen durch den Kontrollrat, 1947
+08/06 erster Atombombenabwurf auf Hiroshima, 1945
+08/08 Atombombenabwurf auf Nagasaki, 1945
+04/19 Warschauer Ghetto Aufstand, 1943
+12/07 Japan bombardiert Pearl Harbor, 1941
+
+/* Deutschland nach dem 2. Weltkrieg */
+04/11 Attentat auf Dutschke, Studentenunruhen, 1958
+04/26 GAU in Tschernobyl
+05/05 Natobeitritt, Wiederbewaffnung, Souveränität der Bundesrepublik, 1955
+05/06 Rücktritt von Brandt, 1974
+05/16 Wahl von Schmidt (SPD) zum Bundeskanzler, 1974
+05/23 Verkündung des Grundgesetzes
+05/23 Wahl von Richard von Weizäcker zum Bundespräsidenten, 1984
+06/05 Marshallplan, 1947
+06/20 Währungsreform in den Westzonen, 1948
+06/24 Beginn der Berliner Blockade, 1948
+07/01 Wahl von Heinrich Lübke zum Bundespräsidenten, 1959
+07/01 Währungs- und Währungsunion, 1990
+08/12 deutsch-sowjetischer Gewaltverzichtsvertrag, Moskau 1970
+08/14 Wahl zum ersten deutschen Bundestag, 1949
+09/03 Vier-Mächte-Abkommen über Berlin, 1971
+09/05 Entführung und Ermordung von Arbeitgeberpräsident Schleyer, Entführung einer Lufthansa-Maschine nach Mogadischu, 1977
+09/07 DDR-Staatsratsvorsitzender Honecker in der Bundesrepublik, 1987
+09/12 Wahl von Theodor Heuss (FDP) zum Bundespräsidenten, 1949
+09/15 Wahl von Konrad Adenauer (CDU) zum Bundeskanzler, 1949
+09/17 Bruch der Sozialliberalen Koalition, 1982
+09/18 Aufnahme von Bundesrepublik und DDR in die UNO, 1993
+10/01 Ablösung von Bundeskanzler Schmidt durch Kohl, 1982
+10/23 Volksabstimmung im Saargebiet, 1955
+12/02 Washingtoner Abkommen über Bi-Zone, 1946
+12/07 deutsch-polnischer Vertrag, Warschau 1970
+12/10 Friedensnobelpreis für Brandt, 1971
+12/12 Nachrüstungsbeschluß des NATO-Ministerates, 1979
+12/21 Grundlagenvertrag zwischen DDR und Bundesrepublik, 1972
+
+
+/* Nationalsozialismus */
+11/09 Hitler-Putsch in München/Marsch auf die Feldherrenhalle, 1923
+11/09 Reichskristallnacht, 1938
+09/14 Reichstagswahl: Erdrutsch zugunsten der NSDAP, 1930
+07/31 Reichstagswahl: NSDAP wird stärkste Fraktion, 1932
+11/06 Reichstagswahl: Rückgang der NSDAP, 1932
+01/30 Ernennung von Hitler zum Reichskanzler, 1933
+02/27 Reichstagsbrand, 1933
+03/05 Reichstagswahl: Mehrheit für NSDAP+DNVP, 1933
+03/23 Annahme des Ermächtigungsgesetzes, 1933
+03/31 Erstes Gesetz zur Gleichschaltung der Länder, 1933
+04/01 Organisierter Boykott jüdischer Geschäfte, 1933
+04/07 Zweites Gesetz zur Gleichschaltung der Länder, 1933
+05/02 Auflösung der Gewerkschaften, 1933
+06 Auflösung aller Parteien außer NSDAP, 1933
+07/20 Konkordat zwischen Deutschland und dem Vatikan, 1933
+06/30 Röhm-Putsch, Ausschaltung der SA-Führung, 1934
+09/15 Nürnberger Gesetze, 1935
+01/08 Eröffnung der olympischen Spiele in Berlin, 1936
+01/20 Wannseekonferenz, 1942
+04/30 Selbstmord Hitlers, 1945
+07/29 Mussolini geboren, 1883
+
+/* Sozialismus */
+01/21 Lenin gestorben, 1924
+06 Gründung des Bundes der Kommunisten in London durch Marx+Engels, 1847
+05/23 Gründung des Allgemeinen Deutschen Arbeitervereins in Leipzig
+ unter Führung von Ferdinand Lassalles, 1863
+08/07 Gründung der Sozialdemokratischen Arbeiterpartei in Eisenach
+ unter der Führung von August Begel und Wilhelm Liebknecht, 1869
+04/06 Gründung der Unabhängigen Sozialdemokratischen Partei, Gotha 1917
+11/07 Oktoberrevolution in Rußland, Putsch der Bolschewisten, 1917
+12/31 Gründung der KPD, 1918
+01/15 Ermordung von Rosa Luxemburg und Karl Liebknecht, 1919
+03/05 Tod Stalins, 1953
+03/18 Erste demokratische Volkskammerwahl, 1990
+04/21 Zwangsvereinigung von KPD und SPD zur SED, 1946
+05/14 Gründung der Warschauer Paktes, 1955
+06/17 Arbeiteraufstand am 17. Juni 1953
+06/25 Begin der Korea-Krieges, 1950
+08/13 Bau der Berliner Mauer, 1961
+08/21 Einmarsch des Warschauer Pakts in die Tschechoslowakei, 1968
+10/03 Offizielles Ende der DDR :-)
+10/07 Gründung der DDR 1949
+10/09 Massendemonstration in Leipzig, 1989
+10/14 Kuba-Krise, 1962
+10/18 Ablösung von Erich Honecker als SED-Generalsekretär, 1989
+11/09 Fall der Berliner Mauer, 1989
+09/09 Mao Tse-Tung gestorben im Alter von 82 Jahren, 1976
+11/10 Sowjetischer Präsident Leonid Breschnew gestorben, Alter 75, 1982
+03/27 Chruschtschow wird sowjetischer Präsident, 1958
+10/12 Chruschtschow schlägt während einer Rede in der UNO mit den
+ Schuhen auf den Tisch, 1960
+
+#endif /* _de_DE_ISO_8859_1_geschichte_ */
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
new file mode 100644
index 000000000000..fcdabd10d6dd
--- /dev/null
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
@@ -0,0 +1,32 @@
+/*
+ * Kirche in Deutschland
+ *
+ * $Id: calendar.kirche,v 1.3 1996/05/10 16:30:07 ache Exp $
+ */
+
+#ifndef _de_DE_ISO_8859_1_kirche_
+#define _de_DE_ISO_8859_1_kirche_
+
+LANG=de_DE.ISO_8859-1
+
+Easter-46 Aschermittwoch
+Easter-48 Rosenmontag
+Easter-7 Palmsonntag
+
+11/Sun-3 Volkstrauertag (maybe)
+11/Sun-2 Volkstrauertag oder Totensonntag
+11/Sun-1 1. Advent oder Totensonntag
+12/Sun+1 1. oder 2. Advent
+12/Sun+2 2. oder 3. Advent
+12/Sun+3 3. oder 4. Advent
+12/Sun+4 4. Advent (maybe)
+
+12/06 Nikolaus
+12/25 1. Weihnachtstag
+12/26 2. Weihnachtstag
+
+/* Evangelische Kirche */
+11/10 Martin Luther geboren in Eisleben, 1483
+10/31 95 Thesen von Luther, Wittenberg, 1517
+
+#endif /* !_de_DE_ISO_8859_1_kirche_ */
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
index d35599c1de95..b37017903ac5 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
@@ -1,7 +1,7 @@
/*
* Literatur
*
- * $Id: calendar.literatur,v 1.2 1996/02/02 06:05:17 wosch Exp $
+ * $Id: calendar.literatur,v 1.3 1996/05/10 16:30:09 ache Exp $
*/
#ifndef _de_DE_ISO_8859_1_literatur_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
index bf0a7f33840a..a662dad7321d 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
@@ -1,7 +1,7 @@
/*
* Musik
*
- * $Id: calendar.musik,v 1.2 1996/02/02 06:05:18 wosch Exp $
+ * $Id: calendar.musik,v 1.3 1996/05/10 16:30:11 ache Exp $
*/
#ifndef _de_DE_ISO_8859_1_musik_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
index d8595710806c..1f5e2bc78e1a 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
@@ -1,7 +1,7 @@
/*
* Wissenschaft
*
- * $Id: calendar.wissenschaft,v 1.2 1996/02/02 06:05:20 wosch Exp $
+ * $Id: calendar.wissenschaft,v 1.3 1996/05/10 16:30:13 ache Exp $
*/
#ifndef _de_DE_ISO_8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
index ac50c26af730..c976208d9501 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
@@ -1,7 +1,7 @@
/*
* hrvatski calendar
*
- * $Id: calendar.croatian,v 1.2 1996/01/30 23:35:08 wosch Exp $
+ * $Id: calendar.all,v 1.1 1996/02/09 14:35:01 wosch Exp $
*/
#ifndef _hr_HR_ISO_8859_2_all
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
index ae4547c85d11..c34ad3a33a71 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
@@ -1,7 +1,7 @@
/*
* hrvatski praznici
*
- * $Id: calendar.praznici,v 1.1 1996/02/09 14:35:02 wosch Exp $
+ * $Id: calendar.praznici,v 1.2 1996/05/10 16:30:22 ache Exp $
*/
#ifndef _hr_HR_ISO_8859_2_praznici
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
index 72b2c695c58d..01cccb2b3889 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
@@ -1,7 +1,7 @@
/*
* òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
*
- * $Id: calendar.all,v 1.1 1996/02/09 14:35:01 wosch Exp $
+ * $Id: calendar.all,v 1.1 1996/05/10 21:36:45 ache Exp $
*/
#ifndef _ru_SU_KOI8_R_all
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
index fb788e1e8090..596f888c94ea 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
@@ -1,7 +1,7 @@
/*
* òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ
*
- * $Id: calendar.usholiday,v 1.4 1996/04/06 01:15:21 mpp Exp $
+ * $Id: calendar.common,v 1.1 1996/05/10 21:36:48 ache Exp $
*/
#ifndef _ru_SU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
index ba273f5fa328..1e173506663b 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
@@ -1,7 +1,7 @@
/*
* ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
*
- * $Id: calendar.usholiday,v 1.4 1996/04/06 01:15:21 mpp Exp $
+ * $Id: calendar.msk,v 1.1 1996/05/10 21:36:50 ache Exp $
*/
#ifndef _ru_SU_KOI8_R_msk_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
index 3cb125844753..583843b17b2a 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
@@ -1,7 +1,7 @@
/*
* ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
*
- * $Id: calendar.usholiday,v 1.4 1996/04/06 01:15:21 mpp Exp $
+ * $Id: calendar.orthodox,v 1.1 1996/05/10 21:36:52 ache Exp $
*/
#ifndef _ru_SU_KOI8_R_orthodox_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
index cdc1f144a79a..c6b6e849f089 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
@@ -1,7 +1,7 @@
/*
* ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
*
- * $Id: calendar.usholiday,v 1.4 1996/04/06 01:15:21 mpp Exp $
+ * $Id: calendar.pagan,v 1.1 1996/05/10 21:36:56 ache Exp $
*/
#ifndef _ru_SU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 25fbfe8edf23..4fb83e4a4594 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -1,7 +1,7 @@
/*
* Copyright (c) 1995 Wolfram Schneider. Public domain.
*
- * $Id: ostern.c,v 1.3 1996/05/10 17:32:05 ache Exp $
+ * $Id: ostern.c,v 1.4 1996/05/11 20:44:20 ache Exp $
*/
#include <stdio.h>
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index be272711406c..42df755055e7 100644
--- a/usr.bin/chat/Makefile
+++ b/usr.bin/chat/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile.bsd,v 1.2 1994/05/26 06:45:03 paulus Exp $
+# $Id: Makefile,v 1.1.1.1 1994/11/12 05:25:32 lars Exp $
PROG= chat
SRCS= chat.c
diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8
index e54f6b4ee7f8..7d8ff8b038bb 100644
--- a/usr.bin/chat/chat.8
+++ b/usr.bin/chat/chat.8
@@ -1,6 +1,6 @@
.\" -*- nroff -*-
.\" manual page [] for chat 1.8
-.\" $Id: chat.8,v 1.1.1.1 1994/11/12 05:25:32 lars Exp $
+.\" $Id: chat.8,v 1.2 1994/12/12 00:19:19 ats Exp $
.\" SH section heading
.\" SS subsection heading
.\" LP paragraph
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index 66387d63ae03..de350d7449a3 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -18,7 +18,7 @@
* (614)451-1883
*/
-static char rcsid[] = "$Id: chat.c,v 1.2 1994/12/19 01:02:11 ache Exp $";
+static char rcsid[] = "$Id: chat.c,v 1.3 1995/05/30 06:29:32 rgrimes Exp $";
#include <stdio.h>
#include <fcntl.h>
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 227fb916d74a..d244ea875226 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -40,7 +40,7 @@ static char copyright[] =
#ifndef lint
static char sccsid[] = "From: @(#)chpass.c 8.4 (Berkeley) 4/2/94";
static char rcsid[] =
- "$Id: chpass.c,v 1.3.4.2 1995/10/06 00:58:49 davidg Exp $";
+ "$Id: chpass.c,v 1.3.4.3 1996/03/17 09:03:17 joerg Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index 193fe4b52841..1bb0a8563368 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -35,7 +35,7 @@
* Center for Telecommunications Research
* Columbia University, New York City
*
- * $Id: pw_yp.c,v 1.1.2.1 1995/10/06 00:58:50 davidg Exp $
+ * $Id: pw_yp.c,v 1.1.2.2 1996/06/24 17:18:04 wpaul Exp $
*/
#ifdef YP
diff --git a/usr.bin/chpass/pw_yp.h b/usr.bin/chpass/pw_yp.h
index 13f3eee2b011..7315399dd800 100644
--- a/usr.bin/chpass/pw_yp.h
+++ b/usr.bin/chpass/pw_yp.h
@@ -35,7 +35,7 @@
* Center for Telecommunications Research
* Columbia University, New York City
*
- * $Id: pw_yp.h,v 1.2 1995/09/02 03:56:21 wpaul Exp $
+ * $Id: pw_yp.h,v 1.1.2.1 1995/10/06 00:58:51 davidg Exp $
*/
#ifdef YP
diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile
index a49e39b4459b..bcaeac6a89b1 100644
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1995/09/28 18:23:34 bde Exp $
+# $Id: Makefile,v 1.2.4.2 1995/10/06 01:07:02 davidg Exp $
PROG = colldef
LFLAGS = -8 -i
diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile
index 00b7b4707992..06a17b4494c4 100644
--- a/usr.bin/colldef/data/Makefile
+++ b/usr.bin/colldef/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1995/10/22 00:58:41 ache Exp $
+# $Id: Makefile,v 1.1 1995/11/03 14:53:50 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index 47f3cd5a1b41..35153184cbd6 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: parse.y,v 1.2 1995/01/24 11:15:47 alex Exp alex $
+ * $Id: parse.y,v 1.1.1.1 1995/02/17 17:29:50 ache Exp $
*/
#include <err.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index 3be046335080..3b9352c65cf4 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: scan.l,v 1.1 1995/01/22 20:37:31 alex Exp alex $
+ * $Id: scan.l,v 1.1.1.1 1995/02/17 17:29:50 ache Exp $
*/
#include <err.h>
diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index b03ff7801b23..f48381b9a14b 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1995/01/14 22:30:32 wollman Exp $
+# $Id: Makefile,v 1.5 1995/02/09 00:24:00 jkh Exp $
PROG= compile_et
SRCS= compile_et.c error_table.y
diff --git a/usr.bin/compile_et/compile_et.1 b/usr.bin/compile_et/compile_et.1
index df664bdacf7d..7e5358dac3e1 100644
--- a/usr.bin/compile_et/compile_et.1
+++ b/usr.bin/compile_et/compile_et.1
@@ -1,7 +1,7 @@
.\" Copyright (c) 1988 Massachusetts Institute of Technology,
.\" Student Information Processing Board. All rights reserved.
.\"
-.\" $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compile_et/compile_et.1,v 1.1 1995/01/14 22:29:30 wollman Exp $
+.\" $Header: /home/ncvs/src/usr.bin/compile_et/compile_et.1,v 1.1.4.1 1996/06/05 02:56:30 jkh Exp $
.\"
.TH COMPILE_ET 1 "22 Nov 1988" SIPB
.SH NAME
diff --git a/usr.bin/compile_et/compile_et.c b/usr.bin/compile_et/compile_et.c
index 5635df928cab..2e5ff40600d6 100644
--- a/usr.bin/compile_et/compile_et.c
+++ b/usr.bin/compile_et/compile_et.c
@@ -23,7 +23,7 @@ static const char copyright[] =
"Copyright 1987,1988 by MIT Student Information Processing Board";
static const char rcsid_compile_et_c[] =
- "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compile_et/compile_et.c,v 1.2 1995/01/14 22:29:31 wollman Exp $";
+ "$Header: /home/ncvs/src/usr.bin/compile_et/compile_et.c,v 1.2.4.1 1996/06/05 02:56:31 jkh Exp $";
#endif
extern char *gensym();
diff --git a/usr.bin/compile_et/error_table.y b/usr.bin/compile_et/error_table.y
index f584ef15d87a..76134b347e6d 100644
--- a/usr.bin/compile_et/error_table.y
+++ b/usr.bin/compile_et/error_table.y
@@ -74,7 +74,7 @@ description : QUOTED_STRING
#ifndef lint
static char const rcsid_error_table_y[] =
- "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compile_et/error_table.y,v 1.3 1995/03/15 19:05:28 wpaul Exp $";
+ "$Header: /home/ncvs/src/usr.bin/compile_et/error_table.y,v 1.3.4.1 1996/06/05 02:56:32 jkh Exp $";
#endif
void *malloc(), *realloc();
diff --git a/usr.bin/compile_et/et_lex.lex.l b/usr.bin/compile_et/et_lex.lex.l
index bffe0d4855f5..f64dbf657322 100644
--- a/usr.bin/compile_et/et_lex.lex.l
+++ b/usr.bin/compile_et/et_lex.lex.l
@@ -22,5 +22,5 @@ end return END;
. { return (*yytext); }
%%
#ifndef lint
-static char rcsid_et_lex_lex_l[] = "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compile_et/et_lex.lex.l,v 1.2 1995/01/14 22:29:33 wollman Exp $";
+static char rcsid_et_lex_lex_l[] = "$Header: /home/ncvs/src/usr.bin/compile_et/et_lex.lex.l,v 1.2.4.1 1996/06/05 02:56:33 jkh Exp $";
#endif
diff --git a/usr.bin/compress/doc/revision.log b/usr.bin/compress/doc/revision.log
index efddfbd716e3..89158b376ce7 100644
--- a/usr.bin/compress/doc/revision.log
+++ b/usr.bin/compress/doc/revision.log
@@ -1,6 +1,10 @@
/*
- * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compress/doc/revision.log,v 1.1.1.1 1994/05/27 12:30:59 rgrimes Exp $
+ * $Header: /home/ncvs/src/usr.bin/compress/doc/revision.log,v 1.1.1.1.6.1 1996/06/05 02:56:34 jkh Exp $
* $Log: revision.log,v $
+ * Revision 1.1.1.1.6.1 1996/06/05 02:56:34 jkh
+ * This 3rd mega-commit should hopefully bring us back to where we were.
+ * I can get it to `make world' succesfully, anyway!
+ *
# Revision 1.1.1.1 1994/05/27 12:30:59 rgrimes
# BSD 4.4 Lite Usr.bin Sources
#
@@ -116,4 +120,4 @@
*/
static char rcs_ident[] =
- "$Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/compress/doc/revision.log,v 1.1.1.1 1994/05/27 12:30:59 rgrimes Exp $";
+ "$Header: /home/ncvs/src/usr.bin/compress/doc/revision.log,v 1.1.1.1.6.1 1996/06/05 02:56:34 jkh Exp $";
diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh
index 34aa29eb883a..e593d45c2fbd 100644
--- a/usr.bin/cpp/cpp.sh
+++ b/usr.bin/cpp/cpp.sh
@@ -36,7 +36,7 @@
# SUCH DAMAGE.
#
# From: @(#)cpp.sh 8.1 (Berkeley) 6/6/93
-# $Id: cpp.sh,v 1.3 1994/08/23 03:52:40 jkh Exp $
+# $Id: cpp.sh,v 1.4 1994/09/05 13:58:58 bde Exp $
#
# Transitional front end to CCCP to make it behave like (Reiser) CCP:
# specifies -traditional
diff --git a/usr.bin/devmenu/Makefile b/usr.bin/devmenu/Makefile
index 225756a41ca8..631f24f932a8 100644
--- a/usr.bin/devmenu/Makefile
+++ b/usr.bin/devmenu/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/04/13 21:10:56 wollman Exp $
+# $Id: Makefile,v 1.2 1995/04/14 16:13:28 ache Exp $
PROG= devmenu
SRCS= devmenu.c devfilter.c ifmenu.c
diff --git a/usr.bin/devmenu/devmenu.1 b/usr.bin/devmenu/devmenu.1
index f277baafb345..0f89d8a4646a 100644
--- a/usr.bin/devmenu/devmenu.1
+++ b/usr.bin/devmenu/devmenu.1
@@ -26,7 +26,7 @@
.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: devmenu.1,v 1.1 1995/04/13 21:10:58 wollman Exp $
+.\" $Id: devmenu.1,v 1.2 1995/04/14 18:33:42 wollman Exp $
.Dd April 14, 1995
.Dt DEVMENU 1
.Os FreeBSD 2.1
diff --git a/usr.bin/devmenu/devmenu.c b/usr.bin/devmenu/devmenu.c
index 2e5c69beea45..802a1ebfefe9 100644
--- a/usr.bin/devmenu/devmenu.c
+++ b/usr.bin/devmenu/devmenu.c
@@ -36,7 +36,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: devmenu.c,v 1.2 1995/04/14 18:33:43 wollman Exp $";
+ "$Id: devmenu.c,v 1.3 1995/05/30 06:29:43 rgrimes Exp $";
#endif
#include <stdlib.h>
diff --git a/usr.bin/devmenu/devmenu.h b/usr.bin/devmenu/devmenu.h
index e3cf1a85b40b..ba7611de09d7 100644
--- a/usr.bin/devmenu/devmenu.h
+++ b/usr.bin/devmenu/devmenu.h
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: devmenu.h,v 1.2 1995/04/14 18:33:44 wollman Exp $
+ * $Id: devmenu.h,v 1.3 1995/05/30 06:29:44 rgrimes Exp $
*/
/* NB: must include sys/devconf.h before this file */
diff --git a/usr.bin/dig/dig.1 b/usr.bin/dig/dig.1
index 71e43749a695..10d57e0600d9 100644
--- a/usr.bin/dig/dig.1
+++ b/usr.bin/dig/dig.1
@@ -1,4 +1,4 @@
-.\" $Id: dig.1,v 1.1.1.1 1994/09/22 21:33:31 pst Exp $
+.\" $Id: dig.1,v 1.2 1994/11/19 13:12:37 ats Exp $
.\"
.\" ++Copyright++ 1993
.\" -
diff --git a/usr.bin/dig/dig.c b/usr.bin/dig/dig.c
index 0557412088d9..4b5eb0fc16bc 100644
--- a/usr.bin/dig/dig.c
+++ b/usr.bin/dig/dig.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char rcsid[] = "$Id: dig.c,v 1.4 1995/05/30 06:29:46 rgrimes Exp $";
+static char rcsid[] = "$Id: dig.c,v 1.4.4.1 1995/08/30 04:06:06 davidg Exp $";
#endif
/*
diff --git a/usr.bin/ee/doc/new_curse.c b/usr.bin/ee/doc/new_curse.c
index 9d57038e19a6..fb759958cfee 100644
--- a/usr.bin/ee/doc/new_curse.c
+++ b/usr.bin/ee/doc/new_curse.c
@@ -37,14 +37,14 @@
| Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993, 1994, 1995 Hugh Mahon
| All are rights reserved.
|
- | $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/ee/doc/new_curse.c,v 1.1.1.1 1995/08/30 07:28:06 jkh Exp $
+ | $Header: /home/ncvs/src/usr.bin/ee/doc/new_curse.c,v 1.1.1.1.2.1 1996/06/05 02:56:39 jkh Exp $
|
*/
char *copyright_message[] = { "Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993, 1994, 1995 Hugh Mahon",
"All rights are reserved."};
-char * new_curse_name= "@(#) new_curse.c $Revision: 1.1.1.1 $";
+char * new_curse_name= "@(#) new_curse.c $Revision: 1.1.1.1.2.1 $";
#include "new_curse.h"
#include <signal.h>
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index b51d9d7949db..e01b92cff6b3 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -4,7 +4,7 @@
.\"
.\" nroff -man ee.1
.\"
-.\" $Header: /home/ncvs/src/usr.bin/ee/ee.1,v 1.2 1996/01/30 13:48:39 mpp Exp $
+.\" $Header: /home/ncvs/src/usr.bin/ee/ee.1,v 1.3 1996/02/02 00:25:36 mpp Exp $
.\"
.\"
.TH ee 1 "" "" "" ""
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c
index 0556fd7322f4..922532ceddab 100644
--- a/usr.bin/ee/ee.c
+++ b/usr.bin/ee/ee.c
@@ -49,7 +49,7 @@
| proprietary information which is protected by
| copyright. All rights are reserved.
|
- | $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/ee/ee.c,v 1.3.2.2 1996/05/27 21:07:11 joerg Exp $
+ | $Header: /home/ncvs/src/usr.bin/ee/ee.c,v 1.3.2.3 1996/06/05 02:56:37 jkh Exp $
|
*/
@@ -62,7 +62,7 @@ char *ee_long_notice[] = {
"copyright. All rights are reserved."
};
-char *version = "@(#) ee, version 1.2.4 $Revision: 1.3.2.2 $";
+char *version = "@(#) ee, version 1.2.4 $Revision: 1.3.2.3 $";
#ifdef NCURSE
#include "new_curse.h"
diff --git a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
index 042bc7fd9490..65c8cd5ea7b3 100644
--- a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
$
$ For ee patchlevel 3
$
-$ $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg,v 1.1.2.1 1996/05/27 21:07:59 joerg Exp $
+$ $Header: /home/ncvs/src/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg,v 1.1.2.2 1996/06/05 02:56:41 jkh Exp $
$
$set 1
$quote "
diff --git a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
index e5cc9c770583..45a6f9e58535 100644
--- a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
$
$ For ee patchlevel 3
$
-$ $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg,v 1.1.2.1 1996/05/27 21:08:02 joerg Exp $
+$ $Header: /home/ncvs/src/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg,v 1.1.2.2 1996/06/05 02:56:43 jkh Exp $
$
$set 1
$quote "
diff --git a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
index f98bf5c64e0a..a18281493926 100644
--- a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
$
$ For ee patchlevel 3
$
-$ $Id: ee.msg,v 1.1 1995/09/09 15:06:08 jmz Exp $
+$ $Id: ee.msg,v 1.1.2.1 1996/05/27 21:08:09 joerg Exp $
$
$set 1
$quote "
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 35b743048ca6..516b83ee1137 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -1,4 +1,4 @@
-.\" $Id: fetch.1,v 1.2 1996/07/05 01:03:20 jkh Exp $
+.\" $Id: fetch.1,v 1.1.1.1.2.1 1996/07/05 01:04:10 jkh Exp $
.Dd July 2, 1996
.Dt FETCH 1
.Os
diff --git a/usr.bin/fetch/main.c b/usr.bin/fetch/main.c
index 9c1d19f36271..9624926f108d 100644
--- a/usr.bin/fetch/main.c
+++ b/usr.bin/fetch/main.c
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/
-/* $Id: main.c,v 1.1.1.1.2.3 1996/06/25 22:19:08 jkh Exp $ */
+/* $Id: main.c,v 1.1.1.1.2.4 1996/07/05 00:25:31 jmz Exp $ */
#include <stdlib.h>
#include <stdio.h>
diff --git a/usr.bin/file/LEGAL.NOTICE b/usr.bin/file/LEGAL.NOTICE
index a8255b903a12..b07d89685dc1 100644
--- a/usr.bin/file/LEGAL.NOTICE
+++ b/usr.bin/file/LEGAL.NOTICE
@@ -1,6 +1,6 @@
Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992.
Written by Ian F. Darwin and others.
-$Id: LEGAL.NOTICE,v 1.8 1993/03/17 11:35:30 ian Exp $
+$Id: LEGAL.NOTICE,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $
This software is not subject to and may not be made subject to any
license of the American Telephone and Telegraph Company (AT&T Inc.),
diff --git a/usr.bin/file/MAINT b/usr.bin/file/MAINT
index 7fc5e3637f3b..63d41b783b62 100644
--- a/usr.bin/file/MAINT
+++ b/usr.bin/file/MAINT
@@ -1,4 +1,4 @@
-$Id: MAINT,v 1.2 1993/09/23 21:47:01 christos Exp $
+$Id: MAINT,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $
Maintenance notes:
diff --git a/usr.bin/file/Magdir/Localstuff b/usr.bin/file/Magdir/Localstuff
index 224940b946e1..d4b8377faa88 100644
--- a/usr.bin/file/Magdir/Localstuff
+++ b/usr.bin/file/Magdir/Localstuff
@@ -1,3 +1,3 @@
-# $Id: Localstuff,v 1.2 1993/01/05 13:22:25 ian Exp $
+# $Id: Localstuff,v 1.1.1.1 1994/09/03 19:16:24 csgr Exp $
# Add any locally-observed files here. Remember:
# text if readable, executable if runnable binary, data if unreadable.
diff --git a/usr.bin/file/Magdir/sgml b/usr.bin/file/Magdir/sgml
index bb8b5dd43d19..db8434e33c0a 100644
--- a/usr.bin/file/Magdir/sgml
+++ b/usr.bin/file/Magdir/sgml
@@ -1,4 +1,4 @@
-# $Id: sgml,v 1.3 1993/01/05 12:52:44 ian Exp $
+# $Id: sgml,v 1.1.1.1 1994/09/03 19:16:28 csgr Exp $
# SGML goop, mostly from rph@sq.
0 string \<!DOCTYPE Exported SGML document
0 string \<!doctype Exported SGML document
diff --git a/usr.bin/file/Magdir/softquad b/usr.bin/file/Magdir/softquad
index e49d052ee7cb..deb4a14f7d6b 100644
--- a/usr.bin/file/Magdir/softquad
+++ b/usr.bin/file/Magdir/softquad
@@ -1,5 +1,5 @@
# SoftQuad Publishing Software magic numbers
-# $Id: softquad,v 1.8 1993/02/19 14:36:43 ian Exp $
+# $Id: softquad,v 1.1.1.1 1994/09/03 19:16:28 csgr Exp $
# Author/Editor and RulesBuilder
#
# XXX - byte order?
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index a0b27d20dfc7..e0f06c84c4a4 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
# Makefile for file(1) cmd.
# Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$Id: Makefile,v 1.2 1994/09/03 19:31:14 csgr Exp $
+# @(#)$Id: Makefile,v 1.3 1995/05/30 06:29:57 rgrimes Exp $
#
# This software is not subject to any license of the American Telephone
# and Telegraph Company or of the Regents of the University of California.
diff --git a/usr.bin/file/PORTING b/usr.bin/file/PORTING
index 06790e6ace03..6f62a3ef35be 100644
--- a/usr.bin/file/PORTING
+++ b/usr.bin/file/PORTING
@@ -1,5 +1,5 @@
Portability of the new file(1) command.
-@(#) $Id: PORTING,v 1.11 1993/09/23 21:47:23 christos Exp $
+@(#) $Id: PORTING,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $
Read this file only if the program doesn't compile on your system.
diff --git a/usr.bin/file/README b/usr.bin/file/README
index 2ee8e6777a40..ff11bdd2d35e 100644
--- a/usr.bin/file/README
+++ b/usr.bin/file/README
@@ -1,5 +1,5 @@
** README for file(1) Command **
-@(#) $Id: README,v 1.20 1993/09/23 21:47:01 christos Exp $
+@(#) $Id: README,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $
This is Release 3.x of Ian Darwin's (copyright but distributable)
file(1) command. Release 3.x is scheduled for inclusion in the
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 6cdacaaa6c35..9b01354ab405 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -33,7 +33,7 @@
#ifndef lint
static char *moduleid =
- "@(#)$Id: apprentice.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $";
+ "@(#)$Id: apprentice.c,v 1.2 1995/05/30 06:29:58 rgrimes Exp $";
#endif /* lint */
#define EATAB {while (isascii((unsigned char) *l) && \
diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c
index 0edb0caa7390..345e0125ee3e 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -36,7 +36,7 @@
#ifndef lint
static char *moduleid =
- "@(#)$Id: ascmagic.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $";
+ "@(#)$Id: ascmagic.c,v 1.2 1995/05/30 06:29:59 rgrimes Exp $";
#endif /* lint */
/* an optimisation over plain strcmp() */
diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c
index 1c0d824e3dfc..adf9226d10e5 100644
--- a/usr.bin/file/compress.c
+++ b/usr.bin/file/compress.c
@@ -4,7 +4,7 @@
* information if recognized
* uncompress(method, old, n, newch) - uncompress old into new,
* using method, return sizeof new
- * $Id: compress.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $
+ * $Id: compress.c,v 1.2 1995/05/30 06:30:00 rgrimes Exp $
*/
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/file/cvsimport.sh b/usr.bin/file/cvsimport.sh
index 6112e9655fcf..b801525935aa 100644
--- a/usr.bin/file/cvsimport.sh
+++ b/usr.bin/file/cvsimport.sh
@@ -3,7 +3,7 @@
# This shell script can be used in order to handle future imports
# of newer versions of file(1)
#
-# $Id$
+# $Id: cvsimport.sh,v 1.1 1994/09/03 23:08:40 csgr Exp $
if [ $# -ne 2 ] ; then
echo "usage: $0 <major> <minor>" 1>&2
exit 1
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 532116e19a14..e4c479dae107 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,5 +1,5 @@
.TH FILE 1 "Copyright but distributable"
-.\# $Id: file.1,v 1.2 1994/09/03 19:31:15 csgr Exp $
+.\# $Id: file.1,v 1.2.6.1 1996/01/30 13:59:21 mpp Exp $
.SH NAME
.I file
\- determine file type
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index 4b12a9aea4a4..9e22b8dd97c4 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -26,7 +26,7 @@
*/
#ifndef lint
static char *moduleid =
- "@(#)$Id: file.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $";
+ "@(#)$Id: file.c,v 1.2 1995/05/30 06:30:01 rgrimes Exp $";
#endif /* lint */
#include <stdio.h>
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index a92c9ffed80c..f96dc40a4aaa 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,6 +1,6 @@
/*
* file.h - definitions for file(1) program
- * @(#)$Id: file.h,v 1.1.1.1 1994/09/03 19:16:23 csgr Exp $
+ * @(#)$Id: file.h,v 1.2 1995/05/30 06:30:02 rgrimes Exp $
*
* Copyright (c) Ian F. Darwin, 1987.
* Written by Ian F. Darwin.
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index 5a66d31fbd73..005999c6b61d 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -46,7 +46,7 @@
#ifndef lint
static char *moduleid =
- "@(#)$Id: fsmagic.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $";
+ "@(#)$Id: fsmagic.c,v 1.2 1995/05/30 06:30:03 rgrimes Exp $";
#endif /* lint */
int
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index fc9cce2782b6..fff57b68c0c3 100644
--- a/usr.bin/file/is_tar.c
+++ b/usr.bin/file/is_tar.c
@@ -5,7 +5,7 @@
* Pubic Domain version written 26 Aug 1985 John Gilmore (ihnp4!hoptoad!gnu).
*
* @(#)list.c 1.18 9/23/86 Public Domain - gnu
- * $Id: is_tar.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $
+ * $Id: is_tar.c,v 1.2 1995/05/30 06:30:04 rgrimes Exp $
*
* Comments changed and some code/comments reformatted
* for file command by Ian Darwin.
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 6c6f3ef26767..34b8d4738265 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -191,4 +191,4 @@ indirect offsets.
.\" the changes I posted to the S5R2 version.
.\"
.\" Modified for Ian Darwin's version of the file command.
-.\" @(#)$Id: magic.man,v 1.11 1994/05/03 17:58:23 christos Exp $
+.\" @(#)$Id: magic.5,v 1.2 1994/09/03 19:31:16 csgr Exp $
diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h
index 5d989ee564ae..2dd46b4cc304 100644
--- a/usr.bin/file/names.h
+++ b/usr.bin/file/names.h
@@ -10,7 +10,7 @@
*
* See LEGAL.NOTICE
*
- * $Id: names.h,v 1.11 1993/09/16 21:14:20 christos Exp $
+ * $Id: names.h,v 1.1.1.1 1994/09/03 19:16:23 csgr Exp $
*/
/* these types are used to index the table 'types': keep em in sync! */
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h
index b33a113e6264..e0dff35d9256 100644
--- a/usr.bin/file/patchlevel.h
+++ b/usr.bin/file/patchlevel.h
@@ -3,9 +3,12 @@
/*
* Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.1.1.1 1994/09/03 19:16:23 csgr Exp $
+ * $Id: patchlevel.h,v 1.2 1995/05/30 06:30:06 rgrimes Exp $
*
* $Log: patchlevel.h,v $
+ * Revision 1.2 1995/05/30 06:30:06 rgrimes
+ * Remove trailing whitespace.
+ *
* Revision 1.1.1.1 1994/09/03 19:16:23 csgr
* Bring in file 3.14 by Ian Darwin (and Christos Zoulas)
*
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index 44a079eadf60..40b2cea34d47 100644
--- a/usr.bin/file/print.c
+++ b/usr.bin/file/print.c
@@ -40,7 +40,7 @@
#ifndef lint
static char *moduleid =
- "@(#)$Id: print.c,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $";
+ "@(#)$Id: print.c,v 1.2 1995/05/30 06:30:08 rgrimes Exp $";
#endif /* lint */
#define SZOF(a) (sizeof(a) / sizeof(a[0]))
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index 737e6d644800..7e7706ebad82 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -34,7 +34,7 @@
#ifndef lint
static char *moduleid =
- "@(#)$Id: softmagic.c,v 1.2 1995/05/24 02:54:30 ache Exp $";
+ "@(#)$Id: softmagic.c,v 1.3 1995/05/30 06:30:09 rgrimes Exp $";
#endif /* lint */
static int match __P((unsigned char *, int));
diff --git a/usr.bin/file/tar.h b/usr.bin/file/tar.h
index fd6f0c94f744..cca00fe3117e 100644
--- a/usr.bin/file/tar.h
+++ b/usr.bin/file/tar.h
@@ -5,7 +5,7 @@
*
* Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu.
*
- * $Id: tar.h,v 1.3 1992/09/08 15:32:41 ian Exp $ # checkin only
+ * $Id: tar.h,v 1.1.1.1 1994/09/03 19:16:23 csgr Exp $ # checkin only
*/
/*
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index f19c125af3d4..f75374164135 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1994/09/24 02:55:45 davidg Exp $
+# $Id: Makefile,v 1.1 1995/01/29 00:49:42 phk Exp $
PROG= file2c
MAN1= file2c.1
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index c2dda08198ec..3143cd2adff6 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -5,7 +5,7 @@
.\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
.\" ---------------------------------------------------------------------------
.\"
-.\" $Id$
+.\" $Id: file2c.1,v 1.1 1995/01/29 00:49:49 phk Exp $
.\"
.Dd Jan 28, 1995
.Dt FILE2C 1
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 0bad9045fcb3..904fdc0a95ae 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id$
+ * $Id: file2c.c,v 1.1 1995/01/29 00:49:57 phk Exp $
*
*/
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index b738deb5e4a7..97f6f87f83ce 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.1 1995/03/30 12:49:06 jkh Exp $
PROG= gencat
SRCS= gencat.c genlib.c
diff --git a/usr.bin/getopt/Makefile b/usr.bin/getopt/Makefile
index 2b373ee386ac..d7efd390e9be 100644
--- a/usr.bin/getopt/Makefile
+++ b/usr.bin/getopt/Makefile
@@ -1,4 +1,4 @@
-# $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/getopt/Makefile,v 1.1 1993/07/26 22:22:35 nate Exp $
+# $Header: /home/ncvs/src/usr.bin/getopt/Makefile,v 1.1.6.1 1996/06/05 02:56:45 jkh Exp $
#
PROG = getopt
diff --git a/usr.bin/host/host.1 b/usr.bin/host/host.1
index 29f941108361..aec8484b8305 100644
--- a/usr.bin/host/host.1
+++ b/usr.bin/host/host.1
@@ -50,7 +50,7 @@
.\" SOFTWARE.
.\" -
.\" --Copyright--
-.\" $Id: host.1,v 1.2 1994/09/22 21:52:02 pst Exp $
+.\" $Id: host.1,v 1.3 1994/12/12 00:23:00 ats Exp $
.TH HOST 1
.SH NAME
host \- look up host names using domain server
diff --git a/usr.bin/host/host.c b/usr.bin/host/host.c
index d505583a26ad..ce1b7f308e2f 100644
--- a/usr.bin/host/host.c
+++ b/usr.bin/host/host.c
@@ -67,7 +67,7 @@ char copyright[] =
*/
#ifndef lint
-static char rcsid[] = "$Id: host.c,v 1.3.4.1 1995/08/30 04:06:18 davidg Exp $";
+static char rcsid[] = "$Id: host.c,v 1.3.4.2 1996/01/21 20:11:54 jkh Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile
index 98fd8f84f047..29ecd7b539d0 100644
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3.2.1 1994/08/09 13:47:15 mycroft Exp $
+# $Id: Makefile,v 1.1 1994/09/13 16:52:09 dfr Exp $
PROG= ipcrm
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 19bb6e622e37..32217adf3d04 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -21,7 +21,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: ipcrm.1,v 1.1 1994/08/09 02:26:30 glass Exp $
+.\" $Id: ipcrm.1,v 1.1 1994/09/13 16:52:10 dfr Exp $
.\""
.Dd August 8th, 1994
.Dt ipcrm 1
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index ff8a99ecc6c8..14eb9333db6a 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ipcrm.c,v 1.1 1994/09/13 16:52:12 dfr Exp $
+ * $Id: ipcrm.c,v 1.2 1995/05/30 06:30:56 rgrimes Exp $
*/
#include <stdio.h>
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index eab410030ad4..0359e020742a 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1994/06/18 21:09:40 cgd Exp $
+# $Id: Makefile,v 1.2 1994/09/13 16:59:27 dfr Exp $
PROG= ipcs
BINGRP= kmem
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index a6d0344f7da9..dac9cec5cdc8 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: ipcs.1,v 1.1 1994/09/13 16:59:28 dfr Exp $
+.\" $Id: ipcs.1,v 1.2 1994/11/19 18:19:27 nate Exp $
.\"
.Dd June 18, 1994
.Dt "IPCS" 1
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 27888cae97b7..d655df3e281b 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -24,7 +24,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ipcs.c,v 1.3 1994/09/19 10:24:38 davidg Exp $
+ * $Id: ipcs.c,v 1.3.6.2 1996/06/05 02:56:46 jkh Exp $
*/
#include <stdio.h>
diff --git a/usr.bin/keyinfo/keyinfo.pl b/usr.bin/keyinfo/keyinfo.pl
index 260a72479f98..10ab9d2d3bae 100644
--- a/usr.bin/keyinfo/keyinfo.pl
+++ b/usr.bin/keyinfo/keyinfo.pl
@@ -3,7 +3,7 @@
# Search /etc/skeykeys for the skey string for this user OR user specified
# in 1st parameter.
#
-# $Id$
+# $Id: keyinfo.pl,v 1.1 1996/04/26 21:35:10 joerg Exp $
#
die "usage: keyinfo [user]\n" unless $#ARGV < 1;
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 1fb58a93a059..17b950c6ebf7 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -22,7 +22,7 @@
.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: killall.1,v 1.4 1996/05/30 22:04:05 smpatel Exp $
+.\" $Id: killall.1,v 1.3.2.1 1996/06/23 22:03:37 wosch Exp $
.\"
.Dd June 25, 1995
.Os FreeBSD 2.2
diff --git a/usr.bin/killall/killall.pl b/usr.bin/killall/killall.pl
index d91746763bc3..9f19dbae71bb 100755
--- a/usr.bin/killall/killall.pl
+++ b/usr.bin/killall/killall.pl
@@ -30,7 +30,7 @@
#
# killall - kill processes by name
#
-# $Id: killall.pl,v 1.5 1996/05/30 22:04:09 smpatel Exp $
+# $Id: killall.pl,v 1.4.2.1 1996/06/23 22:03:37 wosch Exp $
#
$ENV{'PATH'} = '/bin:/usr/bin'; # security
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index f0dd55ab1173..484d51d4fb6a 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -42,7 +42,7 @@ static char copyright[] =
static char sccsid[] = "@(#)ktrace.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
- "$Id: ktrace.c,v 1.3.4.1 1996/06/21 01:12:18 jraynard Exp $";
+ "$Id: ktrace.c,v 1.3.4.2 1996/06/30 09:42:42 joerg Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/kzip/Makefile b/usr.bin/kzip/Makefile
index 235c9b6e12bd..39901fa6f3b9 100644
--- a/usr.bin/kzip/Makefile
+++ b/usr.bin/kzip/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1995/10/06 02:42:11 peter Exp $
+# $Id: Makefile,v 1.1.4.1 1995/10/06 02:53:46 jkh Exp $
PROG= kzip
NOMAN= toobad
diff --git a/usr.bin/kzip/kzip.c b/usr.bin/kzip/kzip.c
index b5ec7f1e2148..dd589577f179 100644
--- a/usr.bin/kzip/kzip.c
+++ b/usr.bin/kzip/kzip.c
@@ -9,7 +9,7 @@
* Copyright (C) 1993 Hannu Savolainen
* Ported to 386bsd by Serge Vakulenko
* based on tools/build.c by Linus Torvalds
- * $Id: kzip.c,v 1.4 1995/10/06 02:42:15 peter Exp $
+ * $Id: kzip.c,v 1.3.4.1 1995/10/06 02:53:48 jkh Exp $
*
*/
diff --git a/usr.bin/lex/FlexLexer.h b/usr.bin/lex/FlexLexer.h
index 48d1369d5913..0cf7ad9b1b3d 100644
--- a/usr.bin/lex/FlexLexer.h
+++ b/usr.bin/lex/FlexLexer.h
@@ -1,4 +1,4 @@
-// $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/FlexLexer.h,v 1.1.1.1 1994/08/24 13:10:33 csgr Exp $
+// $Header: /home/ncvs/src/usr.bin/lex/FlexLexer.h,v 1.1.1.1.6.1 1996/06/05 02:56:48 jkh Exp $
// FlexLexer.h -- define classes for lexical analyzers generated by flex
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 41d4afddceb7..db6787c35262 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1994/08/24 13:10:33 csgr Exp $
+# $Id: Makefile,v 1.2 1994/08/27 09:52:30 csgr Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
diff --git a/usr.bin/lex/ccl.c b/usr.bin/lex/ccl.c
index 8a1e2784655c..c4b0c2b64014 100644
--- a/usr.bin/lex/ccl.c
+++ b/usr.bin/lex/ccl.c
@@ -26,7 +26,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/ccl.c,v 1.2 1995/05/30 06:31:06 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/ccl.c,v 1.2.4.1 1996/06/05 02:56:49 jkh Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c
index 62ffa0c7f6b2..077cdf68835a 100644
--- a/usr.bin/lex/dfa.c
+++ b/usr.bin/lex/dfa.c
@@ -26,7 +26,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/dfa.c,v 1.2 1995/05/30 06:31:08 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/dfa.c,v 1.2.4.1 1996/06/05 02:56:50 jkh Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c
index e186b2794f44..70c3a6c115e4 100644
--- a/usr.bin/lex/ecs.c
+++ b/usr.bin/lex/ecs.c
@@ -26,7 +26,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/ecs.c,v 1.2 1995/05/30 06:31:09 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/ecs.c,v 1.2.4.1 1996/06/05 02:56:51 jkh Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
index 92f909981a7f..054779b1cb55 100644
--- a/usr.bin/lex/flex.skl
+++ b/usr.bin/lex/flex.skl
@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/flex.skl,v 1.1.1.1 1994/08/24 13:10:33 csgr Exp $
+ * $Header: /home/ncvs/src/usr.bin/lex/flex.skl,v 1.1.1.1.6.1 1996/06/05 02:56:51 jkh Exp $
*/
#define FLEX_SCANNER
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
index d2fc16bb5c3b..2ddc6476d6f3 100644
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@@ -26,7 +26,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* @(#) $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/flexdef.h,v 1.2 1995/05/30 06:31:12 rgrimes Exp $ (LBL) */
+/* @(#) $Header: /home/ncvs/src/usr.bin/lex/flexdef.h,v 1.2.4.1 1996/06/05 02:56:52 jkh Exp $ (LBL) */
#include <stdio.h>
#include <ctype.h>
diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c
index 7d06703ed8a0..4c68b4bd7487 100644
--- a/usr.bin/lex/gen.c
+++ b/usr.bin/lex/gen.c
@@ -26,7 +26,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/gen.c,v 1.2 1995/05/30 06:31:13 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/gen.c,v 1.2.4.1 1996/06/05 02:56:54 jkh Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index 70a1237238d3..6b61e4171826 100644
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/initscan.c,v 1.2 1995/05/30 06:31:14 rgrimes Exp $
+ * $Header: /home/ncvs/src/usr.bin/lex/initscan.c,v 1.2.4.1 1996/06/05 02:56:55 jkh Exp $
*/
#define FLEX_SCANNER
@@ -894,7 +894,7 @@ char *yytext;
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/initscan.c,v 1.2 1995/05/30 06:31:14 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/initscan.c,v 1.2.4.1 1996/06/05 02:56:55 jkh Exp $ */
#include "flexdef.h"
#include "parse.h"
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index 689b46018e79..bbc7c7c704d3 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1994/08/24 13:10:34 csgr Exp $
+# $Id: Makefile,v 1.2 1994/08/25 23:11:07 wollman Exp $
LIB= ln
SRCS= libmain.c libyywrap.c
diff --git a/usr.bin/lex/lib/libmain.c b/usr.bin/lex/lib/libmain.c
index a7efd3abdcc3..e0cdb24716be 100644
--- a/usr.bin/lex/lib/libmain.c
+++ b/usr.bin/lex/lib/libmain.c
@@ -1,6 +1,6 @@
/* libmain - flex run-time support library "main" function */
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/lib/libmain.c,v 1.1.1.1 1994/08/24 13:10:34 csgr Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/lib/libmain.c,v 1.1.1.1.6.1 1996/06/05 02:57:09 jkh Exp $ */
extern int yylex();
diff --git a/usr.bin/lex/lib/libyywrap.c b/usr.bin/lex/lib/libyywrap.c
index c14876b47fb0..65af0c01e74d 100644
--- a/usr.bin/lex/lib/libyywrap.c
+++ b/usr.bin/lex/lib/libyywrap.c
@@ -1,6 +1,6 @@
/* libyywrap - flex run-time support library "yywrap" function */
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/lib/libyywrap.c,v 1.1.1.1 1994/08/24 13:10:34 csgr Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/lib/libyywrap.c,v 1.1.1.1.6.1 1996/06/05 02:57:10 jkh Exp $ */
int yywrap()
{
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index 116901b91018..2e8e8f777492 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -32,7 +32,7 @@ char copyright[] =
All rights reserved.\n";
#endif /* not lint */
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/main.c,v 1.2 1995/05/30 06:31:15 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/main.c,v 1.2.4.1 1996/06/05 02:56:56 jkh Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
index 37889e50438a..f9924bb1644c 100644
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@@ -26,7 +26,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/misc.c,v 1.2 1995/05/30 06:31:16 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/misc.c,v 1.2.4.1 1996/06/05 02:56:57 jkh Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c
index 5007b8ca9f08..e2ec58dfc6b9 100644
--- a/usr.bin/lex/nfa.c
+++ b/usr.bin/lex/nfa.c
@@ -26,7 +26,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/nfa.c,v 1.2 1995/05/30 06:31:17 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/nfa.c,v 1.2.4.1 1996/06/05 02:56:59 jkh Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/parse.y b/usr.bin/lex/parse.y
index 4cd4db9dc3d8..3868e9d743b9 100644
--- a/usr.bin/lex/parse.y
+++ b/usr.bin/lex/parse.y
@@ -29,7 +29,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/parse.y,v 1.1.1.1 1994/08/24 13:10:32 csgr Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/parse.y,v 1.1.1.1.6.1 1996/06/05 02:57:00 jkh Exp $ */
/* Some versions of bison are broken in that they use alloca() but don't
diff --git a/usr.bin/lex/scan.l b/usr.bin/lex/scan.l
index 59742c56c615..ceea1269c87b 100644
--- a/usr.bin/lex/scan.l
+++ b/usr.bin/lex/scan.l
@@ -27,7 +27,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/scan.l,v 1.1.1.1 1994/08/24 13:10:31 csgr Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/scan.l,v 1.1.1.1.6.1 1996/06/05 02:57:01 jkh Exp $ */
#include "flexdef.h"
#include "parse.h"
diff --git a/usr.bin/lex/skel.c b/usr.bin/lex/skel.c
index f7030209758d..f1b6f96b6edf 100644
--- a/usr.bin/lex/skel.c
+++ b/usr.bin/lex/skel.c
@@ -6,7 +6,7 @@ char *skel[] = {
"/* A lexical scanner generated by flex */",
"",
"/* Scanner skeleton version:",
- " * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/skel.c,v 1.1.1.1 1994/08/24 13:10:31 csgr Exp $",
+ " * $Header: /home/ncvs/src/usr.bin/lex/skel.c,v 1.1.1.1.6.1 1996/06/05 02:57:02 jkh Exp $",
" */",
"",
"#define FLEX_SCANNER",
diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c
index fde1ef4236c4..da0806f7ec23 100644
--- a/usr.bin/lex/sym.c
+++ b/usr.bin/lex/sym.c
@@ -26,7 +26,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/sym.c,v 1.2 1995/05/30 06:31:18 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/sym.c,v 1.2.4.1 1996/06/05 02:57:03 jkh Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c
index d5185ebea4be..e5b9b8696e5e 100644
--- a/usr.bin/lex/tblcmp.c
+++ b/usr.bin/lex/tblcmp.c
@@ -26,7 +26,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/tblcmp.c,v 1.2 1995/05/30 06:31:19 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/tblcmp.c,v 1.2.4.1 1996/06/05 02:57:04 jkh Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c
index 0c915447512b..b655fe6c9b7e 100644
--- a/usr.bin/lex/yylex.c
+++ b/usr.bin/lex/yylex.c
@@ -26,7 +26,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/lex/yylex.c,v 1.2 1995/05/30 06:31:20 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/usr.bin/lex/yylex.c,v 1.2.4.1 1996/06/05 02:57:04 jkh Exp $ */
#include <ctype.h>
#include "flexdef.h"
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 9b9a7edae610..a456258a1f02 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 7/19/93
-# $Id: Makefile,v 1.12 1995/03/18 17:18:15 nate Exp $
+# $Id: Makefile,v 1.13 1995/05/30 06:31:25 rgrimes Exp $
PROG= login
MAN1= login.1
diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile
index 3b25443ca3a2..b41f380b4c45 100644
--- a/usr.bin/lsvfs/Makefile
+++ b/usr.bin/lsvfs/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.1 1994/09/22 01:25:55 wollman Exp $
PROG= lsvfs
.include <bsd.prog.mk>
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index 703a620f517c..403f826d1b9e 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -1,4 +1,4 @@
-.\" $Id: lsvfs.1,v 1.2 1995/03/16 18:37:46 wollman Exp $
+.\" $Id: lsvfs.1,v 1.2.4.1 1996/01/30 13:59:58 mpp Exp $
.\" Garrett A. Wollman, September 1994
.\" This file is in the public domain.
.\"
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index ccfc03877b7a..afa7ce77bc73 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -3,7 +3,7 @@
* Garrett A. Wollman, September 1994
* This file is in the public domain.
*
- * $Id: lsvfs.c,v 1.4 1995/03/16 20:29:11 wollman Exp $
+ * $Id: lsvfs.c,v 1.5 1995/03/16 21:43:03 wollman Exp $
*/
#include <sys/types.h>
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 53180191e8f5..9f7f2055db82 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
.\"
-.\" @(#) $Id: m4.1,v 1.4 1994/01/16 00:30:31 swallace Exp $
+.\" @(#) $Id: m4.1,v 1.1 1994/08/11 01:06:29 jkh Exp $
.\"
.Dd January 26, 1993
.Dt m4 1
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index c28b6f840dce..d9986d2a1a07 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.2 (Berkeley) 12/28/90
-# $Id: Makefile,v 1.4 1995/06/16 22:46:38 ache Exp $
+# $Id: Makefile,v 1.3.4.1 1995/08/08 04:00:16 ache Exp $
PROG= make
CFLAGS+= -I${.CURDIR} -DPOSIX -DSYSVINCLUDE
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index eca49d947383..05da5603b4f2 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -43,7 +43,7 @@
.\" is numeric, it is taken as the depth for numbering (as for .NH), else
.\" the default (1) is assumed.
.\"
-.\" $Id: tutorial.ms,v 1.4 89/01/08 20:20:22 adam Exp Locker: adam $
+.\" $Id: tutorial.ms,v 1.1.1.1 1994/05/27 12:32:16 rgrimes Exp $
.\"
.\" @P The initial paragraph distance.
.\" @Q The piece of section number to increment (or 0 if none given)
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index 2c25ead53ed5..b6ec1100dcdd 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 5.2 (Berkeley) 6/1/90
- * $Id: pathnames.h,v 1.2 1993/08/01 18:11:58 mycroft Exp $
+ * $Id: pathnames.h,v 1.2 1995/01/23 21:01:52 jkh Exp $
*/
#define _PATH_OBJDIR "obj"
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 41dd195d8946..14adcbb27ffa 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -38,7 +38,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)str.c 5.8 (Berkeley) 6/1/90"; */
-static char *rcsid = "$Id: str.c,v 1.5 1995/06/18 12:34:12 ache Exp $";
+static char *rcsid = "$Id: str.c,v 1.4.4.1 1995/08/08 04:00:29 ache Exp $";
#endif /* not lint */
#include "make.h"
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 851a80ccd4c2..c0c9c36982ad 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -147,7 +147,6 @@ typedef struct {
#define VAR_SUB_GLOBAL 1 /* Apply substitution globally */
#define VAR_MATCH_START 2 /* Match at start of word */
#define VAR_MATCH_END 4 /* Match at end of word */
-#define VAR_NO_SUB 8 /* Substitution is non-global and already done */
} VarPattern;
static int VarCmp __P((ClientData, ClientData));
@@ -883,9 +882,9 @@ VarSubstitute (word, addSpace, buf, patternp)
VarPattern *pattern = (VarPattern *) patternp;
wordLen = strlen(word);
- if ((pattern->flags & VAR_NO_SUB) == 0) {
+ if (1) { /* substitute in each word of the variable */
/*
- * Still substituting -- break it down into simple anchored cases
+ * Break substitution down into simple anchored cases
* and if none of them fits, perform the general substitution case.
*/
if ((pattern->flags & VAR_MATCH_START) &&
@@ -967,7 +966,7 @@ VarSubstitute (word, addSpace, buf, patternp)
* Pattern is unanchored: search for the pattern in the word using
* String_FindSubstring, copying unmatched portions and the
* right-hand-side for each match found, handling non-global
- * subsititutions correctly, etc. When the loop is done, any
+ * substitutions correctly, etc. When the loop is done, any
* remaining part of the word (word and wordLen are adjusted
* accordingly through the loop) is copied straight into the
* buffer.
@@ -990,13 +989,9 @@ VarSubstitute (word, addSpace, buf, patternp)
Buf_AddBytes(buf, pattern->rightLen, (Byte *)pattern->rhs);
wordLen -= (cp - word) + pattern->leftLen;
word = cp + pattern->leftLen;
- if (wordLen == 0) {
+ if (wordLen == 0 || (pattern->flags & VAR_SUB_GLOBAL) == 0){
done = TRUE;
}
- if ((pattern->flags & VAR_SUB_GLOBAL) == 0) {
- done = TRUE;
- pattern->flags |= VAR_NO_SUB;
- }
} else {
done = TRUE;
}
@@ -1015,14 +1010,9 @@ VarSubstitute (word, addSpace, buf, patternp)
return ((Buf_Size(buf) != origSize) || addSpace);
}
/*
- * Common code for anchored substitutions: if performed a substitution
- * and it's not supposed to be global, mark the pattern as requiring
- * no more substitutions. addSpace was set TRUE if characters were
- * added to the buffer.
+ * Common code for anchored substitutions:
+ * addSpace was set TRUE if characters were added to the buffer.
*/
- if ((pattern->flags & VAR_SUB_GLOBAL) == 0) {
- pattern->flags |= VAR_NO_SUB;
- }
return (addSpace);
}
nosub:
diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile
index a240c05b1fa5..ef9a00e688a8 100644
--- a/usr.bin/mk_cmds/Makefile
+++ b/usr.bin/mk_cmds/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.1 1995/01/19 22:27:57 wollman Exp $
PROG= mk_cmds
#
diff --git a/usr.bin/mklocale/data/Makefile b/usr.bin/mklocale/data/Makefile
index fb6161fedf1b..413c7767eaa8 100644
--- a/usr.bin/mklocale/data/Makefile
+++ b/usr.bin/mklocale/data/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.2 1995/11/03 14:51:45 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/modstat/Makefile b/usr.bin/modstat/Makefile
index 22ba7a6b7198..cbf1eb73d105 100644
--- a/usr.bin/modstat/Makefile
+++ b/usr.bin/modstat/Makefile
@@ -33,7 +33,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: Makefile,v 1.1 1994/08/19 12:14:02 davidg Exp $
+# $Id: Makefile,v 1.1.6.2 1996/06/05 02:57:14 jkh Exp $
#
PROG= modstat
diff --git a/usr.bin/modstat/modstat.8 b/usr.bin/modstat/modstat.8
index 99667e261489..68f9b77e0ab4 100644
--- a/usr.bin/modstat/modstat.8
+++ b/usr.bin/modstat/modstat.8
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: modstat.8,v 1.1 1994/08/19 12:14:04 davidg Exp $
+.\" $Id: modstat.8,v 1.2 1994/08/19 13:38:29 davidg Exp $
.\"
.Dd June 7, 1993
.Dt MODSTAT 8
diff --git a/usr.bin/modstat/modstat.c b/usr.bin/modstat/modstat.c
index 956acf424bfc..932c517a5570 100644
--- a/usr.bin/modstat/modstat.c
+++ b/usr.bin/modstat/modstat.c
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: modstat.c,v 1.2 1995/04/18 02:19:17 wpaul Exp $
+ * $Id: modstat.c,v 1.3 1995/04/20 05:08:53 wpaul Exp $
*/
#include <stdio.h>
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index 534d1608fc76..573ea127e53b 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id$
+# $Id: Makefile,v 1.3 1995/02/21 03:46:45 wollman Exp $
PROG= more
CFLAGS+=-I${.CURDIR} -DTERMIOS
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 8613f79cb5ea..922893f5d2e5 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id$
+# $Id: Makefile,v 1.3 1995/02/21 04:15:13 wollman Exp $
PROG= msgs
DPADD= ${LIBTERMCAP}
diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c
index 72fbf3266601..78b42165a9d0 100644
--- a/usr.bin/netstat/iso.c
+++ b/usr.bin/netstat/iso.c
@@ -36,8 +36,8 @@ static char sccsid[] = "@(#)iso.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
/*
- * $Header: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/netstat/iso.c,v 1.2 1995/04/09 05:33:17 davidg Exp $
- * $Source: /pub/FreeBSD/FreeBSD-CVS/src/usr.bin/netstat/iso.c,v $
+ * $Header: /home/ncvs/src/usr.bin/netstat/iso.c,v 1.2.4.1 1996/06/05 02:57:17 jkh Exp $
+ * $Source: /home/ncvs/src/usr.bin/netstat/iso.c,v $
*/
/*******************************************************************************
Copyright IBM Corporation 1987
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index e3331db1489d..d8a8b08bd7f6 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -36,7 +36,7 @@
static char sccsid[] = "From: @(#)route.c 8.6 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$Id: route.c,v 1.5 1995/05/30 06:32:53 rgrimes Exp $";
+ "$Id: route.c,v 1.5.4.1 1996/06/24 00:13:50 peter Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 9e778c7aec87..6ce86578b97c 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)nfsstat.1 8.1 (Berkeley) 6/6/93
-.\" $Id$
+.\" $Id: nfsstat.1,v 1.3 1994/10/23 23:25:42 wollman Exp $
.\"
.Dd June 6, 1993
.Dt NFSSTAT 1
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 169e8d10d463..f386f1f0ed3b 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -43,7 +43,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "From: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93";*/
static const char rcsid[] =
- "$Id$";
+ "$Id: nfsstat.c,v 1.2 1994/10/23 23:25:43 wollman Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 511b2c432f55..2d9734fc1bba 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.3 (Berkeley) 4/2/94
-# $Id: Makefile,v 1.18 1995/09/14 21:02:16 gibbs Exp $
+# $Id: Makefile,v 1.14.2.3 1995/10/06 01:58:43 davidg Exp $
PROG= passwd
SRCS= local_passwd.c yp_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c
diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h
index 7a4bd127c98d..43c2d8e6ab26 100644
--- a/usr.bin/passwd/extern.h
+++ b/usr.bin/passwd/extern.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)extern.h 8.1 (Berkeley) 4/2/94
- * $Id$
+ * $Id: extern.h,v 1.2 1995/01/20 22:03:36 wollman Exp $
*/
int krb_passwd __P((char *, char *, char *, char *));
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index 15d916d193c2..d1f371dc4b38 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: local_passwd.c,v 1.8 1995/12/16 09:45:12 markm Exp $
+ * $Id: local_passwd.c,v 1.2.6.4 1996/02/07 15:10:16 peter Exp $
*/
#ifndef lint
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index ff1e1861a459..5c2dea57746f 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -40,7 +40,7 @@ static char copyright[] =
#ifndef lint
static char sccsid[] = "From: @(#)passwd.c 8.3 (Berkeley) 4/2/94";
static const char rcsid[] =
- "$Id: passwd.c,v 1.6 1995/09/02 04:02:27 wpaul Exp $";
+ "$Id: passwd.c,v 1.3.4.2 1995/10/06 01:58:45 davidg Exp $";
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index b963e8bf64a6..b94d41261236 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -34,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "From: @(#)docmd.c 8.1 (Berkeley) 6/9/93";*/
static const char rcsid[] =
- "$Id: docmd.c,v 1.4 1996/07/12 04:00:13 nate Exp $";
+ "$Id: docmd.c,v 1.3.4.1 1996/07/12 06:19:46 pst Exp $";
#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile
index 3379b2751b15..5769095e68a1 100644
--- a/usr.bin/rpcgen/Makefile
+++ b/usr.bin/rpcgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1994/08/07 18:01:27 wollman Exp $
+# $Id: Makefile,v 1.2 1995/05/30 06:33:08 rgrimes Exp $
PROG= rpcgen
SRCS= rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c rpc_parse.c rpc_scan.c \
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index b410fa311832..d8606db9054a 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -29,7 +29,7 @@
*/
#ifndef lint
/*static char sccsid[] = "from: @(#)rpc_clntout.c 1.2 87/06/24 (C) 1987 SMI";*/
-static char rcsid[] = "$Id: rpc_clntout.c,v 1.1 1994/08/07 18:01:28 wollman Exp $";
+static char rcsid[] = "$Id: rpc_clntout.c,v 1.2 1995/05/30 06:33:09 rgrimes Exp $";
#endif
/*
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 734b2d2cca54..ef08944e44e4 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -29,7 +29,7 @@
*/
#ifndef lint
/*static char sccsid[] = "from: @(#)rpc_cout.c 1.8 87/06/24 (C) 1987 SMI";*/
-static char rcsid[] = "$Id: rpc_cout.c,v 1.1 1994/08/07 18:01:29 wollman Exp $";
+static char rcsid[] = "$Id: rpc_cout.c,v 1.2 1995/05/30 06:33:10 rgrimes Exp $";
#endif
/*
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index 9c2cd4edca74..3a51bae50790 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -29,7 +29,7 @@
*/
#ifndef lint
/*static char sccsid[] = "from: @(#)rpc_hout.c 1.6 87/07/28 (C) 1987 SMI";*/
-static char rcsid[] = "$Id: rpc_hout.c,v 1.1 1994/08/07 18:01:30 wollman Exp $";
+static char rcsid[] = "$Id: rpc_hout.c,v 1.2 1995/05/30 06:33:11 rgrimes Exp $";
#endif
static int pconstdef(), pstructdef(), puniondef(), pdefine(), pprogramdef(),
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 1344eb4277a7..40a9e2d31898 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -29,7 +29,7 @@
*/
#ifndef lint
/*static char sccsid[] = "from: @(#)rpc_main.c 1.7 87/06/24 (C) 1987 SMI";*/
-static char rcsid[] = "$Id: rpc_main.c,v 1.2 1995/03/04 17:47:49 nate Exp $";
+static char rcsid[] = "$Id: rpc_main.c,v 1.3 1995/05/30 06:33:12 rgrimes Exp $";
#endif
/*
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index d042b586ba8c..8022105cbfb8 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -29,7 +29,7 @@
*/
#ifndef lint
/*static char sccsid[] = "from: @(#)rpc_parse.c 1.4 87/04/28 (C) 1987 SMI";*/
-static char rcsid[] = "$Id: rpc_parse.c,v 1.2 1995/05/15 00:03:32 ache Exp $";
+static char rcsid[] = "$Id: rpc_parse.c,v 1.3 1995/05/30 06:33:14 rgrimes Exp $";
#endif
/*
diff --git a/usr.bin/rpcgen/rpc_parse.h b/usr.bin/rpcgen/rpc_parse.h
index 38b8644b8406..25e203daba9e 100644
--- a/usr.bin/rpcgen/rpc_parse.h
+++ b/usr.bin/rpcgen/rpc_parse.h
@@ -27,7 +27,7 @@
* Mountain View, California 94043
*
* from: @(#)rpc_parse.h 1.3 87/03/09 (C) 1987 SMI
- * $Id: rpc_parse.h,v 1.1 1994/08/07 18:01:33 wollman Exp $
+ * $Id: rpc_parse.h,v 1.2 1995/05/30 06:33:14 rgrimes Exp $
*/
/*
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index 6450ab25a6d2..ecddaad88f22 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -29,7 +29,7 @@
*/
#ifndef lint
/*static char sccsid[] = "from: @(#)rpc_scan.c 1.6 87/06/24 (C) 1987 SMI";*/
-static char rcsid[] = "$Id: rpc_scan.c,v 1.1 1994/08/07 18:01:34 wollman Exp $";
+static char rcsid[] = "$Id: rpc_scan.c,v 1.2 1995/05/30 06:33:15 rgrimes Exp $";
#endif
/*
diff --git a/usr.bin/rpcgen/rpc_scan.h b/usr.bin/rpcgen/rpc_scan.h
index 579df0f705f3..a6e67bd97d0b 100644
--- a/usr.bin/rpcgen/rpc_scan.h
+++ b/usr.bin/rpcgen/rpc_scan.h
@@ -28,7 +28,7 @@
*
* from: @(#)rpc_scan.h 1.3 87/03/09 (C) 1987 SMI
* from: @(#)rpc_scan.h 2.1 88/08/01 4.0 RPCSRC
- * $Id: rpc_scan.h,v 1.1 1994/08/07 18:01:35 wollman Exp $
+ * $Id: rpc_scan.h,v 1.2 1995/05/30 06:33:18 rgrimes Exp $
*/
/*
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index c27fff06b665..06558ad40a7b 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -29,7 +29,7 @@
*/
#ifndef lint
/*static char sccsid[] = "from: @(#)rpc_svcout.c 1.6 87/06/24 (C) 1987 SMI";*/
-static char rcsid[] = "$Id: rpc_svcout.c,v 1.2 1995/03/04 17:47:50 nate Exp $";
+static char rcsid[] = "$Id: rpc_svcout.c,v 1.3 1995/05/30 06:33:20 rgrimes Exp $";
#endif
/*
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index fb3307d158c1..c2e4db138a35 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -29,7 +29,7 @@
*/
#ifndef lint
/*static char sccsid[] = "from: @(#)rpc_util.c 1.5 87/06/24 (C) 1987 SMI";*/
-static char rcsid[] = "$Id: rpc_util.c,v 1.1 1994/08/07 18:01:37 wollman Exp $";
+static char rcsid[] = "$Id: rpc_util.c,v 1.2 1995/05/30 06:33:21 rgrimes Exp $";
#endif
/*
diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h
index 8aeea3516ccb..3d655af22b1a 100644
--- a/usr.bin/rpcgen/rpc_util.h
+++ b/usr.bin/rpcgen/rpc_util.h
@@ -28,7 +28,7 @@
*
* from: @(#)rpc_util.h 1.6 87/06/24 (C) 1987 SMI
* from: @(#)rpc_util.h 2.1 88/08/01 4.0 RPCSRC
- * $Id: rpc_util.h,v 1.1 1994/08/07 18:01:38 wollman Exp $
+ * $Id: rpc_util.h,v 1.2 1995/05/30 06:33:22 rgrimes Exp $
*/
/*
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index 5fd9274c740f..dd40fc8003c9 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,5 +1,5 @@
.\" from: @(#)rpcgen.1 2.2 88/08/02 4.0 RPCSRC
-.\" $Id: rpcgen.1,v 1.1 1993/09/13 23:20:21 jtc Exp $
+.\" $Id: rpcgen.1,v 1.1 1994/08/07 18:01:39 wollman Exp $
.\"
.Dd January 18, 1988
.Dt RPCGEN 1
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index 1605846fbea1..4b2f3ee88fa7 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.2 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.2 1993/11/10 03:46:45 smace Exp $
+# $Id: Makefile,v 1.1 1994/08/07 18:23:23 wollman Exp $
PROG= rpcinfo
MAN8 = rpcinfo.8
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index c2c556decc81..e52253b99b70 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,5 +1,5 @@
.\" from: @(#)rpcinfo.8c 2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
-.\" $Id: rpcinfo.8,v 1.1 1993/09/13 23:22:41 jtc Exp $
+.\" $Id: rpcinfo.8,v 1.1 1994/08/07 18:23:24 wollman Exp $
.\"
.Dd December 17, 1987
.Dt RPCINFO 8
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 0258461202be..aa203368f085 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -1,7 +1,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/
/*static char sccsid[] = "from: @(#)rpcinfo.c 2.2 88/08/11 4.0 RPCSRC";*/
-static char rcsid[] = "$Id: rpcinfo.c,v 1.1 1994/08/07 18:23:25 wollman Exp $";
+static char rcsid[] = "$Id: rpcinfo.c,v 1.2 1995/05/30 06:33:23 rgrimes Exp $";
#endif
/*
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index ac2deec15c70..a7b4607fafc1 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -40,7 +40,7 @@ static char copyright[] =
#ifndef lint
static char sccsid[] = "From: @(#)rsh.c 8.3 (Berkeley) 4/6/94";
static char rcsid[] =
- "$Id: rsh.c,v 1.4 1995/05/30 06:33:24 rgrimes Exp $";
+ "$Id: rsh.c,v 1.4.4.1 1996/06/23 13:08:36 markm Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 1d53109f824f..4882354332bc 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1993/11/10 03:47:06 smace Exp $
+# $Id: Makefile,v 1.1.1.1 1994/08/28 15:01:31 csgr Exp $
PROG= rup
MAN1= rup.1
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index c228e4440313..bdb6b7a28bff 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -31,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: rup.1,v 1.2 1994/11/18 21:37:40 ats Exp $
+.\" $Id: rup.1,v 1.2.4.1 1996/01/30 14:01:21 mpp Exp $
.\"
.Dd June 7, 1993
.Dt RUP 1
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index e248be1e3fa0..8fcd5bb637a8 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -32,7 +32,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: rup.c,v 1.1.1.1 1994/08/28 15:01:31 csgr Exp $";
+static char rcsid[] = "$Id: rup.c,v 1.2 1995/05/30 06:33:26 rgrimes Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 27ca0938be31..0672f43bd7f4 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*/
-/* $Id: ruptime.c,v 1.6 1995/09/08 20:33:21 jkh Exp $ */
+/* $Id: ruptime.c,v 1.2.4.2 1995/10/06 02:00:09 davidg Exp $ */
#ifndef lint
static char copyright[] =
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 6e2fd6ab2fc6..eeb303266378 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1993/11/10 03:47:23 smace Exp $
+# $Id: Makefile,v 1.1.1.1 1994/08/28 15:06:02 csgr Exp $
PROG = rusers
MAN1 = rusers.1
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 31156fdd46ba..be77965af059 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rusers.1 6.7 (Berkeley) 4/23/91
-.\" $Id: rusers.1,v 1.1.1.1 1994/08/28 15:06:02 csgr Exp $
+.\" $Id: rusers.1,v 1.1.1.1.6.1 1996/01/30 14:01:25 mpp Exp $
.\"
.Dd April 23, 1991
.Dt RUSERS 1
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 9c7234239698..6f6b36551772 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -32,7 +32,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: rusers.c,v 1.1.1.1 1994/08/28 15:06:02 csgr Exp $";
+static char rcsid[] = "$Id: rusers.c,v 1.2 1995/05/30 06:33:28 rgrimes Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 07bb67880ebd..e78348bc308f 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1993/11/10 03:47:37 smace Exp $
+# $Id: Makefile,v 1.1.1.1 1994/08/28 15:11:02 csgr Exp $
PROG = rwall
MAN1 = rwall.1
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index 0bab417eb248..fe280274aa3a 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rwall.1 6.7 (Berkeley) 4/23/91
-.\" $Id: rwall.1,v 1.1 1993/09/16 01:11:03 jtc Exp $
+.\" $Id: rwall.1,v 1.1.1.1 1994/08/28 15:11:02 csgr Exp $
.\"
.Dd April 23, 1991
.Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 8a2e2b3fa2a5..a1d85e200750 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -40,7 +40,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)wall.c 5.14 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: rwall.c,v 1.1.1.1 1994/08/28 15:11:02 csgr Exp $";
+static char rcsid[] = "$Id: rwall.c,v 1.2 1995/05/30 06:33:30 rgrimes Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/sgmlfmt/Makefile b/usr.bin/sgmlfmt/Makefile
index a97bf58d4719..574e7b8283af 100644
--- a/usr.bin/sgmlfmt/Makefile
+++ b/usr.bin/sgmlfmt/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1995/07/25 00:36:45 bde Exp $
+# $Id: Makefile,v 1.1.1.1.4.1 1995/09/17 23:40:07 davidg Exp $
MAN1= sgmlfmt.1
diff --git a/usr.bin/sgmlfmt/sgmlfmt.pl b/usr.bin/sgmlfmt/sgmlfmt.pl
index 1d1e2c12a47e..b3146b111e31 100755
--- a/usr.bin/sgmlfmt/sgmlfmt.pl
+++ b/usr.bin/sgmlfmt/sgmlfmt.pl
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: sgmlfmt.pl,v 1.2.4.2 1995/10/11 23:19:16 jfieber Exp $
+# $Id: sgmlfmt.pl,v 1.2.4.3 1996/06/19 20:54:14 jkh Exp $
# Format an sgml document tagged according to the linuxdoc DTD.
# by John Fieber <jfieber@freebsd.org> for the FreeBSD documentation
diff --git a/usr.bin/sgmls/Makefile b/usr.bin/sgmls/Makefile
index 62c6ceaed214..5965067655eb 100644
--- a/usr.bin/sgmls/Makefile
+++ b/usr.bin/sgmls/Makefile
@@ -1,6 +1,6 @@
#
# Bmake file for sgmls
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1995/04/27 16:03:39 jfieber Exp $
#
SUBDIR= libsgmls sgmls sgmlsasp rast
diff --git a/usr.bin/sgmls/Makefile.inc b/usr.bin/sgmls/Makefile.inc
index 7109ec06c1ca..fcc071130720 100644
--- a/usr.bin/sgmls/Makefile.inc
+++ b/usr.bin/sgmls/Makefile.inc
@@ -1,7 +1,7 @@
#
# Bmakefile for rast
#
-# $Id: Makefile.inc,v 1.3 1996/06/19 20:36:35 jkh Exp $
+# $Id: Makefile.inc,v 1.1.1.1.4.1 1996/06/19 20:55:10 jkh Exp $
#
.if exists(${.CURDIR}/../../Makefile.inc)
diff --git a/usr.bin/sgmls/README b/usr.bin/sgmls/README
index dd6e2578f8c2..10916316bd28 100644
--- a/usr.bin/sgmls/README
+++ b/usr.bin/sgmls/README
@@ -1,4 +1,4 @@
-$Id:$
+$Id: README,v 1.1.1.1 1995/04/27 16:03:39 jfieber Exp $
This the sgmls release 1.1 SGML parser written by James Clark
jjc@jclark.com, repackaged for FreeBSD. The original source may be
diff --git a/usr.bin/sgmls/sgmls/Makefile b/usr.bin/sgmls/sgmls/Makefile
index 1c3c26b99d75..5cf708e6b8f3 100644
--- a/usr.bin/sgmls/sgmls/Makefile
+++ b/usr.bin/sgmls/sgmls/Makefile
@@ -1,7 +1,7 @@
#
# Bmakefile for sgmls
#
-# $Id: Makefile,v 1.2 1996/06/04 19:08:26 jfieber Exp $
+# $Id: Makefile,v 1.1.1.1.4.1 1996/06/19 20:55:25 jkh Exp $
#
PROG= sgmls
diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index 42cc96e1809d..c5a073cc5935 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -39,7 +39,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "@(#)strip.c 8.1 (Berkeley) 6/6/93";*/
-static char RCSid[] = "$Id: strip.c,v 1.4 1994/12/18 01:18:17 ache Exp $";
+static char RCSid[] = "$Id: strip.c,v 1.5 1995/05/30 06:34:16 rgrimes Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index a33866cb60a8..f0b094ad1365 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)su.c 8.3 (Berkeley) 4/2/94";
*/
static const char rcsid[] =
- "$Id: su.c,v 1.6.4.4 1996/06/23 14:07:40 markm Exp $";
+ "$Id: su.c,v 1.6.4.5 1996/10/07 10:02:48 joerg Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 047b347c2d46..49bc1543443f 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.4 1996/03/09 19:22:49 joerg Exp $
+# $Id: Makefile,v 1.3.4.1 1996/06/23 11:47:00 joerg Exp $
PROG= talk
DPADD= ${LIBCURSES} ${LIBTERMCAP}
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index 741392e3db7e..03448055f4a4 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -29,7 +29,7 @@
* From:
* Id: find_interface.c,v 1.1 1995/08/14 16:08:39 wollman Exp
*
- * $Id: get_iface.c,v 1.1 1996/03/09 19:22:52 joerg Exp $
+ * $Id: get_iface.c,v 1.2 1996/03/12 10:23:30 ache Exp $
*/
#include <unistd.h>
diff --git a/usr.bin/tconv/Makefile b/usr.bin/tconv/Makefile
index 11b45dba3a66..b86086acc118 100644
--- a/usr.bin/tconv/Makefile
+++ b/usr.bin/tconv/Makefile
@@ -1,5 +1,5 @@
# Makefile for tconv
-# $Id: Makefile,v 1.1.1.1 1994/10/09 17:40:30 ache Exp $
+# $Id: Makefile,v 1.2 1995/01/15 06:19:01 jkh Exp $
PROG= tconv
SRCS= tconv.c quit.c
diff --git a/usr.bin/vi/USD.doc/vi.ref/index b/usr.bin/vi/USD.doc/vi.ref/index
new file mode 100644
index 000000000000..b52dd59f2cb8
--- /dev/null
+++ b/usr.bin/vi/USD.doc/vi.ref/index
@@ -0,0 +1,270 @@
+<interrupt> 12
+<literal next> 12
+current pathname 12
+alternate pathname 12
+buffer 12
+unnamed buffer 13
+previous context 15
+motion 15
+count 16
+bigword 17
+word 17
+paragraph 17
+section 17
+sentence 18
+<control-A> 18
+<control-B> 18
+<control-D> 19
+<control-E> 19
+<control-F> 19
+<control-G> 20
+<control-H> 20
+<control-J> 20
+<control-N> 20
+j 20
+<control-L> 20
+<control-R> 20
+<control-M> 21
++ 21
+<control-P> 21
+k 21
+<control-T> 21
+<control-U> 21
+<control-W> 22
+<control-Y> 22
+<control-Z> 22
+<escape> 22
+<control-]> 23
+<control-^> 23
+<space> 23
+l 23
+! 24
+# 24
+$ 25
+% 25
+& 26
+SQUOTE<character> 26
+`<character> 26
+( 27
+) 27
+, 27
+MINUSSIGN 27
+. 28
+/RE/ 28
+?RE? 28
+N 28
+n 28
+0 29
+: 29
+; 30
+< 30
+> 30
+@ 30
+A 31
+B 31
+C 31
+D 32
+E 32
+F 32
+G 33
+H 33
+I 33
+J 33
+L 34
+M 34
+O 34
+P 35
+Q 35
+R 35
+S 35
+T 35
+U 36
+W 36
+X 36
+Y 37
+ZZ 37
+[[ 37
+]] 37
+^ 38
+_ 38
+a 38
+b 38
+c 39
+d 39
+e 39
+f 40
+i 40
+m 40
+o 40
+p 41
+r 41
+s 41
+t 41
+u 42
+w 42
+x 42
+y 43
+z 43
+{ 44
+| 44
+} 44
+~ 45
+~ 45
+<interrupt> 45
+<nul> 46
+<control-D> 46
+^<control-D> 46
+0<control-D> 47
+<control-T> 47
+<erase> 47
+<control-H> 47
+<literal next> 47
+<escape> 47
+<line erase> 47
+<control-W> 47
+<word erase> 47
+<control-X> 47
+<interrupt> 47
+<eof> 50
+line 50
+range 50
+count 50
+flags 50
+file 51
+DOUBLEQUOTE 52
+<end-of-file> 52
+! 52
+number 53
+# 53
+@ 53
+* 53
+< 53
+= 54
+> 54
+abbrev 54
+append 54
+args 55
+bg 55
+change 55
+cd 55
+chdir 55
+copy 56
+t 56
+delete 56
+display 56
+edit 56
+exusage 57
+file 57
+fg 57
+global 57
+v 58
+help 58
+insert 58
+join 59
+list 59
+map 59
+mark 60
+k 60
+move 60
+mkexrc 60
+next 60
+open 61
+preserve 61
+previous 61
+print 61
+put 61
+quit 62
+read 62
+recover 62
+resize 63
+rewind 63
+set 63
+shell 64
+source 64
+split 64
+substitute 64
+& 64
+~ 64
+suspend 65
+stop 65
+<control-Z> 65
+tag 65
+tagpop 66
+tagtop 66
+unabbrev 66
+undo 66
+unmap 67
+version 67
+visual 67
+visual 67
+viusage 67
+write 67
+wn 67
+wq 67
+xit 68
+yank 69
+z 69
+altwerase 70
+autoindent 70
+autoprint 71
+autowrite 71
+beautify 71
+cdpath 72
+columns 72
+comment 72
+directory 72
+edcompatible 72
+errorbells 72
+exrc 73
+extended 73
+flash 73
+hardtabs 73
+ignorecase 73
+keytime 73
+leftright 73
+lines 73
+lisp 74
+list 74
+magic 74
+matchtime 74
+mesg 74
+modelines 74
+number 75
+octal 75
+open 75
+optimize 75
+paragraphs 75
+prompt 75
+readonly 76
+recdir 76
+redraw 76
+remap 76
+report 76
+ruler 77
+scroll 77
+sections 77
+shell 77
+shiftwidth 77
+showdirty 77
+showmatch 77
+showmode 77
+sidescroll 78
+slowopen 78
+sourceany 78
+tabstop 78
+taglength 78
+tags 78
+term 78
+terse 78
+tildeop 79
+timeout 79
+ttywerase 79
+verbose 79
+w300 79
+w1200 79
+w9600 79
+warn 79
+window 79
+wrapmargin 80
+wrapscan 80
+writeany 80
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 8828ffde377d..b5a807b1641f 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -42,7 +42,7 @@ static const char copyright[] =
static const char sccsid[] = "@(#)wc.c 8.1 (Berkeley) 6/6/93";
#else
static const char rcsid[] =
- "$Id: wc.c,v 1.4 1996/04/13 11:35:54 bde Exp $";
+ "$Id: wc.c,v 1.1.1.1.6.1 1996/07/02 17:22:17 bde Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index b94418869bc1..8c6f4621afe8 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
.\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: which.1,v 1.2 1995/01/28 17:35:54 asami Exp $
+.\" $Id: which.1,v 1.3 1995/01/30 22:21:28 jkh Exp $
.Dd January 26, 1995
.Dt WHICH 1
.Os FreeBSD
diff --git a/usr.bin/which/which.pl b/usr.bin/which/which.pl
index 08aabda79e0f..5ee31abbec79 100755
--- a/usr.bin/which/which.pl
+++ b/usr.bin/which/which.pl
@@ -31,7 +31,7 @@
#
# [whew!]
#
-# $Id: which.pl,v 1.4 1995/01/30 22:21:29 jkh Exp $
+# $Id: which.pl,v 1.4.4.1 1995/08/26 10:33:20 davidg Exp $
$all = 0;
$silent = 0;
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 220f195157ae..9fa69fd15619 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)install.1 8.1 (Berkeley) 6/6/93
-.\" $Id: install.1,v 1.3 1996/01/30 13:52:33 mpp Exp $
+.\" $Id: install.1,v 1.1.1.1.6.1 1996/02/22 19:43:36 peter Exp $
.\"
.Dd October 9, 1995
.Dt INSTALL 1
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 99440bfd99a6..5d17d70d7443 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -40,7 +40,7 @@ static const char copyright[] =
#ifndef lint
/*static char sccsid[] = "From: @(#)xinstall.c 8.1 (Berkeley) 7/21/93";*/
static const char rcsid[] =
- "$Id: xinstall.c,v 1.1.1.1.6.3 1996/02/22 19:43:36 peter Exp $";
+ "$Id: xinstall.c,v 1.1.1.1.6.4 1996/06/23 14:24:57 bde Exp $";
#endif /* not lint */
/*-
diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile
index c133eb52a80e..132817542ac6 100644
--- a/usr.bin/ypcat/Makefile
+++ b/usr.bin/ypcat/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $Id: Makefile,v 1.3 1994/02/17 07:06:10 rgrimes Exp $
+# $Id: Makefile,v 1.1 1994/08/08 01:13:28 wollman Exp $
PROG= ypcat
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 86bc355e02f7..fdf3afd07ae9 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: ypcat.1,v 1.1.6.1 1996/01/30 14:03:45 mpp Exp $
+.\" $Id: ypcat.1,v 1.1.6.2 1996/06/27 05:32:57 gpalmer Exp $
.\"
.Dd December 3, 1993
.Dt YPCAT 1
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
index cf79ca74de20..94491c43bf3c 100644
--- a/usr.bin/ypmatch/Makefile
+++ b/usr.bin/ypmatch/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $Id: Makefile,v 1.3 1994/02/17 07:06:13 rgrimes Exp $
+# $Id: Makefile,v 1.1 1994/08/08 01:13:31 wollman Exp $
PROG= ypmatch
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 6c73fdb486fa..f4cd7649ed25 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: ypmatch.1,v 1.1.6.1 1996/01/30 14:03:50 mpp Exp $
+.\" $Id: ypmatch.1,v 1.1.6.2 1996/06/27 05:32:59 gpalmer Exp $
.\"
.Dd December 3, 1993
.Dt YPMATCH 1
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index 1c964b2e8df5..45b81e525ba6 100644
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $Id: Makefile,v 1.2 1994/02/17 07:06:22 rgrimes Exp $
+# $Id: Makefile,v 1.1 1994/08/08 01:13:34 wollman Exp $
PROG= ypwhich
NOMAN=