[illumos-gate merge]

commit 84f7925403b3bca6fbe5475f7e5fe9e20852b686
    9030 sgs: duplicate 'const' declaration specifier
commit 5bc667cefd2d0f1ce79426141196b29088ab4d26
    9120 bnxe does not load in DEBUG
commit 2f4149ea09454b3def6fe8245992f7e26571a1e8
    8893 Want date -r
commit 3e1e9f9b5f60fd97b8350805fdcbe6ea6dd752ef
    9115 audiorecord: this statement may fall through
commit 66d053586622b793fb2252b5365f76dd38610b97
    9113 Expose vendor-name/device-name/subsystem-name as props on pcifn/pciexfn topo nodes
commit 31898fe726d1ca3a719847c87e92cd9426558a3c
    9099 loader: Solaris 2 partition may have no VTOC
commit 66492cf01c4f0eb178cb6e056451d04be61a0374
    9103 opengroup acknowledgement should be properly formatted in man pages
commit b66926aad422ad350796a2770d6b2d328a63b92c
    9119 ficl-sys is not wsdiff clean
commit 779d959983c330a45b9542e16ae6a4a5d204309a
    9114 cmd/audio: invalid conversion from 'char' to 'char*'
commit e20c5ec63839e1ce8f384340afdd4e325e4af6d5
    9101 bring back pcitool man page
commit 146ac3cd9d5017d58ec9ba26132a9ee30d53c4aa
    9090 ses: using integer constants in boolean context, the expression will always evaluate to 'true'

	Conflicts:
	usr/src/test/util-tests/tests/Makefile
	usr/src/man/man3xnet/htonl.3xnet
	usr/src/man/man3nsl/t_bind.3nsl
	usr/src/man/man3c/timer_settime.3c
	usr/src/man/man3c/timer_create.3c
	usr/src/man/man1m/dladm.1m
	usr/src/man/man1/crontab.1

1 files changed, 15 insertions, 16 deletions

diff --git a/usr/src/man/man5/regex.5 b/usr/src/man/man5/regex.5
index b699737f68..2f84bd6daf 100644
--- a/usr/src/man/man5/regex.5
+++ b/usr/src/man/man5/regex.5
@@ -1,26 +1,25 @@
 .\"
-.\" Sun Microsystems, Inc. gratefully acknowledges The Open Group for permission
-.\" to reproduce portions of its copyrighted documentation.
-.\"
+.\" Sun Microsystems, Inc. gratefully acknowledges The Open Group for
+.\" permission to reproduce portions of its copyrighted documentation.
 .\" Original documentation from The Open Group can be obtained online at
 .\" http://www.opengroup.org/bookstore/.
 .\"
-.\" The Institute of Electrical and Electronics Engineers and The Open Group,
-.\" have given us permission to reprint portions of their documentation. In the
-.\" following statement, the phrase "this text" refers to portions of the system
+.\" The Institute of Electrical and Electronics Engineers and The Open
+.\" Group, have given us permission to reprint portions of their
 .\" documentation.
 .\"
-.\" Portions of this text are reprinted and reproduced in electronic form in the
-.\" Sun OS Reference Manual, from IEEE Std 1003.1, 2004 Edition, Standard for
-.\" Information Technology -- Portable Operating System Interface (POSIX),
-.\" The Open Group Base Specifications Issue 6, Copyright (C) 2001-2004 by the
-.\" Institute of Electrical and Electronics Engineers, Inc and The Open Group.
-.\"
-.\" In the event of any discrepancy between these versions and the original
-.\" IEEE and The Open Group Standard, the original IEEE and The Open Group
-.\" Standard is the referee document.
+.\" In the following statement, the phrase ``this text'' refers to portions
+.\" of the system documentation.
 .\"
-.\" The original Standard can be obtained online at
+.\" Portions of this text are reprinted and reproduced in electronic form
+.\" in the SunOS Reference Manual, from IEEE Std 1003.1, 2004 Edition,
+.\" Standard for Information Technology -- Portable Operating System
+.\" Interface (POSIX), The Open Group Base Specifications Issue 6,
+.\" Copyright (C) 2001-2004 by the Institute of Electrical and Electronics
+.\" Engineers, Inc and The Open Group.  In the event of any discrepancy
+.\" between these versions and the original IEEE and The Open Group
+.\" Standard, the original IEEE and The Open Group Standard is the referee
+.\" document.  The original Standard can be obtained online at
 .\" http://www.opengroup.org/unix/online.html.
 .\"
 .\" This notice shall appear on any product containing this material.