From owner-svn-src-projects@FreeBSD.ORG  Thu Oct  8 21:45:22 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 054F61065670;
	Thu,  8 Oct 2009 21:45:22 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E8FE68FC1B;
	Thu,  8 Oct 2009 21:45:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n98LjLGk034267;
	Thu, 8 Oct 2009 21:45:21 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n98LjLB3034265;
	Thu, 8 Oct 2009 21:45:21 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200910082145.n98LjLB3034265@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 8 Oct 2009 21:45:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197876 - projects/capabilities8/share/man/man4
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Oct 2009 21:45:22 -0000

Author: rwatson
Date: Thu Oct  8 21:45:20 2009
New Revision: 197876
URL: http://svn.freebsd.org/changeset/base/197876

Log:
  Manually merge r197778 from head to capabilities8:
  
    SOCK_SEQPACKET is now supported on UNIX domain sockets.
  
    Sponsored by:   Google

Modified:
  projects/capabilities8/share/man/man4/unix.4

Modified: projects/capabilities8/share/man/man4/unix.4
==============================================================================
--- projects/capabilities8/share/man/man4/unix.4	Thu Oct  8 21:42:53 2009	(r197875)
+++ projects/capabilities8/share/man/man4/unix.4	Thu Oct  8 21:45:20 2009	(r197876)
@@ -52,7 +52,8 @@ mechanisms.
 The
 .Ux Ns -domain
 family supports the
-.Dv SOCK_STREAM
+.Dv SOCK_STREAM ,
+.Dv SOCK_SEQPACKET ,
 and
 .Dv SOCK_DGRAM
 socket types and uses
@@ -127,11 +128,14 @@ The
 .Ux Ns -domain
 protocol family is comprised of simple
 transport protocols that support the
-.Dv SOCK_STREAM
+.Dv SOCK_STREAM ,
+.Dv SOCK_SEQPACKET ,
 and
 .Dv SOCK_DGRAM
 abstractions.
 .Dv SOCK_STREAM
+and
+.Dv SOCK_SEQPACKET
 sockets also support the communication of
 .Ux
 file descriptors through the use of the
@@ -206,8 +210,9 @@ and tested with
 .Xr getsockopt 2 :
 .Bl -tag -width ".Dv LOCAL_CONNWAIT"
 .It Dv LOCAL_CREDS
-This option may be enabled on a
-.Dv SOCK_DGRAM
+This option may be enabled on
+.Dv SOCK_DGRAM ,
+.Dv SOCK_SEQPACKET ,
 or a
 .Dv SOCK_STREAM
 socket.