4 files changed, 39 insertions, 22 deletions
diff --git a/usr/src/man/man1m/soconfig.1m b/usr/src/man/man1m/soconfig.1m
index 41743d4e1d..b747bada11 100644
--- a/usr/src/man/man1m/soconfig.1m
+++ b/usr/src/man/man1m/soconfig.1m
@@ -3,18 +3,23 @@
 .\" 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 SOCONFIG 1M "Oct 29, 2008"
+.TH SOCONFIG 1M "Apr 12, 2014"
 .SH NAME
 soconfig \- configure transport providers for use by sockets
 .SH SYNOPSIS
 .LP
 .nf
+\fB/sbin/soconfig\fR \fB-d\fR \fIdir\fR
+.fi
+
+.LP
+.nf
 \fB/sbin/soconfig\fR \fB-f\fR \fIfile\fR
 .fi
 
 .LP
 .nf
-\fB/sbin/soconfig\fR \fIfamily\fR \fItype\fR \fIprotocol\fR [\fIpath\fR]
+\fB/sbin/soconfig\fR \fIfamily\fR \fItype\fR \fIprotocol\fR [\fImodule\fR | \fIpath\fR]
 .fi
 
 .SH DESCRIPTION
@@ -27,8 +32,8 @@ as \fB/dev/tcp\fR. This utility can be used to add an additional mapping or
 remove a previous mapping.
 .sp
 .LP
-The \fBinit\fR(1M) utility uses \fBsoconfig\fR with the \fBsock2path\fR(4) file
-during the booting sequence.
+The \fBinit\fR(1M) utility uses \fBsoconfig\fR with the \fBsock2path.d\fR(4)
+directory during the booting sequence.
 .SH OPTIONS
 .sp
 .LP
@@ -36,18 +41,29 @@ The following options are supported:
 .sp
 .ne 2
 .na
+\fB\fB-d\fR \fIdir\fR\fR
+.ad
+.RS 11n
+Set up the \fBsoconfig\fR configuration for each driver
+according  to  the  information stored in the
+files in \fIdir\fR.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fB-f\fR \fIfile\fR\fR
 .ad
 .RS 11n
 Set up the \fBsoconfig\fR configuration for each driver according to the
-information stored in \fBfile\fR. A \fBsoconfig\fR file consists of lines of at
+information stored in \fIfile\fR. A \fBsoconfig\fR file consists of lines of at
 least the first three fields listed below, separated by spaces:
 .sp
-\fIfamily  type  protocol  path\fR
+\fIfamily  type  protocol  [module | path]\fR
 .sp
 These fields are described in the \fBOPERANDS\fR section below.
 .sp
-An example of \fBfile\fR can be found in the \fBEXAMPLES\fR section below.
+An example of \fIfile\fR can be found in the \fBEXAMPLES\fR section below.
 .RE
 
 .SH OPERANDS
@@ -156,16 +172,17 @@ begin with a hash mark (\fB#\fR):
 .sp
 .ne 2
 .na
-\fB\fB/etc/sock2path\fR\fR
+\fB\fB/etc/sock2path.d\fR\fR
 .ad
 .RS 18n
-File containing mappings from sockets to transport providers.
+Directory containing files with mappings from
+sockets  to transport providers.
 .RE
 
 .SH SEE ALSO
 .sp
 .LP
-\fBinit\fR(1M), \fBsock2path\fR(4), \fBattributes\fR(5)
+\fBinit\fR(1M), \fBsock2path.d\fR(4), \fBattributes\fR(5)
 .sp
 .LP
 \fINetwork Interface Guide\fR
diff --git a/usr/src/man/man4/Makefile b/usr/src/man/man4/Makefile
index 8df0755bfb..cc3561746d 100644
--- a/usr/src/man/man4/Makefile
+++ b/usr/src/man/man4/Makefile
@@ -186,7 +186,7 @@ _MANFILES=	Intro.4				\
 		smbautohome.4			\
 		smhba.conf.4			\
 		sndr.4				\
-		sock2path.4			\
+		sock2path.d.4			\
 		space.4				\
 		ssh_config.4			\
 		sshd_config.4			\
diff --git a/usr/src/man/man4/sock2path.4 b/usr/src/man/man4/sock2path.d.4
index f730af83ee..d7a5f188e3 100644
--- a/usr/src/man/man4/sock2path.4
+++ b/usr/src/man/man4/sock2path.d.4
@@ -3,32 +3,32 @@
 .\" 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 SOCK2PATH 4 "Nov 4, 2008"
+.TH SOCK2PATH.D 4 "Apr 12, 2014"
 .SH NAME
-sock2path \- socket mapping file that maps sockets to transport providers
+sock2path.d \- socket mapping files that map sockets to transport providers
 .SH SYNOPSIS
 .LP
 .nf
-\fB/etc/sock2path\fR
+\fB/etc/sock2path.d\fR
 .fi
 
 .SH DESCRIPTION
 .sp
 .LP
-The socket mapping file, \fB/etc/sock2path\fR, is a system file that contains
-the mappings between the \fBsocket\fR(3SOCKET) call parameters and the
-transport provider driver. Its format is described on the \fBsoconfig\fR(1M)
-manual page.
+\fB/etc/sock2path.d\fR is a directory containing files with mappings
+between the \fBsocket\fR(3SOCKET) call parameters and the transport
+provider driver.  The mapping file format is described in the
+\fBsoconfig\fR(1M) manual page.
 .sp
 .LP
 The \fBinit\fR(1M) utility uses the \fBsoconfig\fR utility with the
-\fBsock2path\fR file during the boot sequence.
+\fBsock2path.d\fR directory during the boot sequence.
 .SH EXAMPLES
 .LP
-\fBExample 1 \fRAn Example of the \fBsock2path\fR File
+\fBExample 1 \fRAn Example of a Mapping File
 .sp
 .LP
-The following is an example of a \fBsock2path\fR file:
+The following is an example of a mapping file:
 
 .sp
 .in +2
diff --git a/usr/src/pkg/manifests/system-kernel.man4.inc b/usr/src/pkg/manifests/system-kernel.man4.inc
index 75e200e6a8..24cbdd6ba0 100644
--- a/usr/src/pkg/manifests/system-kernel.man4.inc
+++ b/usr/src/pkg/manifests/system-kernel.man4.inc
@@ -23,7 +23,7 @@ file path=usr/share/man/man4/proc.4
 file path=usr/share/man/man4/process.4
 file path=usr/share/man/man4/pseudo.4
 file path=usr/share/man/man4/scsi.4
-file path=usr/share/man/man4/sock2path.4
+file path=usr/share/man/man4/sock2path.d.4
 file path=usr/share/man/man4/system.4
 file path=usr/share/man/man4/tnf_kernel_probes.4
 file path=usr/share/man/man4/ts_dptbl.4