new copyright; att/bsd/shared

SCCS-vsn: usr.bin/w/w.c 5.28
SCCS-vsn: usr.bin/wall/wall.1 6.4
SCCS-vsn: usr.bin/wc/wc.1 6.2
SCCS-vsn: usr.bin/what/what.1 6.3
SCCS-vsn: old/whereis/whereis.1 6.4
SCCS-vsn: old/whereis/whereis.c 5.5
SCCS-vsn: old/which/which.1 6.2
SCCS-vsn: old/which/which.csh 5.5
SCCS-vsn: usr.bin/who/who.1 6.4
SCCS-vsn: old/whoami/whoami.1 6.3
SCCS-vsn: usr.bin/window/windowrc 3.9
SCCS-vsn: usr.bin/write/write.1 6.4
SCCS-vsn: usr.bin/xsend/common_source/lib.c 4.3
SCCS-vsn: usr.bin/xsend/common_source/xmail.h 4.2
SCCS-vsn: usr.bin/xsend/enroll/enroll.c 4.4
SCCS-vsn: usr.bin/xsend/xget/xget.c 4.6
SCCS-vsn: usr.bin/xsend/xsend/xsend.1 6.3
SCCS-vsn: usr.bin/xsend/xsend/xsend.c 4.8
SCCS-vsn: usr.bin/yes/yes.1 6.3

diff --git a/usr/src/old/whereis/whereis.1 b/usr/src/old/whereis/whereis.1
index c7ed066..000a5db 100644 (file)
--- a/usr/src/old/whereis/whereis.1
+++ b/usr/src/old/whereis/whereis.1
@@ -1,19 +1,9 @@
 .\" Copyright (c) 1980 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1980 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" Redistribution and use in source and binary forms are permitted
-.\" provided that the above copyright notice and this paragraph are
-.\" duplicated in all such forms and that any documentation,
-.\" advertising materials, and other materials related to such
-.\" distribution and use acknowledge that the software was developed
-.\" by the University of California, Berkeley.  The name of the
-.\" University may not be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"    @(#)whereis.1   6.3 (Berkeley) %G%
+.\"    @(#)whereis.1   6.4 (Berkeley) %G%

 .\"
 .TH WHEREIS 1 ""
 .UC
 .\"
 .TH WHEREIS 1 ""
 .UC

diff --git a/usr/src/old/whereis/whereis.c b/usr/src/old/whereis/whereis.c
index 5b36287..9a75204 100644 (file)
--- a/usr/src/old/whereis/whereis.c
+++ b/usr/src/old/whereis/whereis.c
@@ -1,28 +1,18 @@
-/*
- * Copyright (c) 1980, 1990 The Regents of the University of California.
+/*-
+ * Copyright (c) 1980 The Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980, 1990 The Regents of the University of California.\n\
+"@(#) Copyright (c) 1980 The Regents of the University of California.\n\

  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)whereis.c  5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)whereis.c  5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>

diff --git a/usr/src/old/which/which.1 b/usr/src/old/which/which.1
index 194bd51..d8b2de5 100644 (file)
--- a/usr/src/old/which/which.1
+++ b/usr/src/old/which/which.1
@@ -1,8 +1,9 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1983 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.\"    @(#)which.1     6.1 (Berkeley) %G%
+.\" %sccs.include.redist.roff%
+.\"
+.\"    @(#)which.1     6.2 (Berkeley) %G%

 .\"
 .TH WHICH 1 ""
 .UC
 .\"
 .TH WHICH 1 ""
 .UC

diff --git a/usr/src/old/which/which.csh b/usr/src/old/which/which.csh
index 4019506..7e81bb5 100644 (file)
--- a/usr/src/old/which/which.csh
+++ b/usr/src/old/which/which.csh
@@ -2,18 +2,14 @@
 #
 # DO NOT USE "csh -f"
 #
 #
 # DO NOT USE "csh -f"
 #

-# Copyright (c) 1980 Regents of the University of California.
+# Copyright (c) 1983 The Regents of the University of California.

 # All rights reserved.
 #
 # All rights reserved.
 #

-# Redistribution and use in source and binary forms are permitted
-# provided that this notice is preserved and that due credit is given
-# to the University of California at Berkeley. The name of the University
-# may not be used to endorse or promote products derived from this
-# software without specific prior written permission. This software
-# is provided ``as is'' without express or implied warranty.
+# %sccs.include.redist.sh%

 #
 #

-#      @(#)which.csh   5.4 (Berkeley) %G%
+#      @(#)which.csh   5.5 (Berkeley) %G%

 #
 #

+

 #      which : tells you which program you get
 #
 set prompt = "% "
 #      which : tells you which program you get
 #
 set prompt = "% "

diff --git a/usr/src/old/whoami/whoami.1 b/usr/src/old/whoami/whoami.1
index 3492dcd..79f994c 100644 (file)
--- a/usr/src/old/whoami/whoami.1
+++ b/usr/src/old/whoami/whoami.1
@@ -2,7 +2,7 @@
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"

-.\"    @(#)whoami.1    6.2 (Berkeley) %G%
+.\"    @(#)whoami.1    6.3 (Berkeley) %G%

 .\"
 .TH WHOAMI 1 ""
 .UC
 .\"
 .TH WHOAMI 1 ""
 .UC

diff --git a/usr/src/usr.bin/w/w.c b/usr/src/usr.bin/w/w.c
index 5c5db93..6d5f099 100644 (file)
--- a/usr/src/usr.bin/w/w.c
+++ b/usr/src/usr.bin/w/w.c
@@ -1,18 +1,19 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1980, 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.proprietary.c%

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980, 1991 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)w.c        5.27 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)w.c        5.28 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * w - print system status (who and what)
 
 /*
  * w - print system status (who and what)

diff --git a/usr/src/usr.bin/wall/wall.1 b/usr/src/usr.bin/wall/wall.1
index 425117f..57fd654 100644 (file)
--- a/usr/src/usr.bin/wall/wall.1
+++ b/usr/src/usr.bin/wall/wall.1
@@ -1,19 +1,9 @@
-.\" Copyright (c) 1989 The Regents of the University of California.
+.\" Copyright (c) 1987 The Regents of the University of California.

 .\" All rights reserved.
 .\"
 .\" All rights reserved.
 .\"

-.\" Redistribution and use in source and binary forms are permitted
-.\" provided that the above copyright notice and this paragraph are
-.\" duplicated in all such forms and that any documentation,
-.\" advertising materials, and other materials related to such
-.\" distribution and use acknowledge that the software was developed
-.\" by the University of California, Berkeley.  The name of the
-.\" University may not be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"    @(#)wall.1      6.3 (Berkeley) %G%
+.\"    @(#)wall.1      6.4 (Berkeley) %G%

 .\"
 .UC 7
 .TH WALL 1 ""
 .\"
 .UC 7
 .TH WALL 1 ""

diff --git a/usr/src/usr.bin/wc/wc.1 b/usr/src/usr.bin/wc/wc.1
index dec9aff..377650b 100644 (file)
--- a/usr/src/usr.bin/wc/wc.1
+++ b/usr/src/usr.bin/wc/wc.1
@@ -1,8 +1,9 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1985 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.\"    @(#)wc.1        6.1 (Berkeley) %G%
+.\" %sccs.include.proprietary.roff%
+.\"
+.\"    @(#)wc.1        6.2 (Berkeley) %G%

 .\"
 .TH WC 1 ""
 .UC 4
 .\"
 .TH WC 1 ""
 .UC 4

diff --git a/usr/src/usr.bin/what/what.1 b/usr/src/usr.bin/what/what.1
index 3a2fc68..36666cb 100644 (file)
--- a/usr/src/usr.bin/what/what.1
+++ b/usr/src/usr.bin/what/what.1
@@ -1,8 +1,6 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" %sccs.include.proprietary.roff%

 .\"
 .\"

-.\"    @(#)what.1      6.2 (Berkeley) %G%
+.\"    @(#)what.1      6.3 (Berkeley) %G%

 .\"
 .TH WHAT 1 ""
 .UC 4
 .\"
 .TH WHAT 1 ""
 .UC 4

diff --git a/usr/src/usr.bin/who/who.1 b/usr/src/usr.bin/who/who.1
index 51ad67a..6497a7c 100644 (file)
--- a/usr/src/usr.bin/who/who.1
+++ b/usr/src/usr.bin/who/who.1
@@ -1,8 +1,9 @@
-.\" Copyright (c) 1990 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1986 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.\"     @(#)who.1      6.3 (Berkeley) %G%
+.\" %sccs.include.proprietary.roff%
+.\"
+.\"    @(#)who.1       6.4 (Berkeley) %G%

 .\"
 .TH WHO 1 "%Q"
 .AT 3
 .\"
 .TH WHO 1 "%Q"
 .AT 3

diff --git a/usr/src/usr.bin/window/windowrc b/usr/src/usr.bin/window/windowrc
index c8e537c..087fa14 100644 (file)
--- a/usr/src/usr.bin/window/windowrc
+++ b/usr/src/usr.bin/window/windowrc
@@ -1,9 +1,11 @@
-# @(#)windowrc 3.8 %G%
+# Copyright (c) 1983 The Regents of the University of California.
+# All rights reserved.

 #
 #

-# Copyright (c) 1983 Regents of the University of California,
-# All rights reserved.  Redistribution permitted subject to
-# the terms of the Berkeley Software License Agreement.
+# %sccs.include.redist.sh%

 #
 #

+#      @(#)windowrc    3.9 (Berkeley) %G%
+#
+

 # Configuration file example for window manager
 # To be installed in ~/.windowrc
 #
 # Configuration file example for window manager
 # To be installed in ~/.windowrc
 #

diff --git a/usr/src/usr.bin/write/write.1 b/usr/src/usr.bin/write/write.1
index 66efaf9..dc668d1 100644 (file)
--- a/usr/src/usr.bin/write/write.1
+++ b/usr/src/usr.bin/write/write.1
@@ -4,19 +4,9 @@
 .\" This code is derived from software contributed to Berkeley by
 .\" Jef Poskanzer and Craig Leres of the Lawrence Berkeley Laboratory.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Jef Poskanzer and Craig Leres of the Lawrence Berkeley Laboratory.
 .\"

-.\" Redistribution and use in source and binary forms are permitted
-.\" provided that the above copyright notice and this paragraph are
-.\" duplicated in all such forms and that any documentation,
-.\" advertising materials, and other materials related to such
-.\" distribution and use acknowledge that the software was developed
-.\" by the University of California, Berkeley.  The name of the
-.\" University may not be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"    @(#)write.1     6.3 (Berkeley) %G%
+.\"    @(#)write.1     6.4 (Berkeley) %G%

 .\"
 .TH WRITE 1 ""
 .UC 4
 .\"
 .TH WRITE 1 ""
 .UC 4

diff --git a/usr/src/usr.bin/xsend/common_source/lib.c b/usr/src/usr.bin/xsend/common_source/lib.c
index 5cea184..e84abcc 100644 (file)
--- a/usr/src/usr.bin/xsend/common_source/lib.c
+++ b/usr/src/usr.bin/xsend/common_source/lib.c
@@ -1,6 +1,10 @@
+/*-
+ * %sccs.include.proprietary.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)lib.c      4.2 %G%";
-#endif
+static char sccsid[] = "@(#)lib.c      4.3 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "xmail.h"
 #include "pathnames.h"
 
 #include "xmail.h"
 #include "pathnames.h"

diff --git a/usr/src/usr.bin/xsend/common_source/xmail.h b/usr/src/usr.bin/xsend/common_source/xmail.h
index d201236..c3261c1 100644 (file)
--- a/usr/src/usr.bin/xsend/common_source/xmail.h
+++ b/usr/src/usr.bin/xsend/common_source/xmail.h
@@ -1,4 +1,8 @@
-/*     xmail.h 4.1     83/03/30        */
+/*-
+ * %sccs.include.proprietary.c%
+ *
+ *     @(#)xmail.h     4.2 (Berkeley) %G%
+ */

 
 #include <stdio.h>
 #include <mp.h>
 
 #include <stdio.h>
 #include <mp.h>

diff --git a/usr/src/usr.bin/xsend/enroll/enroll.c b/usr/src/usr.bin/xsend/enroll/enroll.c
index c01f1c5..25226c3 100644 (file)
--- a/usr/src/usr.bin/xsend/enroll/enroll.c
+++ b/usr/src/usr.bin/xsend/enroll/enroll.c
@@ -1,6 +1,10 @@
+/*-
+ * %sccs.include.proprietary.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)enroll.c   4.3 %G%";
-#endif
+static char sccsid[] = "@(#)enroll.c   4.4 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <sys/types.h>
 #include <pwd.h>
 
 #include <sys/types.h>
 #include <pwd.h>

diff --git a/usr/src/usr.bin/xsend/xget/xget.c b/usr/src/usr.bin/xsend/xget/xget.c
index 7aeb97a..71c8be1 100644 (file)
--- a/usr/src/usr.bin/xsend/xget/xget.c
+++ b/usr/src/usr.bin/xsend/xget/xget.c
@@ -1,6 +1,10 @@
+/*-
+ * %sccs.include.proprietary.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)xget.c     4.5 %G%";
-#endif
+static char sccsid[] = "@(#)xget.c     4.6 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <sys/types.h>
 #include <sys/dir.h>
 
 #include <sys/types.h>
 #include <sys/dir.h>

diff --git a/usr/src/usr.bin/xsend/xsend/xsend.1 b/usr/src/usr.bin/xsend/xsend/xsend.1
index 55fc9eb..ab6e509 100644 (file)
--- a/usr/src/usr.bin/xsend/xsend/xsend.1
+++ b/usr/src/usr.bin/xsend/xsend/xsend.1
@@ -1,4 +1,4 @@
-.\"    @(#)xsend.1     6.2 (Berkeley) %G%
+.\"    @(#)xsend.1     6.3 (Berkeley) %G%

 .\"
 .TH XSEND 1 ""
 .AT 3
 .\"
 .TH XSEND 1 ""
 .AT 3

diff --git a/usr/src/usr.bin/xsend/xsend/xsend.c b/usr/src/usr.bin/xsend/xsend/xsend.c
index 1fbb2a7..eed30df 100644 (file)
--- a/usr/src/usr.bin/xsend/xsend/xsend.c
+++ b/usr/src/usr.bin/xsend/xsend/xsend.c
@@ -1,6 +1,10 @@
+/*-
+ * %sccs.include.proprietary.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)xsend.c    4.7 %G%";
-#endif
+static char sccsid[] = "@(#)xsend.c    4.8 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <sys/param.h>
 #include <sys/stat.h>
 
 #include <sys/param.h>
 #include <sys/stat.h>

diff --git a/usr/src/usr.bin/yes/yes.1 b/usr/src/usr.bin/yes/yes.1
index 63477c7..440a896 100644 (file)
--- a/usr/src/usr.bin/yes/yes.1
+++ b/usr/src/usr.bin/yes/yes.1
@@ -1,8 +1,9 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1985 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.\"    @(#)yes.1       6.2 (Berkeley) %G%
+.\" %sccs.include.redist.roff%
+.\"
+.\"    @(#)yes.1       6.3 (Berkeley) %G%

 .\"
 .TH YES 1 ""
 .UC 4
 .\"
 .TH YES 1 ""
 .UC 4


@@ -14,4 +15,7 @@ yes \- be repetitively affirmative
 .I expletive
 ]
 .SH DESCRIPTION
 .I expletive
 ]
 .SH DESCRIPTION

-\fIYes\fP outputs \fIexpletive\fP, or, by default, \*(lqy\*(rq, forever.
+.I Yes
+outputs
+.IR expletive ,
+or, by default, ``y'', forever.