From: cgd <cgd@NetBSD.org>
Date: Sat, 22 Apr 1995 10:36:43 +0000 (+0000)
Subject: clean up import, NetBSD RCS IDs
X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/commitdiff_plain/e05192c777ae9a285d9681d4284a44502080945d?hp=0e57b353967966db0b9a4d68736daaa410eafd24

clean up import, NetBSD RCS IDs
---

diff --git a/sail/Makefile b/sail/Makefile
index e1e182bb..025a1003 100644
--- a/sail/Makefile
+++ b/sail/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.10 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.4 1994/12/22 09:36:08 cgd Exp $
+#	$NetBSD: Makefile,v 1.5 1995/04/22 10:36:43 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	sail
 SRCS=	main.c pl_main.c pl_1.c pl_2.c pl_3.c pl_4.c pl_5.c pl_6.c pl_7.c \
diff --git a/sail/assorted.c b/sail/assorted.c
index 9b9c4124..9d6ca998 100644
--- a/sail/assorted.c
+++ b/sail/assorted.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: assorted.c,v 1.3 1995/04/22 10:36:45 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)assorted.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: assorted.c,v 1.2 1993/08/01 18:51:53 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)assorted.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: assorted.c,v 1.3 1995/04/22 10:36:45 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/sail/dr_1.c b/sail/dr_1.c
index 43c86424..75605b37 100644
--- a/sail/dr_1.c
+++ b/sail/dr_1.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: dr_1.c,v 1.3 1995/04/22 10:36:46 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_1.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_1.c,v 1.2 1993/08/01 18:51:52 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_1.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dr_1.c,v 1.3 1995/04/22 10:36:46 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "driver.h"
diff --git a/sail/dr_2.c b/sail/dr_2.c
index f2f29c6b..1e76dc6f 100644
--- a/sail/dr_2.c
+++ b/sail/dr_2.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: dr_2.c,v 1.3 1995/04/22 10:36:48 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_2.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_2.c,v 1.2 1993/08/01 18:51:51 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_2.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dr_2.c,v 1.3 1995/04/22 10:36:48 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "driver.h"
diff --git a/sail/dr_3.c b/sail/dr_3.c
index 5c7e5525..389d9e92 100644
--- a/sail/dr_3.c
+++ b/sail/dr_3.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: dr_3.c,v 1.3 1995/04/22 10:36:49 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_3.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_3.c,v 1.2 1993/08/01 18:51:50 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_3.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dr_3.c,v 1.3 1995/04/22 10:36:49 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "driver.h"
diff --git a/sail/dr_4.c b/sail/dr_4.c
index 5d1cb5c4..723b1025 100644
--- a/sail/dr_4.c
+++ b/sail/dr_4.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: dr_4.c,v 1.3 1995/04/22 10:36:50 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_4.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_4.c,v 1.2 1993/08/01 18:51:49 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_4.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dr_4.c,v 1.3 1995/04/22 10:36:50 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/sail/dr_5.c b/sail/dr_5.c
index 1c3719d8..22957744 100644
--- a/sail/dr_5.c
+++ b/sail/dr_5.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: dr_5.c,v 1.3 1995/04/22 10:36:51 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_5.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_5.c,v 1.2 1993/08/01 18:51:49 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_5.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dr_5.c,v 1.3 1995/04/22 10:36:51 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/sail/dr_main.c b/sail/dr_main.c
index f8ddc3a1..265bdb32 100644
--- a/sail/dr_main.c
+++ b/sail/dr_main.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: dr_main.c,v 1.4 1995/04/22 10:36:52 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_main.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_main.c,v 1.3 1994/04/08 18:23:31 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_main.c	8.2 (Berkeley) 4/16/94";
+#else
+static char rcsid[] = "$NetBSD: dr_main.c,v 1.4 1995/04/22 10:36:52 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "driver.h"
diff --git a/sail/driver.h b/sail/driver.h
index 3dbd16f1..34d304e1 100644
--- a/sail/driver.h
+++ b/sail/driver.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: driver.h,v 1.3 1995/04/22 10:36:54 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)driver.h	5.4 (Berkeley) 6/1/90
- *	$Id: driver.h,v 1.2 1993/08/01 18:51:58 mycroft Exp $
+ *	@(#)driver.h	8.1 (Berkeley) 5/31/93
  */
 
 #include "externs.h"
diff --git a/sail/externs.h b/sail/externs.h
index 2445d095..0894881d 100644
--- a/sail/externs.h
+++ b/sail/externs.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: externs.h,v 1.3 1995/04/22 10:36:55 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)externs.h	5.4 (Berkeley) 6/1/90
- *	$Id: externs.h,v 1.2 1993/08/01 18:51:57 mycroft Exp $
+ *	@(#)externs.h	8.1 (Berkeley) 5/31/93
  */
 
 #include <stdio.h>
diff --git a/sail/game.c b/sail/game.c
index 49eeef63..a6ecc4fc 100644
--- a/sail/game.c
+++ b/sail/game.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: game.c,v 1.3 1995/04/22 10:36:56 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)game.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: game.c,v 1.2 1993/08/01 18:51:47 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)game.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: game.c,v 1.3 1995/04/22 10:36:56 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/sail/globals.c b/sail/globals.c
index dbeb2148..a9e2fd30 100644
--- a/sail/globals.c
+++ b/sail/globals.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: globals.c,v 1.4 1995/04/22 10:36:57 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)globals.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: globals.c,v 1.3 1994/01/13 18:24:40 glass Exp $";
+#if 0
+static char sccsid[] = "@(#)globals.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: globals.c,v 1.4 1995/04/22 10:36:57 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/sail/lo_main.c b/sail/lo_main.c
index 439319ae..c4f3a143 100644
--- a/sail/lo_main.c
+++ b/sail/lo_main.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)lo_main.c	5.7 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: lo_main.c,v 1.2 1993/08/01 18:51:45 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)lo_main.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/sail/machdep.h b/sail/machdep.h
index d19a28d3..a6721037 100644
--- a/sail/machdep.h
+++ b/sail/machdep.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: machdep.h,v 1.3 1995/04/22 10:37:00 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)machdep.h	5.5 (Berkeley) 6/1/90
- *	$Id: machdep.h,v 1.2 1993/08/01 18:51:56 mycroft Exp $
+ *	@(#)machdep.h	8.1 (Berkeley) 5/31/93
  */
 
 #define TIMEOUT 300				/* Sync() timeout in seconds */
diff --git a/sail/main.c b/sail/main.c
index 125b75a5..9f8b0f46 100644
--- a/sail/main.c
+++ b/sail/main.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: main.c,v 1.3 1995/04/22 10:37:01 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,14 +34,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1983, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)main.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: main.c,v 1.2 1993/08/01 18:51:44 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: main.c,v 1.3 1995/04/22 10:37:01 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/sail/misc.c b/sail/misc.c
index 7b0c465e..6dc18c72 100644
--- a/sail/misc.c
+++ b/sail/misc.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: misc.c,v 1.3 1995/04/22 10:37:03 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)misc.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: misc.c,v 1.2 1993/08/01 18:51:43 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: misc.c,v 1.3 1995/04/22 10:37:03 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/sail/parties.c b/sail/parties.c
index 75687720..7cfe13ba 100644
--- a/sail/parties.c
+++ b/sail/parties.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: parties.c,v 1.3 1995/04/22 10:37:04 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)parties.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: parties.c,v 1.2 1993/08/01 18:51:42 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)parties.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: parties.c,v 1.3 1995/04/22 10:37:04 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/sail/pathnames.h b/sail/pathnames.h
index 25cb44a7..ab17358f 100644
--- a/sail/pathnames.h
+++ b/sail/pathnames.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: pathnames.h,v 1.3 1995/04/22 10:37:06 cgd Exp $	*/
+
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pathnames.h	5.1 (Berkeley) 6/1/90
- *	$Id: pathnames.h,v 1.2 1993/08/01 18:51:55 mycroft Exp $
+ *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
  */
 
 #define	_PATH_LOGFILE	"/var/games/saillog"
diff --git a/sail/pl_1.c b/sail/pl_1.c
index 8d01b534..0abd1ac3 100644
--- a/sail/pl_1.c
+++ b/sail/pl_1.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: pl_1.c,v 1.3 1995/04/22 10:37:07 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_1.c	5.5 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: pl_1.c,v 1.2 1993/08/01 18:51:41 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_1.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_1.c,v 1.3 1995/04/22 10:37:07 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"
diff --git a/sail/pl_2.c b/sail/pl_2.c
index 7f583b3d..e1b975f1 100644
--- a/sail/pl_2.c
+++ b/sail/pl_2.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: pl_2.c,v 1.3 1995/04/22 10:37:08 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_2.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pl_2.c,v 1.2 1993/08/01 18:51:40 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_2.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_2.c,v 1.3 1995/04/22 10:37:08 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"
diff --git a/sail/pl_3.c b/sail/pl_3.c
index d31a9e8c..c860ec7c 100644
--- a/sail/pl_3.c
+++ b/sail/pl_3.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: pl_3.c,v 1.3 1995/04/22 10:37:09 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_3.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pl_3.c,v 1.2 1993/08/01 18:51:39 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_3.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_3.c,v 1.3 1995/04/22 10:37:09 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"
diff --git a/sail/pl_4.c b/sail/pl_4.c
index 05eef2b2..b5ea560e 100644
--- a/sail/pl_4.c
+++ b/sail/pl_4.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: pl_4.c,v 1.3 1995/04/22 10:37:10 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_4.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pl_4.c,v 1.2 1993/08/01 18:51:38 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_4.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_4.c,v 1.3 1995/04/22 10:37:10 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"
diff --git a/sail/pl_5.c b/sail/pl_5.c
index 49980ddc..938f0e87 100644
--- a/sail/pl_5.c
+++ b/sail/pl_5.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: pl_5.c,v 1.3 1995/04/22 10:37:12 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_5.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pl_5.c,v 1.2 1993/08/01 18:51:37 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_5.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_5.c,v 1.3 1995/04/22 10:37:12 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"
diff --git a/sail/pl_6.c b/sail/pl_6.c
index a3fcc020..03f339bd 100644
--- a/sail/pl_6.c
+++ b/sail/pl_6.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: pl_6.c,v 1.3 1995/04/22 10:37:15 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_6.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pl_6.c,v 1.2 1993/08/01 18:51:36 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_6.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_6.c,v 1.3 1995/04/22 10:37:15 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"
diff --git a/sail/pl_7.c b/sail/pl_7.c
index b1e0b2fe..1268c1fe 100644
--- a/sail/pl_7.c
+++ b/sail/pl_7.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: pl_7.c,v 1.6 1995/04/22 10:37:17 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,12 +34,17 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_7.c	5.7 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: pl_7.c,v 1.5 1993/11/10 15:59:04 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_7.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_7.c,v 1.6 1995/04/22 10:37:17 cgd Exp $";
+#endif
 #endif /* not lint */
 
+#include <sys/ttydefaults.h>
 #include "player.h"
 
+
 /*
  * Display interface
  */
diff --git a/sail/pl_main.c b/sail/pl_main.c
index c4b7cad1..f31ef33e 100644
--- a/sail/pl_main.c
+++ b/sail/pl_main.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: pl_main.c,v 1.4 1995/04/22 10:37:20 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_main.c	5.5 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: pl_main.c,v 1.3 1994/01/13 19:22:29 glass Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_main.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_main.c,v 1.4 1995/04/22 10:37:20 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"
diff --git a/sail/player.h b/sail/player.h
index e63fc829..15c2fd43 100644
--- a/sail/player.h
+++ b/sail/player.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: player.h,v 1.4 1995/04/22 10:37:22 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)player.h	5.4 (Berkeley) 6/1/90
- *	$Id: player.h,v 1.3 1993/08/01 18:51:54 mycroft Exp $
+ *	@(#)player.h	8.1 (Berkeley) 5/31/93
  */
 
 #include <curses.h>
diff --git a/sail/sail.6 b/sail/sail.6
index bd741094..6cb4638c 100644
--- a/sail/sail.6
+++ b/sail/sail.6
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1988 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: sail.6,v 1.4 1995/04/22 10:37:24 cgd Exp $
+.\"
+.\" Copyright (c) 1988, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	from: @(#)sail.6	5.6 (Berkeley) 6/23/90
-.\"	$Id: sail.6,v 1.3 1994/01/13 18:24:43 glass Exp $
+.\"	@(#)sail.6	8.2 (Berkeley) 12/30/93
 .\"
-.TH SAIL 6 "June 23, 1990"
+.TH SAIL 6 "December 30, 1993"
 .UC 4
 .SH NAME
 sail \- multi-user wooden ships and iron men
@@ -385,7 +386,7 @@ full allowance printed in the "move" prompt.
 Old sailing captains had to keep an eye constantly on the wind.  Captains
 in 
 .I Sail
-are no different.  A ship's ability to move depends on its attitide to the
+are no different.  A ship's ability to move depends on its attitude to the
 wind.  The best angle possible is to have the wind off your quarter, that is,
 just off the stern.  The direction rose on the side of the screen gives the
 possible movements for your ship at all positions to the wind.  Battle
@@ -540,7 +541,7 @@ Commands are given to
 .I Sail
 by typing a single character.  You will then be prompted for further
 input.  A brief summary of the commands follows.
-.bp
+.br
 .SH COMMAND SUMMARY
 .nf
 
@@ -604,7 +605,7 @@ Wind from the N, blowing a gale.
 (b) London            98 gun 3 Decker SOL (crack crew) (28 pts)
 (b) Royal Oak         74 gun Ship of the Line (crack crew) (26 pts)
 (f) Neptune           74 gun Ship of the Line (average crew) (24 pts)
-(f) Duc Bougogne      80 gun 3 Decker SOL (average crew) (27 pts)
+(f) Duc de Bourgogne  80 gun 3 Decker SOL (average crew) (27 pts)
 (f) Conquerant        74 gun Ship of the Line (average crew) (24 pts)
 (f) Provence          64 gun Ship of the Line (average crew) (18 pts)
 (f) Romulus           44 gun Ship of the Line (average crew) (10 pts)
diff --git a/sail/sync.c b/sail/sync.c
index ea2bac04..ec4fc61d 100644
--- a/sail/sync.c
+++ b/sail/sync.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: sync.c,v 1.3 1995/04/22 10:37:26 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)sync.c	5.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: sync.c,v 1.2 1993/08/01 18:51:33 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)sync.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: sync.c,v 1.3 1995/04/22 10:37:26 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/sail/version.c b/sail/version.c
index a389182e..f1d818ab 100644
--- a/sail/version.c
+++ b/sail/version.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: version.c,v 1.3 1995/04/22 10:37:27 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)version.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: version.c,v 1.2 1993/08/01 18:51:32 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)version.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: version.c,v 1.3 1995/04/22 10:37:27 cgd Exp $";
+#endif
 #endif /* not lint */
 
-char version[] = "Wooden Ships and Iron Men, Version 5.4 (90/06/01)";
+char version[] = "Wooden Ships and Iron Men, Version 8.1 (93/05/31)";