[illumos-gate merge]

commit 4585130b259133a26efae68275dbe56b08366deb
    5428 provide fts(), reallocarray(), and strtonum()
commit 61304e4faaed38301307f7f985160d1843473587
    8086 Add Stride parameter to dd
commit dd627ace5d331edb6342d966323629e57008b71f
    8328 keyserv: sizeof on array function parameter
commit d1151f9bab097777251f26772ebcc50468637a12
    8369 libcmdutils should be better about large file support
    8370 libcmdutils needlessly defines its own OFFSETOF() macro
commit 336970851eecf9c4348b3de7bbea0687059dd216
    6856 sys/stream.h exposes unnecessary macros to userland
commit a4b8c9aa65a0a735aba318024a424a90d7b06c37
    8264 want support for promoting datasets in libzfs_core
commit 3f068ebd9d125396d22997224889b677a22523fe
    8232 pcmcia: misleading-indentation
commit 5400f871d9d59398f2c72ca8320aad07c6caa49c
    8350 mr_sas - replace sprintf() with snprintf()
commit 2e10def11ef1a50c25efa2444482670e6b0654ff
    8302 svr4pkg unused variables
commit 311c88c1ed31408e0998a9aabb8e7d0d12ef83ad
    8326 logger: misleading-indentation
commit 8487916bce68d458d3da4cba7d0be961dfce786f
    8316 srchtxt: misleading-indentation
commit bcb81701c49bee8a728b9a14ac9b6675854a7f25
    8296 tcopy: misleading-indentation
commit 4c004ea84c324520a1bac324e9f69d22ab4c5cd9
    8303 loader: biosdisk interface should be able to cope with 4k sectors
commit 115716444da43c8948885b687239f3c4187d0897
    8131 loader: add support for chain and device BE's
commit e2f4f3dab373b605b62ac175115f264a5c417eb6
    8366 remove warlock leftovers from usr/src/cmd and usr/src/lib
commit 490fea6b98d609ce9ae1306209c80bb255b84c95
    8355 need libc regex tests
commit 7641c5eab2e15e87eafc318a09f2bd5c6f968607
    8354 sync regcomp(3C) with upstream

	Conflicts:
	usr/src/tools/mandoc/Makefile
	usr/src/man/man3c/Makefile

1 files changed, 37 insertions, 11 deletions

diff --git a/usr/src/man/man1m/dd.1m b/usr/src/man/man1m/dd.1m
index a9b8e18a60..8ae530e285 100644
--- a/usr/src/man/man1m/dd.1m
+++ b/usr/src/man/man1m/dd.1m
@@ -1,5 +1,6 @@
 '\" te
 .\" Copyright (c) 2014, Joyent, Inc.  All rights Reserved.
+.\" Copyright (c) 2014 by Delphix. All rights reserved.
 .\" Copyright (c) 1992, X/Open Company Limited  All Rights Reserved
 .\" Copyright 1989 AT&T
 .\" Portions Copyright (c) 1995, Sun Microsystems, Inc.  All Rights Reserved
@@ -10,7 +11,7 @@
 .\" 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 DD 1M "Jan 04, 2014"
+.TH DD 1M "Dec 12, 2014"
 .SH NAME
 dd \- convert and copy a file
 .SH SYNOPSIS
@@ -20,7 +21,6 @@ dd \- convert and copy a file
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBdd\fR utility copies the specified input file to the specified output
 with possible conversions. The standard input and output are used by default.
@@ -54,7 +54,6 @@ character set without changing the input file's block structure. The
 After completion, \fBdd\fR reports the number of whole and partial input and
 output blocks.
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -200,6 +199,41 @@ offset or reads the blocks as described for non-seekable files.
 .sp
 .ne 2
 .na
+\fB\fBostride=\fR\fIn\fR\fR
+.ad
+.sp .6
+.RS 4n
+Writes every \fIn\fRth block (using the specified output block size) when
+writing output.  Skips \fIn\fR - 1 blocks after writing each record.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fBistride=\fR\fIn\fR\fR
+.ad
+.sp .6
+.RS 4n
+Reads every \fIn\fRth block (using the specified input block size) when
+reading input.  Skips \fIn\fR - 1 blocks after reading each record.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fBstride=\fR\fIn\fR\fR
+.ad
+.sp .6
+.RS 4n
+Reads every \fIn\fRth block (using the specified input block size) when
+reading input.  Skips \fIn\fR - 1 blocks after reading each record.  Also
+writes every \fIn\fRth block (using the specified output block size) when
+writing output.  Skips \fIn\fR - 1 blocks after writing each record.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBcount=\fR\fIn\fR\fR
 .ad
 .sp .6
@@ -482,7 +516,6 @@ separated by \fBx\fR, specifying the product of the indicated values.
 .LP
 All of the operands will be processed before any input is read.
 .SH SIGNALS
-.sp
 .LP
 When \fBdd\fR receives either SIGINFO or SIGUSR1, \fBdd\fR will emit the current
 input and output block counts, total bytes written, total time elapsed, and the
@@ -496,7 +529,6 @@ For \fBSIGINT\fR, \fBdd\fR writes status information to standard error before
 exiting. \fBdd\fR takes the standard action for all other signals.
 
 .SH USAGE
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBdd\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
@@ -560,13 +592,11 @@ example% \fBtar cvf - . | compress | dd obs=1024k of=/dev/rmt/0 conv=sync\fR
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBdd\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -595,7 +625,6 @@ diagnostic message will be written, and the copy operation will be
 discontinued. If some other error is detected, a diagnostic message will be
 written and the copy operation will be discontinued.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -611,12 +640,10 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcp\fR(1), \fBsed\fR(1), \fBtr\fR(1), \fBfcntl.h\fR(3HEAD),
 \fBattributes\fR(5), \fBenviron\fR(5), \fBlargefile\fR(5), \fBstandards\fR(5)
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fB\fBf+p records in(out)\fR\fR
@@ -626,7 +653,6 @@ numbers of full and partial blocks read(written)
 .RE
 
 .SH NOTES
-.sp
 .LP
 Do not use \fBdd\fR to copy files between file systems having different block
 sizes.