changeset 13222:02526851ba75

357 fix license on strptime.c 358 the prototype CDDL header needs minor grammar fixes Reviewed by: trisk@opensolaris.org Reviewed by: gwr@nexenta.com Reviewed by: gber@openindiana.org
author Garrett D'Amore <garrett@nexenta.com>
date Thu, 21 Oct 2010 14:44:37 -0700
parents 879ee5195278
children ea8e8bad6650
files usr/src/cmd/localedef/Makefile usr/src/cmd/localedef/charmap.c usr/src/cmd/localedef/collate.c usr/src/cmd/localedef/ctype.c usr/src/cmd/localedef/data/convert_map.pl usr/src/cmd/localedef/localedef.c usr/src/cmd/localedef/localedef.h usr/src/cmd/localedef/messages.c usr/src/cmd/localedef/monetary.c usr/src/cmd/localedef/numeric.c usr/src/cmd/localedef/parser.y usr/src/cmd/localedef/scanner.c usr/src/cmd/localedef/time.c usr/src/cmd/localedef/wide.c usr/src/cmd/od/Makefile usr/src/cmd/od/od.c usr/src/cmd/printf/Makefile usr/src/cmd/tr/Makefile usr/src/lib/libc/port/i18n/isdigit.c usr/src/lib/libc/port/locale/mbftowc.c usr/src/lib/libc/port/locale/strptime.c usr/src/lib/libc/port/locale/tolower.c usr/src/lib/libc/port/locale/ungetwc.c usr/src/prototypes/README usr/src/prototypes/prototype.Makefile usr/src/prototypes/prototype.c usr/src/prototypes/prototype.csh usr/src/prototypes/prototype.h usr/src/prototypes/prototype.java usr/src/prototypes/prototype.ksh usr/src/prototypes/prototype.man usr/src/prototypes/prototype.mapfile-vers usr/src/prototypes/prototype.pl usr/src/prototypes/prototype.py usr/src/prototypes/prototype.s usr/src/prototypes/prototype.sh
diffstat 36 files changed, 89 insertions(+), 122 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/localedef/Makefile	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/Makefile	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms version 1.0
-# of the CDDL.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
 # source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/charmap.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/charmap.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/collate.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/collate.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/ctype.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/ctype.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/data/convert_map.pl	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/data/convert_map.pl	Thu Oct 21 14:44:37 2010 -0700
@@ -2,7 +2,7 @@
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms version
+# You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
--- a/usr/src/cmd/localedef/localedef.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/localedef.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/localedef.h	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/localedef.h	Thu Oct 21 14:44:37 2010 -0700
@@ -1,7 +1,7 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version
+ * You may only use this file in accordance with the terms of version
  * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
--- a/usr/src/cmd/localedef/messages.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/messages.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/monetary.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/monetary.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/numeric.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/numeric.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/parser.y	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/parser.y	Thu Oct 21 14:44:37 2010 -0700
@@ -2,8 +2,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/scanner.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/scanner.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/time.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/time.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/localedef/wide.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/localedef/wide.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,8 +1,8 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version 1.0
- * of the CDDL.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
  * source.  A copy of the CDDL is also available via the Internet at
--- a/usr/src/cmd/od/Makefile	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/od/Makefile	Thu Oct 21 14:44:37 2010 -0700
@@ -1,7 +1,7 @@
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms version
+# You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
--- a/usr/src/cmd/od/od.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/od/od.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,7 +1,7 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version
+ * You may only use this file in accordance with the terms of version
  * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
--- a/usr/src/cmd/printf/Makefile	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/printf/Makefile	Thu Oct 21 14:44:37 2010 -0700
@@ -1,7 +1,7 @@
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms version
+# You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
--- a/usr/src/cmd/tr/Makefile	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/cmd/tr/Makefile	Thu Oct 21 14:44:37 2010 -0700
@@ -1,27 +1,16 @@
 #
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
 #
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet
+# at http://www.illumos.org/license/CDDL.
 #
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
+
 #
 # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 
 
--- a/usr/src/lib/libc/port/i18n/isdigit.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/lib/libc/port/i18n/isdigit.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version
+ * You may only use this file in accordance with the terms of version
  * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy is of the CDDL is also available via the Internet
- * at http://www.illumos.org/license/CDDL.
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
 
 /*
--- a/usr/src/lib/libc/port/locale/mbftowc.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/lib/libc/port/locale/mbftowc.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version
+ * You may only use this file in accordance with the terms of version
  * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy is of the CDDL is also available via the Internet
- * at http://www.illumos.org/license/CDDL.
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
 
 /*
--- a/usr/src/lib/libc/port/locale/strptime.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/lib/libc/port/locale/strptime.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,24 +1,3 @@
-/*
- * Powerdog Industries kindly requests feedback from anyone modifying
- * this function:
- *
- * Date: Thu, 05 Jun 1997 23:17:17 -0400
- * From: Kevin Ruddy <kevin.ruddy@powerdog.com>
- * To: James FitzGibbon <james@nexis.net>
- * Subject: Re: Use of your strptime(3) code (fwd)
- *
- * The reason for the "no mod" clause was so that modifications would
- * come back and we could integrate them and reissue so that a wider
- * audience could use it (thereby spreading the wealth).  This has
- * made it possible to get strptime to work on many operating systems.
- * I'm not sure why that's "plain unacceptable" to the FreeBSD team.
- *
- * Anyway, you can change it to "with or without modification" as
- * you see fit.  Enjoy.
- *
- * Kevin Ruddy
- * Powerdog Industries, Inc.
- */
 /*
  * Copyright 2010, Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 1994 Powerdog Industries.  All rights reserved.
@@ -26,18 +5,14 @@
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer
  *    in the documentation and/or other materials provided with the
  *    distribution.
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgement:
- *      This product includes software developed by Powerdog Industries.
- * 4. The name of Powerdog Industries may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY POWERDOG INDUSTRIES ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -50,7 +25,12 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * official policies, either expressed or implied, of Powerdog Industries.
  */
+
 #include "lint.h"
 #include <time.h>
 #include <ctype.h>
--- a/usr/src/lib/libc/port/locale/tolower.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/lib/libc/port/locale/tolower.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version
+ * You may only use this file in accordance with the terms of version
  * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy is of the CDDL is also available via the Internet
- * at http://www.illumos.org/license/CDDL.
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
 
 /*
--- a/usr/src/lib/libc/port/locale/ungetwc.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/lib/libc/port/locale/ungetwc.c	Thu Oct 21 14:44:37 2010 -0700
@@ -29,7 +29,6 @@
 
 /*
  * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
- * Use is subject to license terms.
  */
 
 /*	This module is created for NLS on Sep.03.86		*/
--- a/usr/src/prototypes/README	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/README	Thu Oct 21 14:44:37 2010 -0700
@@ -12,8 +12,8 @@
  * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy is of the CDDL is also available via the Internet
- * at http://www.illumos.org/license/CDDL.
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
 
 /*
--- a/usr/src/prototypes/prototype.Makefile	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.Makefile	Thu Oct 21 14:44:37 2010 -0700
@@ -1,12 +1,12 @@
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms version
+# You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
-# source.  A copy is of the CDDL is also available via the Internet
-# at http://www.illumos.org/license/CDDL.
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
 
 #
--- a/usr/src/prototypes/prototype.c	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.c	Thu Oct 21 14:44:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version
+ * You may only use this file in accordance with the terms of version
  * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy is of the CDDL is also available via the Internet
- * at http://www.illumos.org/license/CDDL.
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
 
 /*
@@ -16,4 +16,3 @@
 /*
  * Describe the purpose of this file.
  */
-
--- a/usr/src/prototypes/prototype.csh	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.csh	Thu Oct 21 14:44:37 2010 -0700
@@ -7,8 +7,8 @@
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
-# source.  A copy is of the CDDL is also available via the Internet
-# at http://www.illumos.org/license/CDDL.
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
 
 #
--- a/usr/src/prototypes/prototype.h	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.h	Thu Oct 21 14:44:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version
+ * You may only use this file in accordance with the terms of version
  * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy is of the CDDL is also available via the Internet
- * at http://www.illumos.org/license/CDDL.
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
 
 /*
--- a/usr/src/prototypes/prototype.java	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.java	Thu Oct 21 14:44:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version
+ * You may only use this file in accordance with the terms of version
  * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy is of the CDDL is also available via the Internet
- * at http://www.illumos.org/license/CDDL.
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
 
 /*
--- a/usr/src/prototypes/prototype.ksh	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.ksh	Thu Oct 21 14:44:37 2010 -0700
@@ -3,12 +3,12 @@
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms version
+# You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
-# source.  A copy is of the CDDL is also available via the Internet
-# at http://www.illumos.org/license/CDDL.
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
 
 #
--- a/usr/src/prototypes/prototype.man	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.man	Thu Oct 21 14:44:37 2010 -0700
@@ -1,12 +1,12 @@
 .\"
 .\" This file and its contents are supplied under the terms of the
 .\" Common Development and Distribution License ("CDDL"), version 1.0.
-.\" You may only use this file in accordance with the terms version
+.\" You may only use this file in accordance with the terms of version
 .\" 1.0 of the CDDL.
 .\"
 .\" A full copy of the text of the CDDL should have accompanied this
-.\" source.  A copy is of the CDDL is also available via the Internet
-.\" at http://www.illumos.org/license/CDDL.
+.\" source.  A copy of the CDDL is also available via the Internet at
+.\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
 .\" Copyright 2010 <contributor>.  All rights reserved.
--- a/usr/src/prototypes/prototype.mapfile-vers	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.mapfile-vers	Thu Oct 21 14:44:37 2010 -0700
@@ -1,12 +1,12 @@
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms version
+# You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
-# source.  A copy is of the CDDL is also available via the Internet
-# at http://www.illumos.org/license/CDDL.
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
 
 #
--- a/usr/src/prototypes/prototype.pl	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.pl	Thu Oct 21 14:44:37 2010 -0700
@@ -2,12 +2,12 @@
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms version
+# You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
-# source.  A copy is of the CDDL is also available via the Internet
-# at http://www.illumos.org/license/CDDL.
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
 
 #
--- a/usr/src/prototypes/prototype.py	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.py	Thu Oct 21 14:44:37 2010 -0700
@@ -2,12 +2,12 @@
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms version
+# You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
-# source.  A copy is of the CDDL is also available via the Internet
-# at http://www.illumos.org/license/CDDL.
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
 
 #
--- a/usr/src/prototypes/prototype.s	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.s	Thu Oct 21 14:44:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
  * This file and its contents are supplied under the terms of the
  * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms version
+ * You may only use this file in accordance with the terms of version
  * 1.0 of the CDDL.
  *
  * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy is of the CDDL is also available via the Internet
- * at http://www.illumos.org/license/CDDL.
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
 
 /*
--- a/usr/src/prototypes/prototype.sh	Wed Oct 20 23:13:10 2010 -0700
+++ b/usr/src/prototypes/prototype.sh	Thu Oct 21 14:44:37 2010 -0700
@@ -7,8 +7,8 @@
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
-# source.  A copy is of the CDDL is also available via the Internet
-# at http://www.illumos.org/license/CDDL.
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
 #
 
 #