[illumos-gate merge]

commit b2940a7c18c8e650b02d80910e86914d835d04d0
    4122 do_sysfile_cmd colon-separates the module path, and then we can't parse it
commit 522c768b8cd12cb4e80ed84c1eb5df0ed2fd2baa
    3789 iscsid disables warnings
commit 281033788b0b42de9863134d45880eab0979844e
    1770 3libucb and 3ucb manpages are 6 years behind reality
commit 72fb660e7d20fb0b72e43c7d5bac1acd8945077b
    1601 date command should support +%N
commit 98cdf45a92ada981b8c4e22ac69956b4139b1341
    4023 Properly escape newlines and carriage returns in man pages
commit a7fe1d5bb55904d4c79638b8778bc9dd8ed7fd7b
    4078 groupadd execs getent unnecessarily
    4127 dmake setup could create /etc/skel

    Manifest: usr/src/pkg/manifests/compatibility-ucb.mf

3 files changed, 9 insertions, 9 deletions

diff --git a/usr/src/man/man7d/poll.7d b/usr/src/man/man7d/poll.7d
index 4f91dfb4a1..cd3db77de9 100644
--- a/usr/src/man/man7d/poll.7d
+++ b/usr/src/man/man7d/poll.7d
@@ -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 POLL 7D "Mar 28, 2007"
+.TH POLL 7D "Sep 10, 2013"
 .SH NAME
 poll \- driver for fast poll on many file descriptors
 .SH SYNOPSIS
@@ -248,14 +248,14 @@ The following example is part of a test program which shows how
                 result = ioctl(wfd, DP_ISPOLLED, &dpfd);
                 if (result < 0) {
                         perror("/dev/poll ioctl DP_ISPOLLED failed");
-                        printf("errno = %d\n", errno);
+                        printf("errno = %d\en", errno);
                         close (wfd);
                         free(pollfd);
                         error = 1;
                         goto out1;
                 }
                 if (result != 1) {
-                        printf("DP_ISPOLLED returned incorrect result: %d.\n",
+                        printf("DP_ISPOLLED returned incorrect result: %d.\en",
                                 result);
                         close (wfd);
                         free(pollfd);
@@ -263,7 +263,7 @@ The following example is part of a test program which shows how
                         goto out1;
                 }
                 if (dpfd.fd != fds[rn]) {
-                        printf("DP_ISPOLLED returned wrong fd %d, expect %d\n",
+                        printf("DP_ISPOLLED returned wrong fd %d, expect %d\en",
                                 dpfd.fd, fds[rn]);
                         close (wfd);
                         free(pollfd);
@@ -271,7 +271,7 @@ The following example is part of a test program which shows how
                         goto out1;
  }
                 if (dpfd.revents != POLLIN) {
-                        printf("DP_ISPOLLED returned unexpected revents %d\n",
+                        printf("DP_ISPOLLED returned unexpected revents %d\en",
                                 dpfd.revents);
                         close (wfd);
                         free(pollfd);
diff --git a/usr/src/man/man7d/tsalarm.7d b/usr/src/man/man7d/tsalarm.7d
index 9e0c344854..c2ee9ae421 100644
--- a/usr/src/man/man7d/tsalarm.7d
+++ b/usr/src/man/man7d/tsalarm.7d
@@ -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 TSALARM 7D "Mar 16, 2004"
+.TH TSALARM 7D "Sep 10, 2013"
 .SH NAME
 tsalarm \- Alarm device driver
 .SH SYNOPSIS
@@ -210,7 +210,7 @@ How to set an alarm:
         int fd = open(LOM_DEVICE, O_RDWR);
 
         if (fd == -1) {
-                printf("Error opening device: %s\n", LOM_DEVICE);
+                printf("Error opening device: %s\en", LOM_DEVICE);
                 exit (1);
         }
 
diff --git a/usr/src/man/man7d/ugen.7d b/usr/src/man/man7d/ugen.7d
index 9ba8be68fa..a9a5b11305 100644
--- a/usr/src/man/man7d/ugen.7d
+++ b/usr/src/man/man7d/ugen.7d
@@ -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 UGEN 7D "Dec 3, 2008"
+.TH UGEN 7D "Sep 10, 2013"
 .SH NAME
 ugen \- USB generic driver
 .SH SYNOPSIS
@@ -1139,7 +1139,7 @@ The following example shows how to read an isochronous-IN endpoint:
 
 			for (i = 0; i < pktcnt; i++) {
 				printf("packet %d len = %d,"
-					" actual_len = %d, status = 0x%x\n",
+					" actual_len = %d, status = 0x%x\en",
 					i, pktdesc->dsc_isoc_pkt_len,
 					pktdesc->dsc_isoc_pkt_actual_len,
 					pktdesc->dsc_isoc_pkt_status);