summaryrefslogtreecommitdiff
path: root/usr/src/man/man3socket
diff options
context:
space:
mode:
authorKeith M Wesolowski <wesolows@foobazco.org>2014-05-23 16:41:24 +0000
committerKeith M Wesolowski <wesolows@foobazco.org>2014-05-23 16:41:24 +0000
commita91c06a8156ca8bb1e3924d215816217659a26b3 (patch)
treecf4f96f35a34dd0648526afa90ca1b82a1f27e9f /usr/src/man/man3socket
parent69a680634e04707451f839a2d6bd43a2488061cb (diff)
parentedf345e6b8342e8627ec20ce821a977a62cee19d (diff)
downloadillumos-joyent-a91c06a8156ca8bb1e3924d215816217659a26b3.tar.gz
[illumos-gate merge]
commit edf345e6b8342e8627ec20ce821a977a62cee19d 3835 zfs need not store 2 copies of all metadata commit e56bd28502ece54c39ad86fd96643790902bb93e 4878 bug with printf and missing unsigned argument commit fec8e666848d54d90131b7c7d63132a3168697c2 4775 Typo in getaddrinfo(3SOCKET) man page Conflicts: usr/src/uts/common/fs/zfs/dmu.c (copyrights)
Diffstat (limited to 'usr/src/man/man3socket')
-rw-r--r--usr/src/man/man3socket/getaddrinfo.3socket4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/man/man3socket/getaddrinfo.3socket b/usr/src/man/man3socket/getaddrinfo.3socket
index 66f3731a58..135c8b5f80 100644
--- a/usr/src/man/man3socket/getaddrinfo.3socket
+++ b/usr/src/man/man3socket/getaddrinfo.3socket
@@ -3,7 +3,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 GETADDRINFO 3SOCKET "May 8, 2009"
+.TH GETADDRINFO 3SOCKET "May 22, 2014"
.SH NAME
getaddrinfo, getnameinfo, freeaddrinfo, gai_strerror \- translate between node
name and address
@@ -299,7 +299,7 @@ flags already defined for \fBgetaddrinfo()\fR.
.LP
For \fBgetaddrinfo()\fR, if the query is successful, a pointer to a linked list
of one or more \fBaddrinfo\fR structures is returned by the fourth argument and
-the function returns \fB0\fR. The order of the addresses returned i nthe fourth
+the function returns \fB0\fR. The order of the addresses returned in the fourth
argument is discussed in the ADDRESS ORDERING section. If the query fails, a
non-zero error code will be returned. For \fBgetnameinfo()\fR, if successful,
the strings hostname and service are copied into \fIhost\fR and \fIserv\fR,