--- a/usr/src/cmd/zfs/zfs_main.c	Thu May 06 09:54:45 2010 -0700
+++ b/usr/src/cmd/zfs/zfs_main.c	Thu May 06 15:08:31 2010 -0600
@@ -221,9 +221,9 @@
 	case HELP_PROMOTE:
 		return (gettext("\tpromote <clone-filesystem>\n"));
 	case HELP_RECEIVE:
-		return (gettext("\treceive [-vnF] <filesystem|volume|"
+		return (gettext("\treceive [-denuvF] <filesystem|volume|"
 		"snapshot>\n"
-		"\treceive [-vnF] -d <filesystem>\n"));
+		"\treceive [-denuvF] -d <filesystem>\n"));
 	case HELP_RENAME:
 		return (gettext("\trename <filesystem|volume|snapshot> "
 		    "<filesystem|volume|snapshot>\n"
@@ -1716,10 +1716,8 @@
 		    "properties\n"));
 		(void) printf(gettext(" 5   System attributes\n"));
 		(void) printf(gettext("\nFor more information on a particular "
-		    "version, including supported releases, see:\n\n"));
-		(void) printf("http://www.opensolaris.org/os/community/zfs/"
-		    "version/zpl/N\n\n");
-		(void) printf(gettext("Where 'N' is the version number.\n"));
+		    "version, including supported releases,\n"));
+		(void) printf("see the ZFS Administration Guide.\n\n");
 		ret = 0;
 	} else if (argc || all) {
 		/* Upgrade filesystems */
@@ -2701,7 +2699,7 @@
 }
 
 /*
- * zfs receive [-denvF] <fs@snap>
+ * zfs receive [-denuvF] <fs@snap>
  *
  * Restore a backup stream from stdin.
  */

--- a/usr/src/cmd/zpool/zpool_main.c	Thu May 06 09:54:45 2010 -0700
+++ b/usr/src/cmd/zpool/zpool_main.c	Thu May 06 15:08:31 2010 -0600
@@ -4008,10 +4008,8 @@
 		(void) printf(gettext(" 24  System attributes\n"));
 		(void) printf(gettext(" 25  Improved scrub stats\n"));
 		(void) printf(gettext("\nFor more information on a particular "
-		    "version, including supported releases, see:\n\n"));
-		(void) printf("http://www.opensolaris.org/os/community/zfs/"
-		    "version/N\n\n");
-		(void) printf(gettext("Where 'N' is the version number.\n"));
+		    "version, including supported releases,\n"));
+		(void) printf(gettext("see the ZFS Administration Guide.\n\n"));
 	} else if (argc == 0) {
 		int notfound;
 

--- a/usr/src/uts/common/sys/gfs.h	Thu May 06 09:54:45 2010 -0700
+++ b/usr/src/uts/common/sys/gfs.h	Thu May 06 15:08:31 2010 -0600
@@ -20,15 +20,16 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/*
+ * These are Consolidation Private interfaces and are subject to change.
  */
 
 #ifndef _SYS_GFS_H
 #define	_SYS_GFS_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/vnode.h>
 #include <sys/vfs_opreg.h>