[illumos-gate merge]

commit feb562904dda8e3f95142866f81038eaef927433
    14303 libipadm depends on libipmp
commit 338d6fc1b322c01b220f204edde962e843478a78
    14258 The manual should follow RFC 2606
commit eabc1bc5e61dbfdd2fc3cb588315c864d621d500
    14274 fix a few broken pkg aliases

Conflicts:
    usr/src/uts/intel/os/driver_aliases

1 files changed, 4 insertions, 15 deletions

diff --git a/usr/src/man/man3sip/sip_parse_uri.3sip b/usr/src/man/man3sip/sip_parse_uri.3sip
index 878fab7d14..f7219532ae 100644
--- a/usr/src/man/man3sip/sip_parse_uri.3sip
+++ b/usr/src/man/man3sip/sip_parse_uri.3sip
@@ -3,11 +3,10 @@
 .\" 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 SIP_PARSE_URI 3SIP "Jan 25, 2007"
+.TH SIP_PARSE_URI 3SIP "November 22, 2021"
 .SH NAME
 sip_parse_uri, sip_free_parsed_uri \- parse a URI and free a parsed URI
 .SH SYNOPSIS
-.LP
 .nf
 \fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsip\fR [ \fIlibrary\fR ... ]
 #include <sip.h>
@@ -22,8 +21,6 @@ sip_parse_uri, sip_free_parsed_uri \- parse a URI and free a parsed URI
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 For functions that return a pointer of type \fIsip_str_t\fR, \fIsip_str_t\fR is
 supplied by:
 .sp
@@ -47,15 +44,15 @@ For example, given the following request line in a \fBSIP\fR message input to
 .sp
 .in +2
 .nf
-INVITE sip:marconi@radio.org SIP/2.0
+INVITE sip:marconi@example.org SIP/2.0
 .fi
 .in -2
 
 .sp
 .LP
 the return is a pointer to \fIsip_str_t\fR with the \fIsip_str_ptr\fR member
-pointing to "\fBs\fR" of \fBsip:marconi@radio.org\fR and \fIsip_str_len\fR
-being set to \fB21\fR, the length of \fBsip:marconi@radio.org\fR.
+pointing to "\fBs\fR" of \fBsip:marconi@example.org\fR and \fIsip_str_len\fR
+being set to \fB23\fR, the length of \fBsip:marconi@example.org\fR.
 .sp
 .LP
 The \fBsip_parse_uri()\fR function takes a \fBURI\fR string in the form
@@ -69,8 +66,6 @@ The \fBsip_free_parsed_uri()\fR function takes a parsed \fBURI\fR
 \fIsip_uri\fR, obtained from \fBsip_parse_uri()\fR, and frees any associated
 memory.
 .SH RETURN VALUES
-.sp
-.LP
 The \fBsip_parse_uri()\fR function returns the parsed \fBURI\fR \fIsip_uri\fR
 on success. It returns a \fBNULL\fR if memory cannot be allocated for the
 parsed \fBURI\fR.
@@ -79,8 +74,6 @@ parsed \fBURI\fR.
 The value of \fBerrno\fR is not changed by these calls in the event of an
 error.
 .SH ERRORS
-.sp
-.LP
 If the error is non-null, the following values is set:
 .sp
 .ne 2
@@ -104,8 +97,6 @@ components are requested from a \fBSIP[S]\fR \fBURI\fR.
 On success, the value of the location pointed to by \fIerror\fR is set to
 \fB0\fR.
 .SH ATTRIBUTES
-.sp
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
 
@@ -122,6 +113,4 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
-.LP
 \fBlibsip\fR(3LIB)