svn commit: r227752 - in head/cddl: contrib/opensolaris/cmd/zdb contrib/opensolaris/cmd/zstreamdump usr.bin/zstreamdump usr.sbin/zdb

Sun Nov 20 13:11:29 UTC 2011

Author: mm
Date: Sun Nov 20 13:11:29 2011
New Revision: 227752
URL: http://svn.freebsd.org/changeset/base/227752

Log:
  Update and desolarization of zdb(8) and zstreamdump(1) manual pages:
  - synchronized to match new vendor code [1]
  - removed ATTRIBUTES sections
  - updated SEE ALSO sections
  - properly updated copyright information (required by CDDL)
  - remove empty lines via MANFILTER
  
  Obtained from:	Illumos [1]
  MFC after:	5 days

Modified:
  head/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  head/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
  head/cddl/usr.bin/zstreamdump/Makefile
  head/cddl/usr.sbin/zdb/Makefile

Modified: head/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================

--- head/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Sun Nov 20 12:26:20 2011	(r227751)
+++ head/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Sun Nov 20 13:11:29 2011	(r227752)
@@ -3,7 +3,8 @@
 .\" 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.
 .\" 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.
 .\" 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]
-.TH zdb 1M "31 Oct 2005" "SunOS 5.11" "System Administration Commands"
+.\" Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org>
+.TH ZDB 8 "Oct 31, 2005"
 .SH NAME
 zdb \- ZFS debugger
 .SH SYNOPSIS
@@ -15,70 +16,50 @@ zdb \- ZFS debugger
 .SH DESCRIPTION
 .sp
 .LP
-The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self-repairing, \fBzdb\fR should only be run under the direction by a support engineer.
+The \fBzdb\fR command is used by support engineers to diagnose failures and
+gather statistics. Since the \fBZFS\fR file system is always consistent on disk
+and is self-repairing, \fBzdb\fR should only be run under the direction by a
+support engineer.
 .sp
 .LP
-If no arguments are specified, \fBzdb\fR, performs basic consistency checks on the pool and associated datasets, and report any problems detected.
+If no arguments are specified, \fBzdb\fR, performs basic consistency checks on
+the pool and associated datasets, and report any problems detected.
 .sp
 .LP
-Any options supported by this command are internal to Sun and subject to change at any time.
+Any options supported by this command are internal to Sun and subject to change
+at any time.
 .SH EXIT STATUS
 .sp
 .LP
 The following exit values are returned:
 .sp
 .ne 2
-.mk
 .na
 \fB\fB0\fR\fR
 .ad
 .RS 5n
-.rt  
 The pool is consistent.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB1\fR\fR
 .ad
 .RS 5n
-.rt  
 An error was detected.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB2\fR\fR
 .ad
 .RS 5n
-.rt  
 Invalid command line options were specified.
 .RE
 
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-AvailabilitySUNWzfsu
-_
-Interface StabilityUnstable
-.TE
-
 .SH SEE ALSO
 .sp
 .LP
-\fBzfs\fR(1M), \fBzpool\fR(1M), \fBattributes\fR(5)
+zfs(8), zpool(8)

Modified: head/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1	Sun Nov 20 12:26:20 2011	(r227751)
+++ head/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1	Sun Nov 20 13:11:29 2011	(r227752)
@@ -3,7 +3,8 @@
 .\" 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. 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. 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]
-.TH zstreamdump 1M "21 Sep 2009" "SunOS 5.11" "System Administration Commands"
+.\" Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org>
+.TH ZSTREAMDUMP 1 "Sep 21, 2009"
 .SH NAME
 zstreamdump \- filter data in zfs send stream
 .SH SYNOPSIS
@@ -15,14 +16,15 @@ zstreamdump \- filter data in zfs send s
 .SH DESCRIPTION
 .sp
 .LP
-The \fBzstreamdump\fR utility reads from the output of the \fBzfs send\fR command, then displays headers and some statistics from that output.  See \fBzfs\fR(1M).
+The \fBzstreamdump\fR utility reads from the output of the \fBzfs send\fR
+command, then displays headers and some statistics from that output.  See
+\fBzfs\fR(1M).
 .SH OPTIONS
 .sp
 .LP
 The following options are supported:
 .sp
 .ne 2
-.mk
 .na
 \fB\fB-C\fR\fR
 .ad
@@ -33,7 +35,6 @@ Suppress the validation of checksums.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB-v\fR\fR
 .ad
@@ -42,26 +43,7 @@ Suppress the validation of checksums.
 Verbose. Dump all headers, not only begin and end headers.
 .RE
 
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-AvailabilitySUNWzfsu
-_
-Interface StabilityUncommitted
-.TE
-
 .SH SEE ALSO
 .sp
 .LP
-\fBzfs\fR(1M), \fBattributes\fR(5)
+zfs(8)

Modified: head/cddl/usr.bin/zstreamdump/Makefile
==============================================================================
--- head/cddl/usr.bin/zstreamdump/Makefile	Sun Nov 20 12:26:20 2011	(r227751)
+++ head/cddl/usr.bin/zstreamdump/Makefile	Sun Nov 20 13:11:29 2011	(r227752)
@@ -24,4 +24,6 @@ LDADD=	-lm -lnvpair -lumem -lzpool -lpth
 
 CSTD=	c99
 
+MANFILTER=	sed -e '/^$$/d'
+
 .include <bsd.prog.mk>

Modified: head/cddl/usr.sbin/zdb/Makefile
==============================================================================
--- head/cddl/usr.sbin/zdb/Makefile	Sun Nov 20 12:26:20 2011	(r227751)
+++ head/cddl/usr.sbin/zdb/Makefile	Sun Nov 20 13:11:29 2011	(r227752)
@@ -27,5 +27,6 @@ DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} $
 	${LIBUUTIL} ${LIBZFS} ${LIBZPOOL}
 LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool
 
+MANFILTER=	sed -e '/^$$/d'
 
 .include <bsd.prog.mk>
