diff options
| author | John Sonnenschein <johns@joyent.com> | 2011-10-03 21:04:40 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2011-10-03 21:04:40 +0000 |
| commit | 4171a80dc48c62297457d0820f26cac6516e068a (patch) | |
| tree | 5e20c8b91e74482baeed81d9cda1af2f63207b82 /usr/src/man/man3sip/sip_guid.3sip | |
| parent | cb866ae1d95a57b3ac6bf38040e40ed0cd4fe835 (diff) | |
| parent | ed22c7109fc5dd9e1b7a5d0333bdc7ad2718e2ab (diff) | |
| download | illumos-joyent-4171a80dc48c62297457d0820f26cac6516e068a.tar.gz | |
[OS-663] Post-6.5 Illumos sync
Merge https://github.com/illumos/illumos-gate
Conflicts:
exception_lists/packaging
usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl
usr/src/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.include.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
usr/src/cmd/lp/Makefile
usr/src/cmd/lp/cmd/lpadmin/options.c
usr/src/cmd/lp/cmd/lpfilter.c
usr/src/cmd/lp/cmd/lpforms.c
usr/src/cmd/lp/cmd/lpusers.c
usr/src/cmd/lp/lib/lp/isterminfo.c
usr/src/cmd/lp/lib/lp/tidbit.c
usr/src/cmd/terminfo/att.ti
usr/src/cmd/zpool/zpool_main.c
usr/src/common/dis/i386/dis_tables.c
usr/src/lib/libdtrace/common/dt_options.c
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/man/man1m/dladm.1m
usr/src/man/man1m/flowadm.1m
usr/src/man/man1m/zoneadm.1m
usr/src/man/man1m/zonecfg.1m
usr/src/pkg/manifests/print-lp-print-client-commands.mf
usr/src/pkg/manifests/print-lp.mf
usr/src/uts/common/fs/zfs/sys/zio.h
usr/src/uts/common/fs/zfs/zio.c
usr/src/uts/i86pc/ml/mach_offsets.in
usr/src/uts/intel/amd64/ml/mach_offsets.in
usr/src/uts/intel/sys/tss.h
Diffstat (limited to 'usr/src/man/man3sip/sip_guid.3sip')
| -rw-r--r-- | usr/src/man/man3sip/sip_guid.3sip | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/usr/src/man/man3sip/sip_guid.3sip b/usr/src/man/man3sip/sip_guid.3sip index 13e2746403..8d8e38e4a2 100644 --- a/usr/src/man/man3sip/sip_guid.3sip +++ b/usr/src/man/man3sip/sip_guid.3sip @@ -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 sip_guid 3SIP "25 Jan 2007" "SunOS 5.11" "Session Initiation Protocol Library Functions" +.TH SIP_GUID 3SIP "Jan 25, 2007" .SH NAME sip_guid \- generate a random string .SH SYNOPSIS @@ -37,15 +37,14 @@ See \fBattributes\fR(5) for descriptions of the following attributes: .sp .TS -tab() box; -cw(2.75i) |cw(2.75i) -lw(2.75i) |lw(2.75i) -. -ATTRIBUTE TYPEATTRIBUTE VALUE +box; +c | c +l | l . +ATTRIBUTE TYPE ATTRIBUTE VALUE _ -Interface StabilityCommitted +Interface Stability Committed _ -MT-LevelMT-Safe +MT-Level MT-Safe .TE .SH SEE ALSO |