From owner-svn-src-head@FreeBSD.ORG  Fri Apr 12 16:36:19 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0179CAD7;
 Fri, 12 Apr 2013 16:36:19 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E87BA11BE;
 Fri, 12 Apr 2013 16:36:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3CGaIcW071559;
 Fri, 12 Apr 2013 16:36:18 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3CGaI5m071558;
 Fri, 12 Apr 2013 16:36:18 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201304121636.r3CGaI5m071558@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 12 Apr 2013 16:36:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249412 - head/share/man/man9
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Apr 2013 16:36:19 -0000

Author: trasz
Date: Fri Apr 12 16:36:18 2013
New Revision: 249412
URL: http://svnweb.freebsd.org/changeset/base/249412

Log:
  Fix usage for soreceive(9) - uio must always be non-NULL.
  
  MFC after:	1 week

Modified:
  head/share/man/man9/socket.9

Modified: head/share/man/man9/socket.9
==============================================================================
--- head/share/man/man9/socket.9	Fri Apr 12 16:29:15 2013	(r249411)
+++ head/share/man/man9/socket.9	Fri Apr 12 16:36:18 2013	(r249412)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 14, 2006
+.Dd April 12, 2013
 .Dt SOCKET 9
 .Os
 .Sh NAME
@@ -208,12 +208,19 @@ Data may be retrieved directly to kernel
 argument, or as an mbuf chain returned to the caller via
 .Fa mp0 ,
 avoiding a data copy.
-Only one of the
+The
 .Fa uio
-or
-.Fa mp0
-pointers may be
+must always be
 .Pf non- Dv NULL .
+If
+.Fa mp0
+is
+.Pf non- Dv NULL ,
+only the
+.Pf uio_resid
+of
+.Fa uio
+is used.
 The caller may optionally retrieve a socket address on a protocol with the
 .Dv PR_ADDR
 capability by providing storage via