[illumos-gate merge]release-20160625

commit 01aaaf328842760a1002109b299908a027e94cf8
    7051 want id_space(9F) docs
commit c1de7575521deda5ee777b8054a9c5b12f15b1ee
    7120 mDNS resync was not wsdiff safe
commit 9c05409f2b9301e686735887a9573454cceb0331
    7069 i386_XARCH should include -m32
commit 406fc5100dac8d225a315a6def6be8d628f34e24
    6602 lofi should support labeled devices
commit f3a07f941f1be263a48a040c059edbcb722cf436
    4712 Prefer 'parsable' over 'parseable' in the manual pages
commit 1b2031a95889aea96be6af55dcf31a0d5ffdfed9
    7050 Prefer 'subcommand' over 'sub-command' in the manual pages
commit 831b40b1c811223fd0b1131791a38e3ae5143377
    7049 Prefer 'writable' over 'writeable' in the manual pages
commit a716f1a92056bc2e231e57ae2a20725ce606ea73
    7047 Fix spelling mistakes in sections 9E, 9F and 9S
commit 95e15299a2c42b8014fa27631a6f3be2a93febc2
    7048 Fix spelling mistakes in sections 7D, 7I, 7IPP, and 7P
commit df23565fe1d0b225f9f898c50dfafea6749b0b7f
    7046 Fix spelling mistakes in section 5
commit c855112f85cf71e42f6381a66f3f86f98e2ed24e
    7045 Fix spelling mistakes in section 4
commit 843c398e8904ed9d833d2af3103894f909fb4b52
    7042 Fix spelling mistakes in library sections
commit 0db8de19c0e494758b68b702523a2b0eaffe3b2e
    7044 Fix spelling mistakes in sections 1HAS and 2
commit df23d905b96680e56379c5a5ecb4b363f36b9e74
    7041 Fix spelling mistakes in sections 1 and 1M
commit 71af3be340c57171837478555e2eb0d496318cfc
    7040 Detect common spelling errors in manual pages

	Conflicts:
	usr/src/uts/common/fs/vfs.c
	usr/src/man/man7d/cpuid.7d
	usr/src/man/man5/privileges.5
	usr/src/man/man3c/signalfd.3c
	usr/src/cmd/lofiadm/main.c

201 files changed, 3276 insertions, 2786 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 036da7d7e9..27346065da 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -338,7 +338,7 @@ CCUNBOUND	= $($(MACH)_CCUNBOUND)
 # overridable for testing.
 sparc_XARCH=	-m32
 sparcv9_XARCH=	-m64
-i386_XARCH=
+i386_XARCH=	-m32
 amd64_XARCH=	-m64 -Ui386 -U__i386
 
 # assembler '-xarch' flag.  Different from compiler '-xarch' flag.
diff --git a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
index cc3ab285c0..01c94af04d 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
@@ -24,6 +24,7 @@ OBJS=		ClientCommon.o dns-sd.o
 SRCS=		ClientCommon.c dns-sd.c
 
 CFLAGS += $(C99_ENABLE)
+CPPFLAGS += -DMDNS_VERSIONSTR_NODTS
 LDLIBS += -lsocket -ldns_sd
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c
index 9acf41e581..3be1426794 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c
+++ b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c
@@ -200,7 +200,7 @@ static const char kFilePathSep = '/';
 typedef struct
 {
     unsigned short keyTag;
-    unsigned char alg; 
+    unsigned char alg;
     unsigned char digestType;
     unsigned char  *digest;
 } rdataDS;
@@ -214,12 +214,12 @@ typedef struct
     unsigned char *data;
 } rdataDNSKey;
 
-//size of rdataRRSIG excluding signerName and signature (which are variable fields) 
+//size of rdataRRSIG excluding signerName and signature (which are variable fields)
 #define RRSIG_FIXED_SIZE      18
 typedef struct
 {
     unsigned short typeCovered;
-    unsigned char alg; 
+    unsigned char alg;
     unsigned char labels;
     unsigned int origTTL;
     unsigned int sigExpireTime;
@@ -267,13 +267,13 @@ static volatile int timeOut = LONG_TIME;
 
 //*************************************************************************************************************
 // Supporting Utility Functions
-static uint16_t GetRRClass(const char *s)   
+static uint16_t GetRRClass(const char *s)
 {
-    if (!strcasecmp(s, "IN")) 
+    if (!strcasecmp(s, "IN"))
         return kDNSServiceClass_IN;
     else
         return(atoi(s));
-}     
+}
 
 static uint16_t GetRRType(const char *s)
 {
@@ -348,7 +348,7 @@ static char *DNSTypeName(unsigned short rr_type)
         case kDNSServiceType_RRSIG:     return("RRSIG");
         case kDNSServiceType_DNSKEY:    return("DNSKEY");
         case kDNSServiceType_DS:        return("DS");
-        default:            
+        default:
         {
             static char buffer[RR_TYPE_SIZE];
             snprintf(buffer, sizeof(buffer), "TYPE%d", rr_type);
@@ -363,12 +363,12 @@ static unsigned short swap16(unsigned short x)
     return (unsigned short)((unsigned short)ptr[0] << 8 | ptr[1]);
 }
 
-static unsigned int swap32(unsigned int x) 
+static unsigned int swap32(unsigned int x)
 {
     unsigned char *ptr = (unsigned char *)&x;
     return (unsigned int)((unsigned int)ptr[0] << 24 | (unsigned int)ptr[1] << 16 | (unsigned int)ptr[2] << 8 | ptr[3]);
 }
-static unsigned int keytag(unsigned char *key, unsigned int keysize)  
+static unsigned int keytag(unsigned char *key, unsigned int keysize)
 {
     unsigned long ac;
     unsigned int i;
@@ -397,17 +397,17 @@ static void base64Encode(char *buffer, int buflen, void *rdata, unsigned int rdl
     null_str = dispatch_data_create("", 1, dispatch_get_global_queue(0, 0), ^{});
     if (!null_str)
         goto done;
- 
+
     data = dispatch_data_create_concat(dest_data, null_str);
     if (!data)
-        goto done;    
+        goto done;
 
-    map = dispatch_data_create_map(data, &result, &size);    
+    map = dispatch_data_create_map(data, &result, &size);
     if (!map)
         goto done;
 
     snprintf(buffer, buflen, " %s", (char *)result);
-    
+
 done:
     if (src_data) dispatch_release(src_data);
     if (dest_data) dispatch_release(dest_data);
@@ -418,7 +418,7 @@ done:
 #else  //_DNS_SD_LIBDISPATCH
     snprintf(buffer, buflen, " %s", ".");
     return;
-#endif //_DNS_SD_LIBDISPATCH 
+#endif //_DNS_SD_LIBDISPATCH
 }
 
 #if HAS_NAT_PMP_API | HAS_ADDRINFO_API
@@ -468,7 +468,7 @@ static void printtimestamp(void)
 }
 
 // formating time to RFC 4034 format
-static void FormatTime(unsigned long te, unsigned char *buf, int bufsize) 
+static void FormatTime(unsigned long te, unsigned char *buf, int bufsize)
 {
     struct tm tmTime;
 #ifdef _WIN32
@@ -696,10 +696,10 @@ static void DNSSD_API browse_reply(DNSServiceRef sdref, const DNSServiceFlags fl
 
     if (num_printed++ == 0) printf("Timestamp     A/R    Flags  if %-20s %-20s %s\n", "Domain", "Service Type", "Instance Name");
     printtimestamp();
-    if (errorCode) 
+    if (errorCode)
         printf("Error code %d\n", errorCode);
-    else 
-        printf("%s %8X %3d %-20s %-20s %s\n", 
+    else
+        printf("%s %8X %3d %-20s %-20s %s\n",
                 op, flags, ifIndex, replyDomain, replyType, replyName);
     if (!(flags & kDNSServiceFlagsMoreComing)) fflush(stdout);
 
@@ -869,10 +869,10 @@ static int snprintd(char *p, int max, const unsigned char **rd)
 {
     const char *const buf = p;
     const char *const end = p + max;
-    while (**rd) 
-    { 
-        p += snprintf(p, end-p, "%.*s.", **rd, *rd+1); 
-        *rd += 1 + **rd; 
+    while (**rd)
+    {
+        p += snprintf(p, end-p, "%.*s.", **rd, *rd+1);
+        *rd += 1 + **rd;
     }
     *rd += 1;   // Advance over the final zero byte
     return(p-buf);
@@ -881,7 +881,7 @@ static int snprintd(char *p, int max, const unsigned char **rd)
 static void ParseDNSSECRecords(uint16_t rrtype, char *rdb, char *p, unsigned const char *rd, uint16_t rdlen)
 {
     int rdb_size = 1000;
-    switch (rrtype) 
+    switch (rrtype)
     {
         case kDNSServiceType_DS:
         {
@@ -892,10 +892,10 @@ static void ParseDNSSECRecords(uint16_t rrtype, char *rdb, char *p, unsigned con
                           rrds->alg, swap16(rrds->keyTag), rrds->digestType);
             ptr = (unsigned char *)(rd + DS_FIXED_SIZE);
             for (i = 0; i < (rdlen - DS_FIXED_SIZE); i++)
-                p += snprintf(p, rdb + rdb_size - p, "%x", ptr[i]);   
-            break; 
-        } 
-            
+                p += snprintf(p, rdb + rdb_size - p, "%x", ptr[i]);
+            break;
+        }
+
         case kDNSServiceType_DNSKEY:
         {
             rdataDNSKey *rrkey = (rdataDNSKey *)rd;
@@ -904,32 +904,32 @@ static void ParseDNSSECRecords(uint16_t rrtype, char *rdb, char *p, unsigned con
             base64Encode(p, rdb + rdb_size - p, (unsigned char *)(rd + DNSKEY_FIXED_SIZE), rdlen - DNSKEY_FIXED_SIZE);
             break;
         }
-            
-        case kDNSServiceType_NSEC: 
+
+        case kDNSServiceType_NSEC:
         {
             unsigned char *next = (unsigned char *)rd;
             int len, bitmaplen;
             int win, wlen, type;
             unsigned char *bmap;
             char *l = NULL;
-            
+
             l = p;
             p += snprintd(p, rdb + rdb_size - p, &rd);
             len = p - l + 1;
-            
+
             bitmaplen = rdlen - len;
             bmap = (unsigned char *)((unsigned char *)next + len);
-            
+
             while (bitmaplen > 0)
             {
                 int i;
-                
+
                 if (bitmaplen < 3)
                 {
                     printf("Case NSEC: malformed nsec, bitmaplen %d short\n", bitmaplen);
                     break;
-                }   
-                
+                }
+
                 win = *bmap++;
                 wlen = *bmap++;
                 bitmaplen -= 2;
@@ -954,8 +954,8 @@ static void ParseDNSSECRecords(uint16_t rrtype, char *rdb, char *p, unsigned con
             }
             break;
         }
-            
-        case kDNSServiceType_RRSIG:    
+
+        case kDNSServiceType_RRSIG:
         {
             rdataRRSig *rrsig = (rdataRRSig *)rd;
             unsigned char expTimeBuf[64];
@@ -965,27 +965,27 @@ static void ParseDNSSECRecords(uint16_t rrtype, char *rdb, char *p, unsigned con
             const unsigned char *q = NULL;
             char *k = NULL;
             int len;
-            
+
             expClock = (unsigned long)swap32(rrsig->sigExpireTime);
             FormatTime(expClock, expTimeBuf, sizeof(expTimeBuf));
-            
+
             inceptClock = (unsigned long)swap32(rrsig->sigInceptTime);
             FormatTime(inceptClock, inceptTimeBuf, sizeof(inceptTimeBuf));
-            
+
             p += snprintf(p, rdb + rdb_size - p, " %-7s  %d  %d  %d  %s  %s  %7d  ",
                           DNSTypeName(swap16(rrsig->typeCovered)), rrsig->alg, rrsig->labels, swap32(rrsig->origTTL),
                           expTimeBuf, inceptTimeBuf, swap16(rrsig->keyTag));
-            
+
             q = (const unsigned char *)&rrsig->signerName;
             k = p;
             p += snprintd(p, rdb + rdb_size - p, &q);
             len = p - k + 1;
-            
+
             base64Encode(p, rdb + rdb_size - p, (unsigned char *)(rd + len + RRSIG_FIXED_SIZE), rdlen - (len + RRSIG_FIXED_SIZE));
             break;
         }
     }
-    return;                           
+    return;
 }
 
 static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags, uint32_t ifIndex, DNSServiceErrorType errorCode,
@@ -1009,9 +1009,9 @@ static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags,
 
     if (num_printed++ == 0)
     {
-        if (operation == 'D') 
-            printf("Timestamp     A/R if %-30s%-6s%-7s%-18s Rdata\n", "Name", "Type", "Class", "DNSSECStatus"); 
-        else     
+        if (operation == 'D')
+            printf("Timestamp     A/R if %-30s%-6s%-7s%-18s Rdata\n", "Name", "Type", "Class", "DNSSECStatus");
+        else
             printf("Timestamp     A/R Flags if %-30s%-6s%-7s Rdata\n", "Name", "Type", "Class");
     }
     printtimestamp();
@@ -1036,7 +1036,7 @@ static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags,
                 case kDNSServiceType_A:
                     snprintf(rdb, sizeof(rdb), "%d.%d.%d.%d", rd[0], rd[1], rd[2], rd[3]);
                     break;
-    
+
                 case kDNSServiceType_NS:
                 case kDNSServiceType_CNAME:
                 case kDNSServiceType_PTR:
@@ -1072,13 +1072,13 @@ static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags,
                     ParseDNSSECRecords(rrtype, rdb, p, rd, rdlen);
                     break;
 
-                default: 
-                    snprintf(rdb, sizeof(rdb), "%d bytes%s", rdlen, rdlen ? ":" : ""); 
+                default:
+                    snprintf(rdb, sizeof(rdb), "%d bytes%s", rdlen, rdlen ? ":" : "");
                     unknowntype = 1;
                     break;
-            }   
-        }   
-        else 
+            }
+        }
+        else
         {
             strncpy(rdb, "----", sizeof(rdb));
             //Clear all o/p bits, and then check for dnssec status
@@ -1089,7 +1089,7 @@ static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags,
                 strncpy(dnssec_status, "Insecure", sizeof(dnssec_status));
             else if (check_flags & kDNSServiceFlagsIndeterminate)
                 strncpy(dnssec_status, "Indeterminate", sizeof(dnssec_status));
-            else if (check_flags & kDNSServiceFlagsBogus) 
+            else if (check_flags & kDNSServiceFlagsBogus)
                 strncpy(dnssec_status, "Bogus", sizeof(dnssec_status));
         }
     }
@@ -1099,13 +1099,13 @@ static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags,
     else
         printf("%s%6X%3d %-30s%-7s%-6s %s", op, flags, ifIndex, fullname, rr_type, rr_class, rdb);
     if (unknowntype)
-    { 
-        while (rd < end) 
+    {
+        while (rd < end)
             printf(" %02X", *rd++);
     }
     if (errorCode)
     {
-        if (errorCode == kDNSServiceErr_NoSuchRecord) 
+        if (errorCode == kDNSServiceErr_NoSuchRecord)
             printf("    No Such Record");
         else if (errorCode == kDNSServiceErr_Timeout)
         {
@@ -1120,7 +1120,7 @@ static void DNSSD_API qr_reply(DNSServiceRef sdref, const DNSServiceFlags flags,
         if (flags & kDNSServiceFlagsAdd)
             DNSServiceReconfirmRecord(flags, ifIndex, fullname, rrtype, rrclass, rdlen, rdata);
 
-    if (!(flags & kDNSServiceFlagsMoreComing)) 
+    if (!(flags & kDNSServiceFlagsMoreComing))
         fflush(stdout);
 }
 
@@ -1153,7 +1153,7 @@ static void DNSSD_API addrinfo_reply(DNSServiceRef sdref, const DNSServiceFlags
 {
     char *op = (flags & kDNSServiceFlagsAdd) ? "Add" : "Rmv";
     char addr[256] = "";
-    char dnssec_status[15] = "Unknown"; 
+    char dnssec_status[15] = "Unknown";
     DNSServiceFlags check_flags = flags;
 	(void) sdref;
 	(void) context;
@@ -1162,13 +1162,13 @@ static void DNSSD_API addrinfo_reply(DNSServiceRef sdref, const DNSServiceFlags
 
     if (num_printed++ == 0)
     {
-        if (operation == 'g') 
+        if (operation == 'g')
             printf("Timestamp     A/R if %-25s %-44s %-18s\n", "Hostname", "Address", "DNSSECStatus");
-        else  
+        else
             printf("Timestamp     A/R Flags if %-38s %-44s %s\n", "Hostname", "Address", "TTL");
     }
     printtimestamp();
-   
+
     if (address && address->sa_family == AF_INET)
     {
         const unsigned char *b = (const unsigned char *) &((struct sockaddr_in *)address)->sin_addr;
@@ -1198,24 +1198,24 @@ static void DNSSD_API addrinfo_reply(DNSServiceRef sdref, const DNSServiceFlags
             strncpy(dnssec_status, "Insecure", sizeof(dnssec_status));
         else if (check_flags & kDNSServiceFlagsIndeterminate)
             strncpy(dnssec_status, "Indeterminate", sizeof(dnssec_status));
-        else if (check_flags & kDNSServiceFlagsBogus) 
+        else if (check_flags & kDNSServiceFlagsBogus)
             strncpy(dnssec_status, "Bogus", sizeof(dnssec_status));
     }
-    
+
     if (operation == 'g')
         printf("%s%3d %-25s %-44s %-18s", op, interfaceIndex, hostname, addr, dnssec_status);
     else
         printf("%s%6X%3d %-38s %-44s %d", op, flags, interfaceIndex, hostname, addr, ttl);
     if (errorCode)
     {
-        if (errorCode == kDNSServiceErr_NoSuchRecord) 
+        if (errorCode == kDNSServiceErr_NoSuchRecord)
             printf("   No Such Record");
-        else 
+        else
             printf("   Error code %d", errorCode);
     }
     printf("\n");
 
-    if (!(flags & kDNSServiceFlagsMoreComing)) 
+    if (!(flags & kDNSServiceFlagsMoreComing))
         fflush(stdout);
 }
 #endif
@@ -1634,7 +1634,7 @@ int main(int argc, char **argv)
         flags |= kDNSServiceFlagsReturnIntermediates;
         if (operation == 'q')
             flags |= kDNSServiceFlagsSuppressUnusable;
-        if (argc < opi+1) 
+        if (argc < opi+1)
             goto Fail;
         rrtype = (argc <= opi+1) ? kDNSServiceType_A  : GetRRType(argv[opi+1]);
         rrclass = (argc <= opi+2) ? kDNSServiceClass_IN : GetRRClass(argv[opi+2]);
@@ -1725,9 +1725,9 @@ int main(int argc, char **argv)
             else
                 flags |= kDNSServiceFlagsValidate;
         }
-        if (argc != opi+2) 
+        if (argc != opi+2)
             goto Fail;
-        else 
+        else
             err = DNSServiceGetAddrInfo(&client, flags, opinterface, GetProtocol(argv[opi+0]), argv[opi+1], addrinfo_reply, NULL);
         break;
     }
@@ -1811,7 +1811,11 @@ Fail:
 
 // NOT static -- otherwise the compiler may optimize it out
 // The "@(#) " pattern is a special prefix the "what" command looks for
+#ifndef MDNS_VERSIONSTR_NODTS
 const char VersionString_SCCS[] = "@(#) dns-sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+#else
+const char VersionString_SCCS[] = "@(#) dns-sd " STRINGIFY(mDNSResponderVersion);
+#endif
 
 #if _BUILDING_XCODE_PROJECT_
 // If the process crashes, then this string will be magically included in the automatically-generated crash log
diff --git a/usr/src/cmd/devfsadm/devfsadm.c b/usr/src/cmd/devfsadm/devfsadm.c
index 448554a5e0..7d7904e9c0 100644
--- a/usr/src/cmd/devfsadm/devfsadm.c
+++ b/usr/src/cmd/devfsadm/devfsadm.c
@@ -20,6 +20,7 @@
  */
 
 /*
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
@@ -3289,7 +3290,7 @@ rm_parent_dir_if_empty(char *pathname)
  */
 void
 devfsadm_rm_stale_links(char *dir_re, char *valid_link, di_node_t node,
-			di_minor_t minor)
+    di_minor_t minor)
 {
 	link_t *link;
 	linkhead_t *head;
@@ -4837,7 +4838,7 @@ get_component(char *str, const char *comp_str)
  */
 int
 devfsadm_enumerate_int(char *devfs_path, int index, char **buf,
-			devfsadm_enumerate_t rules[], int nrules)
+    devfsadm_enumerate_t rules[], int nrules)
 {
 	return (find_enum_id(rules, nrules,
 	    devfs_path, index, "0", INTEGER, buf, 0));
@@ -4857,7 +4858,7 @@ disk_enumerate_int(char *devfs_path, int index, char **buf,
  */
 static int
 devfsadm_enumerate_int_start(char *devfs_path, int index, char **buf,
-		devfsadm_enumerate_t rules[], int nrules, char *start)
+    devfsadm_enumerate_t rules[], int nrules, char *start)
 {
 	return (find_enum_id(rules, nrules,
 	    devfs_path, index, start, INTEGER, buf, 0));
@@ -4869,7 +4870,7 @@ devfsadm_enumerate_int_start(char *devfs_path, int index, char **buf,
  */
 int
 devfsadm_enumerate_char(char *devfs_path, int index, char **buf,
-			devfsadm_enumerate_t rules[], int nrules)
+    devfsadm_enumerate_t rules[], int nrules)
 {
 	return (find_enum_id(rules, nrules,
 	    devfs_path, index, "a", LETTER, buf, 0));
@@ -4881,7 +4882,7 @@ devfsadm_enumerate_char(char *devfs_path, int index, char **buf,
  */
 int
 devfsadm_enumerate_char_start(char *devfs_path, int index, char **buf,
-	devfsadm_enumerate_t rules[], int nrules, char *start)
+    devfsadm_enumerate_t rules[], int nrules, char *start)
 {
 	return (find_enum_id(rules, nrules,
 	    devfs_path, index, start, LETTER, buf, 0));
@@ -4898,8 +4899,8 @@ devfsadm_enumerate_char_start(char *devfs_path, int index, char **buf,
  */
 static int
 find_enum_id(devfsadm_enumerate_t rules[], int nrules,
-	char *devfs_path, int index, char *min, int type, char **buf,
-	int multiple)
+    char *devfs_path, int index, char *min, int type, char **buf,
+    int multiple)
 {
 	numeral_t *matchnp;
 	numeral_t *numeral;
@@ -4999,7 +5000,7 @@ find_enum_id(devfsadm_enumerate_t rules[], int nrules,
  */
 static int
 lookup_enum_cache(numeral_set_t *set, char *cmp_str,
-	devfsadm_enumerate_t rules[], int index, numeral_t **matchnpp)
+    devfsadm_enumerate_t rules[], int index, numeral_t **matchnpp)
 {
 	int matchcount = 0, rv = -1;
 	int uncached;
@@ -5390,7 +5391,7 @@ new_id(numeral_t *numeral, int type, char *min)
 
 static int
 enumerate_parse(char *rsvstr, char *path_left, numeral_set_t *setp,
-	    devfsadm_enumerate_t rules[], int index)
+    devfsadm_enumerate_t rules[], int index)
 {
 	char	*slash1 = NULL;
 	char	*slash2 = NULL;
@@ -5506,7 +5507,7 @@ out:
  */
 static void
 enumerate_recurse(char *current_dir, char *path_left, numeral_set_t *setp,
-	    devfsadm_enumerate_t rules[], int index)
+    devfsadm_enumerate_t rules[], int index)
 {
 	char *slash;
 	char *new_path;
@@ -5661,7 +5662,7 @@ create_reserved_numeral(numeral_set_t *setp, char *numeral_id)
  */
 static void
 create_cached_numeral(char *path, numeral_set_t *setp, char *numeral_id,
-	devfsadm_enumerate_t rules[], int index)
+    devfsadm_enumerate_t rules[], int index)
 {
 	char linkbuf[PATH_MAX + 1];
 	char lpath[PATH_MAX + 1];
@@ -5838,7 +5839,7 @@ devfsadm_copy(void)
 /*ARGSUSED*/
 static int
 devfsadm_copy_file(const char *file, const struct stat *stat,
-		    int flags, struct FTW *ftw)
+    int flags, struct FTW *ftw)
 {
 	struct stat sp;
 	dev_t newdev;
@@ -6290,7 +6291,7 @@ read_devlinktab_file(void)
  */
 static int
 split_devlinktab_entry(char *entry, char **selector, char **p_link,
-			char **s_link)
+    char **s_link)
 {
 	char *tab;
 
@@ -6726,7 +6727,7 @@ get_anchored_re(char *link, char *anchored_re, char *pattern)
 
 static int
 construct_devlink(char *link, link_list_t *link_build, char *contents,
-			di_minor_t minor, di_node_t node, char *pattern)
+    di_minor_t minor, di_node_t node, char *pattern)
 {
 	int counter_offset = -1;
 	devfsadm_enumerate_t rules[1] = {NULL};
@@ -7133,7 +7134,7 @@ dequote(char *src)
  */
 static void
 getattr(char *phy_path, char *aminor, int spectype, dev_t dev, mode_t *mode,
-	uid_t *uid, gid_t *gid)
+    uid_t *uid, gid_t *gid)
 {
 	char devname[PATH_MAX + 1];
 	char *node_name;
@@ -8219,6 +8220,26 @@ build_event_attributes(char *class, char *subclass, char *node_path,
 		goto out;
 
 	if (strcmp(subclass, ESC_DISK) == 0) {
+		/*
+		 * While we're removing labeled lofi device, we will receive
+		 * event for every registered minor device and lastly,
+		 * an event with minor set to NULL, as in following example:
+		 * class: EC_dev_remove subclass: disk
+		 * node_path: /pseudo/lofi@1 driver: lofi minor: u,raw
+		 * class: EC_dev_remove subclass: disk
+		 * node_path: /pseudo/lofi@1 driver: lofi minor: NULL
+		 *
+		 * When we receive this last event with minor set to NULL,
+		 * all lofi minor devices are already removed and the call to
+		 * lookup_disk_dev_name() would result in error.
+		 * To prevent name lookup error messages for this case, we
+		 * need to filter out that last event.
+		 */
+		if (strcmp(class, EC_DEV_REMOVE) == 0 &&
+		    strcmp(driver_name, "lofi") ==  0 && minor == NULL) {
+			nvlist_free(nvl);
+			return (NULL);
+		}
 		if ((dev_name = lookup_disk_dev_name(node_path)) == NULL) {
 			dev_name_lookup_err = 1;
 			goto out;
@@ -8239,11 +8260,26 @@ build_event_attributes(char *class, char *subclass, char *node_path,
 		 * The raw minor node is created or removed after the block
 		 * node.  Lofi devfs events are dependent on this behavior.
 		 * Generate the sysevent only for the raw minor node.
+		 *
+		 * If the lofi mapping is created, we will receive the following
+		 * event: class: EC_dev_add subclass: lofi minor: NULL
+		 *
+		 * As in case of EC_dev_add, the minor is NULL pointer,
+		 * to get device links created, we will need to provide the
+		 * type of minor node for lookup_lofi_dev_name()
+		 *
+		 * If the lofi device is unmapped, we will receive following
+		 * events:
+		 * class: EC_dev_remove subclass: lofi minor: disk
+		 * class: EC_dev_remove subclass: lofi minor: disk,raw
+		 * class: EC_dev_remove subclass: lofi minor: NULL
 		 */
-		if (strstr(minor, "raw") == NULL) {
-			if (nvl) {
-				nvlist_free(nvl);
-			}
+
+		if (strcmp(class, EC_DEV_ADD) == 0 && minor == NULL)
+			minor = "disk,raw";
+
+		if (minor == NULL || strstr(minor, "raw") == NULL) {
+			nvlist_free(nvl);
 			return (NULL);
 		}
 		if ((dev_name = lookup_lofi_dev_name(node_path, minor)) ==
@@ -8374,7 +8410,7 @@ process_syseventq()
 
 static void
 build_and_enq_event(char *class, char *subclass, char *node_path,
-	di_node_t node, char *minor)
+    di_node_t node, char *minor)
 {
 	nvlist_t *nvl;
 
diff --git a/usr/src/cmd/devfsadm/disk_link.c b/usr/src/cmd/devfsadm/disk_link.c
index 80e75c1694..0baa608912 100644
--- a/usr/src/cmd/devfsadm/disk_link.c
+++ b/usr/src/cmd/devfsadm/disk_link.c
@@ -19,6 +19,7 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -30,11 +31,13 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <ctype.h>
+#include <unistd.h>
 #include <sys/int_fmtio.h>
 #include <sys/stat.h>
 #include <bsm/devalloc.h>
 #include <sys/scsi/scsi_address.h>
 #include <sys/libdevid.h>
+#include <sys/lofi.h>
 
 #define	DISK_SUBPATH_MAX 100
 #define	RM_STALE 0x01
@@ -69,6 +72,7 @@ static void disk_common(di_minor_t minor, di_node_t node, char *disk,
 				int flags);
 static char *diskctrl(di_node_t node, di_minor_t minor);
 static int reserved_links_exist(di_node_t node, di_minor_t minor, int nflags);
+static void disk_rm_lofi_all(char *file);
 
 
 static devfsadm_create_t disk_cbt[] = {
@@ -104,9 +108,12 @@ static devfsadm_create_t disk_cbt[] = {
 DEVFSADM_CREATE_INIT_V0(disk_cbt);
 
 /*
- * HOT auto cleanup of disks not desired.
+ * HOT auto cleanup of disks is done for lofi devices only.
  */
 static devfsadm_remove_t disk_remove_cbt[] = {
+	{ "disk", DISK_LINK_RE, RM_HOT | RM_POST | RM_ALWAYS,
+		ILEVEL_0, disk_rm_lofi_all
+	},
 	{ "disk", DISK_LINK_RE, RM_POST,
 		ILEVEL_0, devfsadm_rm_all
 	}
@@ -124,6 +131,44 @@ static devlink_re_t disks_re_array[] = {
 static char *disk_mid = "disk_mid";
 static char *modname = "disk_link";
 
+/*
+ * Check if link is from lofi by checking path from readlink().
+ */
+static int
+is_lofi_disk(char *file)
+{
+	char buf[PATH_MAX + 1];
+	char filepath[PATH_MAX];
+	char *ptr;
+	ssize_t size;
+
+	size = snprintf(filepath, sizeof (filepath), "%s/dev/%s",
+	    devfsadm_root_path(), file);
+	if (size > sizeof (filepath))
+		return (0);
+
+	size = readlink(filepath, buf, sizeof (buf) - 1);
+	if (size == -1)
+		return (0);
+	buf[size] = '\0';
+	ptr = strchr(buf, '@');
+	if (ptr == NULL)
+		return (0);
+	ptr[1] = '\0';
+	if (strcmp(buf, "../../devices/pseudo/lofi@") != 0)
+		return (0);
+	return (1);
+}
+
+/*
+ * Wrapper around devfsadm_rm_link() for lofi devices.
+ */
+static void disk_rm_lofi_all(char *file)
+{
+	if (is_lofi_disk(file))
+		devfsadm_rm_link(file);
+}
+
 int
 minor_init()
 {
@@ -137,13 +182,20 @@ static int
 disk_callback_chan(di_minor_t minor, di_node_t node)
 {
 	char *addr;
-	char disk[20];
-	uint_t targ;
-	uint_t lun;
+	char disk[23];
+	char *driver;
+	uint_t targ = 0;
+	uint_t lun = 0;
+
+	driver = di_driver_name(node);
+	if (strcmp(driver, LOFI_DRIVER_NAME) != 0) {
+		addr = di_bus_addr(node);
+		(void) sscanf(addr, "%X,%X", &targ, &lun);
+	} else {
+		targ = di_instance(node);
+	}
 
-	addr = di_bus_addr(node);
-	(void) sscanf(addr, "%X,%X", &targ, &lun);
-	(void) sprintf(disk, "t%dd%d", targ, lun);
+	(void) snprintf(disk, sizeof (disk), "t%dd%d", targ, lun);
 	disk_common(minor, node, disk, 0);
 	return (DEVFSADM_CONTINUE);
 
diff --git a/usr/src/cmd/devfsadm/lofi_link.c b/usr/src/cmd/devfsadm/lofi_link.c
index d86089f0bb..36fbe987d4 100644
--- a/usr/src/cmd/devfsadm/lofi_link.c
+++ b/usr/src/cmd/devfsadm/lofi_link.c
@@ -19,12 +19,11 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <regex.h>
 #include <devfsadm.h>
 #include <stdio.h>
@@ -73,16 +72,14 @@ lofi_rm_all(char *link)
  * For the master device:
  *	/dev/lofictl -> /devices/pseudo/lofi@0:ctl
  * For each other device
- *	/dev/lofi/1 -> /devices/pseudo/lofi@0:1
- *	/dev/rlofi/1 -> /devices/pseudo/lofi@0:1,raw
+ *	/dev/lofi/1 -> /devices/pseudo/lofi@1:disk
+ *	/dev/rlofi/1 -> /devices/pseudo/lofi@1:disk,raw
  */
 static int
 lofi(di_minor_t minor, di_node_t node)
 {
-	dev_t	dev;
+	int instance;
 	char mn[MAXNAMELEN + 1];
-	char blkname[MAXNAMELEN + 1];
-	char rawname[MAXNAMELEN + 1];
 	char path[PATH_MAX + 1];
 
 	(void) strcpy(mn, di_minor_name(minor));
@@ -90,18 +87,14 @@ lofi(di_minor_t minor, di_node_t node)
 	if (strcmp(mn, "ctl") == 0) {
 		(void) devfsadm_mklink(LOFI_CTL_NAME, node, minor, 0);
 	} else {
-		dev = di_minor_devt(minor);
-		(void) snprintf(blkname, sizeof (blkname), "%d",
-		    (int)minor(dev));
-		(void) snprintf(rawname, sizeof (rawname), "%d,raw",
-		    (int)minor(dev));
+		instance = di_instance(node);
 
-		if (strcmp(mn, blkname) == 0) {
-			(void) snprintf(path, sizeof (path), "%s/%s",
-			    LOFI_BLOCK_NAME, blkname);
-		} else if (strcmp(mn, rawname) == 0) {
-			(void) snprintf(path, sizeof (path), "%s/%s",
-			    LOFI_CHAR_NAME, blkname);
+		if (strcmp(mn, LOFI_BLOCK_NODE) == 0) {
+			(void) snprintf(path, sizeof (path), "%s/%d",
+			    LOFI_BLOCK_NAME, instance);
+		} else if (strcmp(mn, LOFI_CHAR_NODE) == 0) {
+			(void) snprintf(path, sizeof (path), "%s/%d",
+			    LOFI_CHAR_NAME, instance);
 		} else {
 			return (DEVFSADM_CONTINUE);
 		}
diff --git a/usr/src/cmd/format/menu_fdisk.c b/usr/src/cmd/format/menu_fdisk.c
index c3d9bcdcac..317954221f 100644
--- a/usr/src/cmd/format/menu_fdisk.c
+++ b/usr/src/cmd/format/menu_fdisk.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  */
 
 /*
@@ -709,6 +710,16 @@ copy_solaris_part(struct ipart *ipart)
 	}
 
 	if ((fd = open(buf, O_RDONLY)) < 0) {
+		/*
+		 * Labeled device support in lofi provides p0 partition on
+		 * both x86 and sparc. However, sparc does not implement fdisk
+		 * partitioning. This workaround will allow format
+		 * to ignore fdisk errors in case of lofi devices.
+		 */
+		if (strcmp(cur_disk->disk_dkinfo.dki_cname, "lofi") == 0) {
+			solaris_offset = 0;
+			return (0);
+		}
 		err_print("Error: can't open disk '%s'.\n", buf);
 		return (-1);
 	}
@@ -965,6 +976,15 @@ good_fdisk()
 	if (lel(cur_disk->fdisk_part.numsect) > 0) {
 		return (1);
 	} else {
+		/*
+		 * Labeled device support in lofi provides p0 partition on
+		 * both x86 and sparc. However, sparc does not implement fdisk
+		 * partitioning. This workaround will allow format
+		 * to ignore fdisk errors in case of lofi devices.
+		 */
+		if (strcmp(cur_disk->disk_dkinfo.dki_cname, "lofi") == 0) {
+			return (1);
+		}
 		err_print("WARNING - ");
 		err_print("This disk may be in use by an application "
 		    "that has\n\t  modified the fdisk table. Ensure "
diff --git a/usr/src/cmd/lofiadm/main.c b/usr/src/cmd/lofiadm/main.c
index d41ceaead3..87c6435386 100644
--- a/usr/src/cmd/lofiadm/main.c
+++ b/usr/src/cmd/lofiadm/main.c
@@ -59,6 +59,8 @@
 #include <cryptoutil.h>
 #include <sys/crypto/ioctl.h>
 #include <sys/crypto/ioctladmin.h>
+#include <sys/cmlb.h>
+#include <sys/mkdev.h>
 #include "utils.h"
 #include <LzmaEnc.h>
 
@@ -68,7 +70,7 @@
 #include <blowfish/blowfish_impl.h>
 
 static const char USAGE[] =
-	"Usage: %s [-r] -a file [ device ]\n"
+	"Usage: %s [-r] [-l] -a file [ device ]\n"
 	"       %s [-r] -c crypto_algorithm -a file [device]\n"
 	"       %s [-r] -c crypto_algorithm -k raw_key_file -a file [device]\n"
 	"       %s [-r] -c crypto_algorithm -T [token]:[manuf]:[serial]:key "
@@ -218,7 +220,7 @@ static ISzAlloc g_Alloc = {
 /*ARGSUSED*/
 static int
 lzma_compress(void *src, size_t srclen, void *dst,
-	size_t *dstlen, int level)
+    size_t *dstlen, int level)
 {
 	CLzmaEncProps props;
 	size_t outsize2;
@@ -280,14 +282,30 @@ lzma_compress(void *src, size_t srclen, void *dst,
 static int
 name_to_minor(const char *devicename)
 {
-	int	minor;
+	struct stat st;
+
+	/*
+	 * If devicename does not exist, then devicename contains
+	 * the name of the device to be created.
+	 * Note we only allow non-labeled devices here.
+	 */
+	if (stat(devicename, &st)) {
+		int minor, rv;
 
-	if (sscanf(devicename, "/dev/" LOFI_BLOCK_NAME "/%d", &minor) == 1) {
-		return (minor);
+		rv = sscanf(devicename, "/dev/" LOFI_BLOCK_NAME "/%d", &minor);
+		if (rv == 1)
+			return (minor);
+		rv = sscanf(devicename, "/dev/" LOFI_CHAR_NAME "/%d", &minor);
+		if (rv == 1)
+			return (minor);
+
+		return (0);
 	}
-	if (sscanf(devicename, "/dev/" LOFI_CHAR_NAME "/%d", &minor) == 1) {
-		return (minor);
+
+	if (st.st_mode & S_IFCHR || st.st_mode & S_IFBLK) {
+		return (LOFI_MINOR2ID(minor(st.st_rdev)));
 	}
+
 	return (0);
 }
 
@@ -303,7 +321,32 @@ static int sleeptime = 2;	/* number of seconds to sleep between stat's */
 static int maxsleep = 120;	/* maximum number of seconds to sleep */
 
 static void
-wait_until_dev_complete(int minor)
+make_blkdevname(struct lofi_ioctl *li, char *path, size_t len)
+{
+	char *r1, *r2;
+	size_t l1;
+
+	if (li->li_devpath[0] == '\0') {
+		if (li->li_labeled)
+			(void) strlcpy(path, "unknown", len);
+		else
+			(void) snprintf(path, len,
+			    "/dev/" LOFI_BLOCK_NAME "/%d", li->li_id);
+		return;
+	}
+	(void) strlcpy(path, li->li_devpath, len);
+	r1 = strchr(path, 'r');
+	l1 = r1 - path;
+	r2 = strchr(li->li_devpath, 'r');
+	(void) strlcpy(r1, r2+1, len - l1);
+
+	if (li->li_labeled) {
+		(void) strlcat(path, "p0", len);
+	}
+}
+
+static void
+wait_until_dev_complete(struct lofi_ioctl *li)
 {
 	struct stat64 buf;
 	int	cursleep;
@@ -311,10 +354,12 @@ wait_until_dev_complete(int minor)
 	char	charpath[MAXPATHLEN];
 	di_devlink_handle_t hdl;
 
-	(void) snprintf(blkpath, sizeof (blkpath), "/dev/%s/%d",
-	    LOFI_BLOCK_NAME, minor);
-	(void) snprintf(charpath, sizeof (charpath), "/dev/%s/%d",
-	    LOFI_CHAR_NAME, minor);
+	make_blkdevname(li, blkpath, sizeof (blkpath));
+	(void) strlcpy(charpath, li->li_devpath, sizeof (charpath));
+
+	if (li->li_labeled) {
+		(void) strlcat(charpath, "p0", sizeof (charpath));
+	}
 
 	/* Check if links already present */
 	if (stat64(blkpath, &buf) == 0 && stat64(charpath, &buf) == 0)
@@ -352,14 +397,14 @@ out:
  * DO NOT use this function if the filename is actually the device name.
  */
 static int
-lofi_map_file(int lfd, struct lofi_ioctl li, const char *filename,
+lofi_map_file(int lfd, struct lofi_ioctl *li, const char *filename,
     boolean_t no_devlink_flag)
 {
 	int	minor;
 
-	li.li_minor = 0;
-	(void) strlcpy(li.li_filename, filename, sizeof (li.li_filename));
-	minor = ioctl(lfd, LOFI_MAP_FILE, &li);
+	li->li_id = 0;
+	(void) strlcpy(li->li_filename, filename, sizeof (li->li_filename));
+	minor = ioctl(lfd, LOFI_MAP_FILE, li);
 	if (minor == -1) {
 		if (errno == ENOTSUP)
 			warn(gettext("encrypting compressed files is "
@@ -367,7 +412,7 @@ lofi_map_file(int lfd, struct lofi_ioctl li, const char *filename,
 		die(gettext("could not map file %s"), filename);
 	}
 	if (!no_devlink_flag)
-		wait_until_dev_complete(minor);
+		wait_until_dev_complete(li);
 	return (minor);
 }
 
@@ -377,12 +422,14 @@ lofi_map_file(int lfd, struct lofi_ioctl li, const char *filename,
  */
 static void
 add_mapping(int lfd, const char *devicename, const char *filename,
-    mech_alias_t *cipher, const char *rkey, size_t rksz,
-    boolean_t rdonly, boolean_t no_devlink_flag)
+    mech_alias_t *cipher, const char *rkey, size_t rksz, boolean_t rdonly,
+    boolean_t label, boolean_t no_devlink_flag)
 {
 	struct lofi_ioctl li;
 
+	bzero(&li, sizeof (li));
 	li.li_readonly = rdonly;
+	li.li_labeled = label;
 
 	li.li_crypto_enabled = B_FALSE;
 	if (cipher != NULL) {
@@ -412,17 +459,22 @@ add_mapping(int lfd, const char *devicename, const char *filename,
 
 	if (devicename == NULL) {
 		int	minor;
+		char	path[MAXPATHLEN];
 
 		/* pick one via the driver */
-		minor = lofi_map_file(lfd, li, filename, no_devlink_flag);
-		/* if mapping succeeds, print the one picked */
-		(void) printf("/dev/%s/%d\n", LOFI_BLOCK_NAME, minor);
+		minor = lofi_map_file(lfd, &li, filename, no_devlink_flag);
+		if (minor > 0) {
+			make_blkdevname(&li, path, sizeof (path));
+
+			/* if mapping succeeds, print the one picked */
+			(void) printf("%s\n", path);
+		}
 		return;
 	}
 
 	/* use device we were given */
-	li.li_minor = name_to_minor(devicename);
-	if (li.li_minor == 0) {
+	li.li_id = name_to_minor(devicename);
+	if (li.li_id == 0) {
 		die(gettext("malformed device name %s\n"), devicename);
 	}
 	(void) strlcpy(li.li_filename, filename, sizeof (li.li_filename));
@@ -436,7 +488,7 @@ add_mapping(int lfd, const char *devicename, const char *filename,
 		    devicename);
 	}
 	if (!no_devlink_flag)
-		wait_until_dev_complete(li.li_minor);
+		wait_until_dev_complete(&li);
 }
 
 /*
@@ -456,7 +508,7 @@ delete_mapping(int lfd, const char *devicename, const char *filename,
 		/* delete by filename */
 		(void) strlcpy(li.li_filename, filename,
 		    sizeof (li.li_filename));
-		li.li_minor = 0;
+		li.li_id = 0;
 		if (ioctl(lfd, LOFI_UNMAP_FILE, &li) == -1) {
 			die(gettext("could not unmap file %s"), filename);
 		}
@@ -464,8 +516,8 @@ delete_mapping(int lfd, const char *devicename, const char *filename,
 	}
 
 	/* delete by device */
-	li.li_minor = name_to_minor(devicename);
-	if (li.li_minor == 0) {
+	li.li_id = name_to_minor(devicename);
+	if (li.li_id == 0) {
 		die(gettext("malformed device name %s\n"), devicename);
 	}
 	if (ioctl(lfd, LOFI_UNMAP_FILE_MINOR, &li) == -1) {
@@ -480,22 +532,24 @@ static void
 print_one_mapping(int lfd, const char *devicename, const char *filename)
 {
 	struct lofi_ioctl li;
+	char blkpath[MAXPATHLEN];
 
 	if (devicename == NULL) {
 		/* given filename, print devicename */
-		li.li_minor = 0;
+		li.li_id = 0;
 		(void) strlcpy(li.li_filename, filename,
 		    sizeof (li.li_filename));
 		if (ioctl(lfd, LOFI_GET_MINOR, &li) == -1) {
 			die(gettext("could not find device for %s"), filename);
 		}
-		(void) printf("/dev/%s/%d\n", LOFI_BLOCK_NAME, li.li_minor);
+		make_blkdevname(&li, blkpath, sizeof (blkpath));
+		(void) printf("%s\n", blkpath);
 		return;
 	}
 
 	/* given devicename, print filename */
-	li.li_minor = name_to_minor(devicename);
-	if (li.li_minor == 0) {
+	li.li_id = name_to_minor(devicename);
+	if (li.li_id == 0) {
 		die(gettext("malformed device name %s\n"), devicename);
 	}
 	if (ioctl(lfd, LOFI_GET_FILENAME, &li) == -1) {
@@ -516,24 +570,23 @@ print_mappings(int fd)
 	char	path[MAXPATHLEN];
 	char	options[MAXPATHLEN] = { 0 };
 
-	li.li_minor = 0;
+	li.li_id = 0;
 	if (ioctl(fd, LOFI_GET_MAXMINOR, &li) == -1) {
 		die("ioctl");
 	}
-	maxminor = li.li_minor;
+	maxminor = li.li_id;
 
 	(void) printf(FORMAT, gettext("Block Device"), gettext("File"),
 	    gettext("Options"));
 	for (minor = 1; minor <= maxminor; minor++) {
-		li.li_minor = minor;
+		li.li_id = minor;
 		if (ioctl(fd, LOFI_GET_FILENAME, &li) == -1) {
 			if (errno == ENXIO)
 				continue;
 			warn("ioctl");
 			break;
 		}
-		(void) snprintf(path, sizeof (path), "/dev/%s/%d",
-		    LOFI_BLOCK_NAME, minor);
+		make_blkdevname(&li, path, sizeof (path));
 
 		options[0] = '\0';
 
@@ -548,14 +601,22 @@ print_mappings(int fd)
 			    gettext("Compressed(%s)"), li.li_algorithm);
 		if (li.li_readonly) {
 			if (strlen(options) != 0) {
-				(void) strlcat(options, ",", sizeof (options));
-				(void) strlcat(options, "Readonly",
+				(void) strlcat(options, ",Readonly",
 				    sizeof (options));
 			} else {
 				(void) snprintf(options, sizeof (options),
 				    gettext("Readonly"));
 			}
 		}
+		if (li.li_labeled) {
+			if (strlen(options) != 0) {
+				(void) strlcat(options, ",Labeled",
+				    sizeof (options));
+			} else {
+				(void) snprintf(options, sizeof (options),
+				    gettext("Labeled"));
+			}
+		}
 		if (strlen(options) == 0)
 			(void) snprintf(options, sizeof (options), "-");
 
@@ -1308,7 +1369,7 @@ lofi_uncompress(int lfd, const char *filename)
 	 * already mapped.
 	 */
 	li.li_crypto_enabled = B_FALSE;
-	li.li_minor = 0;
+	li.li_id = 0;
 	(void) strlcpy(li.li_filename, filename, sizeof (li.li_filename));
 	if (ioctl(lfd, LOFI_GET_MINOR, &li) != -1)
 		die(gettext("%s must be unmapped before uncompressing"),
@@ -1320,7 +1381,7 @@ lofi_uncompress(int lfd, const char *filename)
 	if (statbuf.st_size == 0)
 		return;
 
-	minor = lofi_map_file(lfd, li, filename, B_FALSE);
+	minor = lofi_map_file(lfd, &li, filename, B_FALSE);
 	(void) snprintf(devicename, sizeof (devicename), "/dev/%s/%d",
 	    LOFI_BLOCK_NAME, minor);
 
@@ -1432,7 +1493,7 @@ lofi_compress(int *lfd, const char *filename, int compress_index,
 	 * Disallow compressing the file if it is
 	 * already mapped
 	 */
-	lic.li_minor = 0;
+	lic.li_id = 0;
 	(void) strlcpy(lic.li_filename, filename, sizeof (lic.li_filename));
 	if (ioctl(*lfd, LOFI_GET_MINOR, &lic) != -1)
 		die(gettext("%s must be unmapped before compressing"),
@@ -1849,13 +1910,14 @@ main(int argc, char *argv[])
 	const char *algname = COMPRESS_ALGORITHM;
 	int	openflag;
 	int	minor;
-	int 	compress_index;
+	int	compress_index;
 	uint32_t segsize = SEGSIZE;
 	static char *lofictl = "/dev/" LOFI_CTL_NAME;
 	boolean_t force = B_FALSE;
 	const char *pname;
 	boolean_t errflag = B_FALSE;
 	boolean_t addflag = B_FALSE;
+	boolean_t labelflag = B_FALSE;
 	boolean_t rdflag = B_FALSE;
 	boolean_t deleteflag = B_FALSE;
 	boolean_t ephflag = B_FALSE;
@@ -1877,7 +1939,7 @@ main(int argc, char *argv[])
 	(void) setlocale(LC_ALL, "");
 	(void) textdomain(TEXT_DOMAIN);
 
-	while ((c = getopt(argc, argv, "a:c:Cd:efk:rs:T:UX")) != EOF) {
+	while ((c = getopt(argc, argv, "a:c:Cd:efk:lrs:T:UX")) != EOF) {
 		switch (c) {
 		case 'a':
 			addflag = B_TRUE;
@@ -1932,6 +1994,9 @@ main(int argc, char *argv[])
 			need_crypto = B_TRUE;
 			cipher_only = B_FALSE;	/* need to unset cipher_only */
 			break;
+		case 'l':
+			labelflag = B_TRUE;
+			break;
 		case 'r':
 			rdflag = B_TRUE;
 			break;
@@ -1972,9 +2037,12 @@ main(int argc, char *argv[])
 	/* Check for mutually exclusive combinations of options */
 	if (errflag ||
 	    (addflag && deleteflag) ||
+	    (labelflag && !addflag) ||
 	    (rdflag && !addflag) ||
 	    (!addflag && need_crypto) ||
-	    ((compressflag || uncompressflag) && (addflag || deleteflag)))
+	    (need_crypto && labelflag) ||
+	    ((compressflag || uncompressflag) &&
+	    (labelflag || addflag || deleteflag)))
 		usage(pname);
 
 	/* ephemeral key, and key from either file or token are incompatible */
@@ -2091,7 +2159,7 @@ main(int argc, char *argv[])
 	 */
 	if (addflag)
 		add_mapping(lfd, devicename, filename, cipher, rkey, rksz,
-		    rdflag, no_devlink_flag);
+		    rdflag, labelflag, no_devlink_flag);
 	else if (compressflag)
 		lofi_compress(&lfd, filename, compress_index, segsize);
 	else if (uncompressflag)
diff --git a/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c b/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c
index eb91f5212d..6409c299ca 100644
--- a/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c
+++ b/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c
@@ -20,6 +20,7 @@
  */
 
 /*
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  * Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved.
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  */
@@ -622,7 +623,7 @@ zfs_ioctl(sysret_t *rval, int fdes, int cmd, intptr_t arg)
 }
 
 struct s10_lofi_ioctl {
-	uint32_t li_minor;
+	uint32_t li_id;
 	boolean_t li_force;
 	char li_filename[MAXPATHLEN + 1];
 };
@@ -652,7 +653,7 @@ lofi_ioctl(sysret_t *rval, int fdes, int cmd, intptr_t arg)
 
 	bzero(&native_param, sizeof (native_param));
 
-	struct_assign(native_param, s10_param, li_minor);
+	struct_assign(native_param, s10_param, li_id);
 	struct_assign(native_param, s10_param, li_force);
 
 	/*
@@ -665,7 +666,7 @@ lofi_ioctl(sysret_t *rval, int fdes, int cmd, intptr_t arg)
 
 	err = __systemcall(rval, SYS_ioctl + 1024, fdes, cmd, &native_param);
 
-	struct_assign(s10_param, native_param, li_minor);
+	struct_assign(s10_param, native_param, li_id);
 	/* li_force is input-only */
 
 	bcopy(native_param.li_filename, s10_param.li_filename,
diff --git a/usr/src/lib/libdns_sd/Makefile.com b/usr/src/lib/libdns_sd/Makefile.com
index ca83ad0396..5775bdb1e7 100644
--- a/usr/src/lib/libdns_sd/Makefile.com
+++ b/usr/src/lib/libdns_sd/Makefile.com
@@ -38,6 +38,7 @@ LDLIBS +=	-lsocket -lnsl -lc
 
 C99MODE =	$(C99_ENABLE)
 CPPFLAGS +=	-I$(SRCDIR) -DNOT_HAVE_SA_LEN -D_XPG4_2 -D__EXTENSIONS__
+CPPFLAGS +=	-DMDNS_VERSIONSTR_NODTS
 
 .PARALLEL =     $(OBJECTS)
 .KEEP_STATE:
diff --git a/usr/src/lib/libdns_sd/common/dnssd_clientlib.c b/usr/src/lib/libdns_sd/common/dnssd_clientlib.c
index cca5885333..c22e54db61 100644
--- a/usr/src/lib/libdns_sd/common/dnssd_clientlib.c
+++ b/usr/src/lib/libdns_sd/common/dnssd_clientlib.c
@@ -363,4 +363,8 @@ DNSServiceErrorType DNSSD_API TXTRecordGetItemAtIndex
 
 // NOT static -- otherwise the compiler may optimize it out
 // The "@(#) " pattern is a special prefix the "what" command looks for
+#ifndef MDNS_VERSIONSTR_NODTS
 const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+#else
+const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd " STRINGIFY(mDNSResponderVersion);
+#endif
diff --git a/usr/src/lib/libdns_sd/java/Makefile.com b/usr/src/lib/libdns_sd/java/Makefile.com
index f66463ac2f..8a8133ba95 100644
--- a/usr/src/lib/libdns_sd/java/Makefile.com
+++ b/usr/src/lib/libdns_sd/java/Makefile.com
@@ -22,7 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY=	libjdns_sd.a
 VERS=		.1
@@ -39,6 +38,7 @@ C99MODE =       $(C99_ENABLE)
 CPPFLAGS +=	-I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris
 CPPFLAGS +=	-I../com/apple/dnssd
 CPPFLAGS +=	-D_REENTRANT
+CPPFLAGS +=	-DMDNS_VERSIONSTR_NODTS
 
 LDLIBS +=	-lc -lsocket -ldns_sd
 
diff --git a/usr/src/lib/libdns_sd/java/common/JNISupport.c b/usr/src/lib/libdns_sd/java/common/JNISupport.c
index 22b40930a2..af4de19912 100644
--- a/usr/src/lib/libdns_sd/java/common/JNISupport.c
+++ b/usr/src/lib/libdns_sd/java/common/JNISupport.c
@@ -1069,4 +1069,8 @@ exit:
 
 // NOT static -- otherwise the compiler may optimize it out
 // The "@(#) " pattern is a special prefix the "what" command looks for
+#ifndef MDNS_VERSIONSTR_NODTS
 const char VersionString_SCCS[] = "@(#) libjdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+#else
+const char VersionString_SCCS[] = "@(#) libjdns_sd " STRINGIFY(mDNSResponderVersion);
+#endif
diff --git a/usr/src/lib/libfru/amd64/Makefile b/usr/src/lib/libfru/amd64/Makefile
index 230c18efea..071807c9e0 100644
--- a/usr/src/lib/libfru/amd64/Makefile
+++ b/usr/src/lib/libfru/amd64/Makefile
@@ -28,7 +28,7 @@
 include ../Makefile.obj
 include ../../Makefile.lib.64
 include ../Makefile.flag
-LDLIBS += -lc -m64
+LDLIBS += -lc
 LDLIBS += -L$(SRC)/lib/libfruutils/$(MACH64) -lfruutils
 LDLIBS += -L$(SRC)/lib/libfru/libfrureg/$(MACH64) -lfrureg
 
diff --git a/usr/src/lib/libfru/sparcv9/Makefile b/usr/src/lib/libfru/sparcv9/Makefile
index 00e0af18cc..80a2b3d484 100644
--- a/usr/src/lib/libfru/sparcv9/Makefile
+++ b/usr/src/lib/libfru/sparcv9/Makefile
@@ -29,7 +29,7 @@
 include ../Makefile.obj
 include ../../Makefile.lib.64
 include ../Makefile.flag
-LDLIBS += -lc -m64
+LDLIBS += -lc
 LDLIBS += -L$(SRC)/lib/libfruutils/$(MACH64) -lfruutils
 LDLIBS += -L$(SRC)/lib/libfru/libfrureg/$(MACH64) -lfrureg
 
diff --git a/usr/src/man/man1/audiorecord.1 b/usr/src/man/man1/audiorecord.1
index ba1e0a99ac..185f565c9a 100644
--- a/usr/src/man/man1/audiorecord.1
+++ b/usr/src/man/man1/audiorecord.1
@@ -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 AUDIORECORD 1 "May 5, 2009"
+.TH AUDIORECORD 1 "April 9, 2016"
 .SH NAME
 audiorecord \- record an audio file
 .SH SYNOPSIS
@@ -15,7 +15,6 @@ audiorecord \- record an audio file
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBaudiorecord\fR utility copies audio data from the audio device to a
 named audio file, or to the standard output if no filename is present. If no
@@ -38,7 +37,6 @@ example, Control-c) is received. If the \fB-t\fR option is specified,
 If the audio device is unavailable, that is, if another process currently has
 read access, \fBaudiorecord\fR prints an error message and exits immediately.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -165,7 +163,6 @@ set by any process.
 .RE
 
 .SH OPERANDS
-.sp
 .ne 2
 .na
 \fB\fIfile\fR[\fB\&.au\fR|\fB\&.aif\fR[\fBf\fR]]|\fB\&.wav\fR\fR
@@ -174,7 +171,7 @@ set by any process.
 .RS 4n
 \fIFile Specification\fR: The named audio file is rewritten, or appended. If no
 filename is present, and standard output is not a tty, or if the special
-filename "\fB\(mi\fR" is specified, output is directed to the the standard
+filename "\fB\(mi\fR" is specified, output is directed to the standard
 output.
 .sp
 If the \fB-T\fR option is not specified, the file suffix determines the type of
@@ -184,12 +181,10 @@ file suffix.
 .RE
 
 .SH USAGE
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBaudiorecord\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH ENVIRONMENT VARIABLES
-.sp
 .ne 2
 .na
 \fB\fBAUDIODEV\fR\fR
@@ -201,7 +196,6 @@ used.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -219,7 +213,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBaudioconvert\fR(1), \fBaudioplay\fR(1), \fBmixerctl\fR(1),
 \fBattributes\fR(5), \fBlargefile\fR(5), \fBaudio\fR(7I)
diff --git a/usr/src/man/man1/cputrack.1 b/usr/src/man/man1/cputrack.1
index d4c3aebb36..ab1dd45d49 100644
--- a/usr/src/man/man1/cputrack.1
+++ b/usr/src/man/man1/cputrack.1
@@ -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 CPUTRACK 1 "Apr 19, 2004"
+.TH CPUTRACK 1 "April 9, 2016"
 .SH NAME
 cputrack \- monitor process and LWP behavior using CPU performance counters
 .SH SYNOPSIS
@@ -25,7 +25,6 @@ cputrack \- monitor process and LWP behavior using CPU performance counters
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBcputrack\fR utility allows \fBCPU\fR performance counters to be used to
 monitor the behavior of a process or family of processes running on the system.
@@ -43,7 +42,6 @@ Because \fBcputrack\fR is an unprivileged program, it is subject to the same
 restrictions that apply to \fBtruss\fR(1). For example, \fBsetuid\fR(2)
 executables cannot be tracked.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -189,7 +187,6 @@ Enables more verbose output.
 .RE
 
 .SH USAGE
-.sp
 .LP
 The operating system enforces certain restrictions on the tracing of processes.
 In particular, a command whose object file cannot be read by a user cannot be
@@ -234,7 +231,7 @@ user and system modes, regardless of the settings applied to the performance
 counter registers.
 .sp
 .LP
-The output of \fBcputrack\fR is designed to be readily parseable by
+The output of \fBcputrack\fR is designed to be readily parsable by
 \fBnawk\fR(1) and \fBperl\fR(1), thereby allowing performance tools to be
 composed by embedding \fBcputrack\fR in scripts. Alternatively, tools may be
 constructed directly using the same \fBAPI\fRs that \fBcputrack\fR is built
@@ -366,7 +363,6 @@ example% \fBcputrack -c ITLB_reference,emask=1 date\fR
 .sp
 
 .SH WARNINGS
-.sp
 .LP
 By running any instance of the \fBcpustat\fR(1M) utility, all existing
 performance counter context is forcibly invalidated across the machine. This
@@ -394,7 +390,6 @@ the problem and possible solutions.
 If a short interval is requested, \fBcputrack\fR may not be able to keep up
 with the desired sample rate. In this case, some samples may be dropped.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -409,7 +404,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBnawk\fR(1), \fBperl\fR(1), \fBproc\fR(1), \fBtruss\fR(1), \fBprstat\fR(1M),
 \fBcpustat\fR(1M), \fBexec\fR(2), \fBexit\fR(2), \fBfork\fR(2),
diff --git a/usr/src/man/man1/csh.1 b/usr/src/man/man1/csh.1
index 3f6a480a05..0ac366ac46 100644
--- a/usr/src/man/man1/csh.1
+++ b/usr/src/man/man1/csh.1
@@ -4,7 +4,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 CSH 1 "Jul 27, 2007"
+.TH CSH 1 "April 9, 2016"
 .SH NAME
 csh \- shell command interpreter with a C-like syntax
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ csh \- shell command interpreter with a C-like syntax
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBcsh\fR, the C shell, is a command interpreter with a syntax reminiscent of
 the C language. It provides a number of convenient features for interactive use
@@ -23,7 +22,6 @@ command aliasing, history substitution, job control, and a number of built-in
 commands. As with the Bourne shell, the C shell provides variable, command and
 filename substitution.
 .SS "Initialization and Termination"
-.sp
 .LP
 When first started, the C shell normally performs commands from the
 \fB\&.cshrc\fR file in your home directory, provided that it is readable and
@@ -46,7 +44,6 @@ As a login shell terminates, it performs commands from the \fB\&.logout\fR file
 in your home directory; the same permission checks as those for \fB\&.cshrc\fR
 are applied to this file.
 .SS "Interactive Operation"
-.sp
 .LP
 After startup processing is complete, an interactive C shell begins reading
 commands from the terminal, prompting with \fBhostname\fR\fB%\fR (or
@@ -56,14 +53,12 @@ performs the following actions: a line of command input is read and broken into
 parsed, as described under USAGE. Finally, the shell executes each command in
 the current line.
 .SS "Noninteractive Operation"
-.sp
 .LP
 When running noninteractively, the shell does not prompt for input from the
 terminal. A noninteractive C shell can execute a command supplied as an
 \fIargument\fR on its command line, or interpret commands from a file, also
 known as a script.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -195,7 +190,6 @@ passed as argument zero, and subsequent arguments are added to the argument
 list for that command or script.
 .SH USAGE
 .SS "Filename Completion"
-.sp
 .LP
 When enabled by setting the variable \fBfilec\fR, an interactive C shell can
 complete a partially typed filename or user name. When an unambiguous partial
@@ -220,7 +214,6 @@ however, the only possible completion includes a suffix in the list, it is not
 ignored. \fBfignore\fR does not affect the listing of filenames by the
 \fBEOF\fR character.
 .SS "Lexical Structure"
-.sp
 .LP
 The shell splits input lines into words at space and tab characters, except as
 noted below. The characters \fB&\fR, \fB|\fR, \fB;\fR, \fB<\fR, \fB>\fR,
@@ -245,7 +238,6 @@ When the shell's input is not a terminal, the character \fB#\fR introduces a
 comment that continues to the end of the input line. Its special meaning is
 suppressed when preceded by a \fB\e\fR or enclosed in matching quotes.
 .SS "Command Line Parsing"
-.sp
 .LP
 A \fIsimple command\fR is composed of a sequence of words. The first word (that
 is not part of an I/O redirection) specifies the command to be executed. A
@@ -271,7 +263,6 @@ by appending an `\fB&\fR\&'; rather than waiting for the sequence to finish
 before issuing a prompt, the shell displays the job number (see \fBJob
 Control\fR, below) and associated process IDs and prompts immediately.
 .SS "History Substitution"
-.sp
 .LP
 History substitution allows you to use words from previous command lines in the
 command line you are typing. This simplifies spelling corrections and the
@@ -287,7 +278,6 @@ Input lines containing history substitutions are echoed on the terminal after
 being expanded, but before any other substitutions take place or the command
 gets executed.
 .SS "Event Designators"
-.sp
 .LP
 An event designator is a reference to a command line entry in the history list.
 .sp
@@ -404,7 +394,6 @@ re-executing command #6,
 .RE
 
 .SS "Word Designators"
-.sp
 .LP
 A `\fB:\fR' (colon) separates the event specification from the word designator.
 It can be omitted if the word designator begins with a \fB^\fR, \fB$\fR,
@@ -504,7 +493,6 @@ Like \fIx*\fR but omitting word \fB$\fR.
 .RE
 
 .SS "Modifiers"
-.sp
 .LP
 After the optional word designator, you can add one of the following modifiers,
 preceded by a \fB:\fR.
@@ -620,7 +608,6 @@ Without an event specification, a history reference refers either to the
 previous command, or to a previous history reference on the command line (if
 any).
 .SS "Quick Substitution"
-.sp
 .ne 2
 .na
 \fB\fB^\fR\fIl\fR\fB^\fR\fIr\fR\fB^\fR\fR
@@ -638,7 +625,6 @@ This is equivalent to the history substitution:
 .RE
 
 .SS "Aliases"
-.sp
 .LP
 The C shell maintains a list of aliases that you can create, display, and
 modify using the \fBalias\fR and \fBunalias\fR commands. The shell checks the
@@ -671,7 +657,6 @@ Except for the first word, the name of the alias can not appear in its
 definition, nor in any alias referred to by its definition. Such loops are
 detected, and cause an error message.
 .SS "I/O Redirection"
-.sp
 .LP
 The following metacharacters indicate that the subsequent word is the name of a
 file to which the command's standard input, standard output, or standard error
@@ -729,13 +714,12 @@ forms append both the standard error and standard output to the file.
 .RE
 
 .SS "Variable Substitution"
-.sp
 .LP
 The C shell maintains a set of variables, each of which is composed of a
 \fIname\fR and a \fIvalue\fR. A variable name consists of up to 128 letters and
 digits, and starts with a letter. An underscore (\fB_\fR) is considered a
 letter). A variable's value is a space-separated list of zero or more words. If
-the shell supports a variable name upto 128 characters the variable
+the shell supports a variable name up to 128 characters the variable
 \fBSUNW_VARLEN\fR is defined. If a variable name of up to 128 characters is not
 supported, then an older version of the shell is being used, and the shell
 variable name length has a maximum length of 20.
@@ -918,7 +902,6 @@ thereafter. It can be used to read from the keyboard in a C shell script.
 .RE
 
 .SS "Command and Filename Substitutions"
-.sp
 .LP
 Command and filename substitutions are applied selectively to the arguments of
 built-in commands. Portions of expressions that are not evaluated are not
@@ -926,7 +909,6 @@ expanded. For non-built-in commands, filename expansion of the command name is
 done separately from that of the argument list; expansion occurs in a subshell,
 after I/O redirection is performed.
 .SS "Command Substitution"
-.sp
 .LP
 A command enclosed by backquotes (\|\fB`\fR\|.\|.\|.\|\fB`\fR\|) is performed
 by a subshell. Its standard output is broken into separate words at each space
@@ -936,7 +918,6 @@ newline characters force new words; space and tab characters are preserved.
 However, a final newline is ignored. It is therefore possible for a command
 substitution to yield a partial word.
 .SS "Filename Substitution"
-.sp
 .LP
 Unquoted words containing any of the characters \fB*\fR, \fB?\fR, \fB[\fR or
 \fB{\fR, or that begin with ~, are expanded (also known as \fIglobbing\fR) to
@@ -1002,7 +983,6 @@ The `\fB\&.\fR' (dot character), when it is the first character in a filename
 or pathname component, must be matched explicitly. The \fB/\fR (slash) must
 also be matched explicitly.
 .SS "Expressions and Operators"
-.sp
 .LP
 A number of C shell built-in commands accept expressions, in which the
 operators are similar to those of C and have the same precedence. These
@@ -1241,7 +1221,6 @@ of the \fBstatus\fR variable rather than this expression.
 .RE
 
 .SS "Control Flow"
-.sp
 .LP
 The shell contains a number of commands to regulate the flow of control in
 scripts and within limits, from the terminal. These commands operate by forcing
@@ -1259,7 +1238,6 @@ buffered. The shell performs seeks within the internal buffer to accomplish the
 rereading implied by the loop. (To the extent that this allows, backward
 \fBgoto\fR commands succeeds on nonseekable inputs.)
 .SS "Command Execution"
-.sp
 .LP
 If the command is a C shell built-in command, the shell executes it directly.
 Otherwise, the shell searches for a file by that name with execute access. If
@@ -1308,7 +1286,6 @@ If the first character of the file is a \fB#\fR, a C shell is invoked.
 Otherwise, a Bourne shell is invoked.
 .RE
 .SS "Signal Handling"
-.sp
 .LP
 The shell normally ignores \fBQUIT\fR signals. Background jobs are immune to
 signals generated from the keyboard, including hangups (\fBHUP\fR). Other
@@ -1319,7 +1296,6 @@ controlled by the \fBonintr\fR built-in command. Login shells catch the
 no case are interrupts allowed when a login shell is reading the
 \fB\&.logout\fR file.
 .SS "Job Control"
-.sp
 .LP
 The shell associates a numbered \fIjob\fR with each command sequence to keep
 track of those commands that are running in the background or have been stopped
@@ -1396,7 +1372,6 @@ A job running in the background stops when it attempts to read from the
 terminal. Background jobs can normally produce output, but this can be
 suppressed using the `\fBstty tostop\fR' command.
 .SS "Status Reporting"
-.sp
 .LP
 While running interactively, the shell tracks the status of each job and
 reports whenever the job finishes or becomes blocked. It normally displays a
@@ -1406,7 +1381,6 @@ the shell is to report status changes immediately. By default, the \fBnotify\fR
 command marks the current process; after starting a background job, type
 \fBnotify\fR to mark it.
 .SS "Commands"
-.sp
 .LP
 Built-in commands are executed within the C shell. If a built-in command occurs
 as any component of a pipeline except the last, it is executed in a subshell.
@@ -2498,7 +2472,6 @@ decrement \fIname\fR, respectively.
 .RE
 
 .SS "Environment Variables and Predefined Shell Variables"
-.sp
 .LP
 Unlike the Bourne shell, the C shell maintains a distinction between
 environment variables, which are automatically exported to processes it
@@ -2937,12 +2910,10 @@ Display each command after history substitution takes place.
 .RE
 
 .SS "Large File Behavior"
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBcsh\fR when
 encountering files greater than or equal to 2 Gbyte (2^31 bytes).
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB~/.cshrc\fR\fR
@@ -3006,7 +2977,6 @@ Source of home directories for `~\fIname\fR'.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -3022,7 +2992,6 @@ CSI	Enabled
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBbc\fR(1), \fBecho\fR(1), \fBlimit\fR(1), \fBlogin\fR(1), \fBls\fR(1),
 \fBmore\fR(1), \fBpfcsh\fR(1), \fBpfexec\fR(1), \fBps\fR(1), \fBsh\fR(1),
@@ -3031,7 +3000,6 @@ CSI	Enabled
 \fBfork\fR(2), \fBpipe\fR(2), \fBa.out\fR(4), \fBascii\fR(5),
 \fBattributes\fR(5), \fBenviron\fR(5), \fBlargefile\fR(5), \fBtermio\fR(7I)
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fB\fBYou have stopped jobs.\fR\fR
@@ -3042,11 +3010,9 @@ immediate second attempt to exit succeeds, terminating the stopped jobs.
 .RE
 
 .SH WARNINGS
-.sp
 .LP
 The use of \fBsetuid\fR shell scripts is \fIstrongly\fR discouraged.
 .SH NOTES
-.sp
 .LP
 Words can be no longer than 1024 bytes. The system limits argument lists to
 1,048,576 bytes. However, the maximum number of arguments to a command for
@@ -3161,7 +3127,6 @@ When the shell executes a shell script that attempts to execute a non-existent
 command interpreter, the shell returns an erroneous diagnostic message that the
 shell script file does not exist.
 .SH BUGS
-.sp
 .LP
 As of this writing, the \fBtime\fR built-in command does \fBnot\fR compute the
 last 6 fields of output, rendering the output to erroneously report the value
diff --git a/usr/src/man/man1/elfsign.1 b/usr/src/man/man1/elfsign.1
index 827601489a..dc74316816 100644
--- a/usr/src/man/man1/elfsign.1
+++ b/usr/src/man/man1/elfsign.1
@@ -4,7 +4,7 @@
 .\" 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 ELFSIGN 1 "Jul 7, 2008"
+.TH ELFSIGN 1 "April 9, 2016"
 .SH NAME
 elfsign \- sign binaries
 .SH SYNOPSIS
@@ -43,7 +43,6 @@ elfsign \- sign binaries
 .fi
 
 .SH DESCRIPTION
-.sp
 .ne 2
 .na
 \fB\fBlist\fR\fR
@@ -94,7 +93,6 @@ an appropriate certificate in \fB/etc/crypto/certs\fR if \fB-c\fR is not given.
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -287,11 +285,10 @@ It is an error to specify both the \fB-T\fR and \fB-k\fR options.
 .RS 4n
 Requests more detailed information. The additional output includes the signer
 and, if the signature format contains it, the time the object was signed. This
-is not stable parseable output.
+is not stable parsable output.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operand is supported:
 .sp
@@ -381,7 +378,6 @@ CN=VENDOR, OU=Software Development, O=Vendor Inc.
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -390,7 +386,7 @@ The following exit values are returned:
 .TS
 c c c
 l l l .
-VALUE	MEANING	SUB-COMMAND
+VALUE	MEANING	SUBCOMMAND
 \fB0\fR	Operation successful	sign/verify/request
 \fB1\fR	Invalid arguments	
 \fB2\fR	Failed to verify ELF object 	verify
@@ -406,7 +402,6 @@ T}	verify
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/crypto/certs\fR\fR
@@ -417,7 +412,6 @@ used
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -438,7 +432,6 @@ The \fBelfsign\fR command and subcommands are Committed. While applications
 should not depend on the output format of \fBelfsign\fR, the output format of
 the \fBlist\fR subcommand is Committed.
 .SH SEE ALSO
-.sp
 .LP
 \fBdate\fR(1), \fBpktool\fR(1), \fBcryptoadm\fR(1M), \fBlibpkcs11\fR(3LIB),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1/ldap.1 b/usr/src/man/man1/ldap.1
index febdc2a95c..d1660e5fa7 100644
--- a/usr/src/man/man1/ldap.1
+++ b/usr/src/man/man1/ldap.1
@@ -4,11 +4,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 LDAP 1 "Aug 28, 2006"
+.TH LDAP 1 "April 9, 2016"
 .SH NAME
 ldap \- LDAP as a naming repository
 .SH DESCRIPTION
-.sp
 .LP
 LDAP refers to Lightweight Directory Access Protocol, which is an industry
 standard for accessing directory servers. By initializing the client using
@@ -202,7 +201,7 @@ More protection can be provided by means of access control, allowing the server
 to grant access for certain containers or entries. Access control is specified
 by Access Control Lists (ACLs) that are defined and stored in the LDAP server.
 The Access Control Lists on the LDAP server are called Access Control
-Instructions (ACIs) by the the SunOne Directory Server. Each ACL or ACI
+Instructions (ACIs) by the SunOne Directory Server. Each ACL or ACI
 specifies one or more directory objects, for example, the \fBcn\fR attribute in
 a specific container, one or more clients to whom you grant or deny access, and
 one or more access rights that determine what the clients can do to or with the
@@ -257,7 +256,6 @@ Lists the contents of the LDAP naming space.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/ldap/ldap_client_cred\fR\fR
@@ -301,7 +299,6 @@ PAM framework configuration file.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBldaplist\fR(1), \fBidsconfig\fR(1M), \fBldap_cachemgr\fR(1M),
 \fBldapaddent\fR(1M), \fBldapclient\fR(1M), \fBnsswitch.conf\fR(4),
@@ -314,7 +311,6 @@ PAM framework configuration file.
 \fISystem Administration Guide: Naming and Directory Services (DNS, NIS, and
 LDAP)\fR
 .SH NOTES
-.sp
 .LP
 The \fBpam_unix\fR(5) module is no longer supported. Similar functionality is
 provided by \fBpam_authtok_check\fR(5), \fBpam_authtok_get\fR(5),
diff --git a/usr/src/man/man1/ldd.1 b/usr/src/man/man1/ldd.1
index ff612c494f..cdc949911f 100644
--- a/usr/src/man/man1/ldd.1
+++ b/usr/src/man/man1/ldd.1
@@ -4,7 +4,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 LDD 1 "Jun 3, 2008"
+.TH LDD 1 "April 9, 2016"
 .SH NAME
 ldd \- list dynamic dependencies of executable files or shared objects
 .SH SYNOPSIS
@@ -15,7 +15,6 @@ ldd \- list dynamic dependencies of executable files or shared objects
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBldd\fR utility lists the dynamic dependencies of executable files or
 shared objects. \fBldd\fR uses the runtime linker, \fBld.so.1\fR, to generate
@@ -57,7 +56,6 @@ Therefore, \fBldd\fR does not list any shared objects explicitly attached using
 \fBdlopen\fR(3C). To display all the objects in use by a process, or a core
 file, use \fBpldd\fR(1).
 .SH OPTIONS
-.sp
 .LP
 \fBldd\fR can also check the compatibility of \fIfilename\fR with the shared
 objects \fIfilename\fR uses. With the following options, \fBldd\fR prints
@@ -315,12 +313,11 @@ This option also displays any dependency version requirements. See
 
 .SH USAGE
 .SS "Security"
-.sp
 .LP
 A superuser should use the \fB-f\fR option only if the executable to be
 examined is known to be trustworthy. The use of \fB-f\fR on an untrustworthy
 executable while superuser can compromise system security. If an executables
-trustworthyness is unknown, a superuser should temporarily become a regular
+trustworthiness is unknown, a superuser should temporarily become a regular
 user. Then invoke \fBldd\fR as this regular user.
 .sp
 .LP
@@ -331,7 +328,6 @@ non-superuser can use either the \fB:r\fR subcommand of \fBmdb\fR, or
 compromise. To minimize risk when using \fBldd\fR, \fBadb :r\fR, or \fBtruss\fR
 on an untrustworthy executable, use the \fBUID\fR \fB"nobody"\fR.
 .SS "Lazy Loading"
-.sp
 .LP
 Lazy loading can be applied directly by specified lazy dependencies. See the
 \fB-z\fR \fBlazyload\fR option of \fBld\fR(1). Lazy loading can also be applied
@@ -386,7 +382,6 @@ any references. These objects, in this example, \fBlibnsl.so.1\fR, are
 candidates for removal from the link-line used to build the object being
 inspected.
 .SS "Initialization Order"
-.sp
 .LP
 Objects that do not explicitly define their required dependencies might observe
 variations in the initialization section order displayed by \fBldd\fR due to
@@ -445,7 +440,6 @@ order for these dependencies can not be established.
 Users that prefer a more static analysis of object files can inspect
 dependencies using tools such as \fBdump\fR(1) and \fBelfdump\fR(1).
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/lddstub\fR\fR
@@ -464,7 +458,6 @@ Fake 64-bit executable loaded to check the dependencies of shared objects.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcrle\fR(1), \fBdump\fR(1), \fBelfdump\fR(1), \fBlari\fR(1), \fBld\fR(1),
 \fBld.so.1\fR(1), \fBmdb\fR(1), \fBpldd\fR(1), \fBpvs\fR(1), \fBtruss\fR(1),
@@ -473,7 +466,6 @@ Fake 64-bit executable loaded to check the dependencies of shared objects.
 .LP
 \fILinker and Libraries Guide\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 \fBldd\fR prints the record of shared object path names to \fBstdout\fR. The
 optional list of symbol resolution problems is printed to \fBstderr\fR. If
@@ -481,7 +473,6 @@ optional list of symbol resolution problems is printed to \fBstderr\fR. If
 \fIfilename\fR cannot be opened for reading, a non-zero exit status is
 returned.
 .SH NOTES
-.sp
 .LP
 Use of the \fB-d\fR or \fB-r\fR option with shared objects can give misleading
 results. \fBldd\fR does a worst case analysis of the shared objects. However,
diff --git a/usr/src/man/man1/lgrpinfo.1 b/usr/src/man/man1/lgrpinfo.1
index 294db80a0e..17ce8e35ff 100644
--- a/usr/src/man/man1/lgrpinfo.1
+++ b/usr/src/man/man1/lgrpinfo.1
@@ -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 LGRPINFO 1 "Sep 11, 2006"
+.TH LGRPINFO 1 "April 9, 2016"
 .SH NAME
 lgrpinfo \- display information about locality groups
 .SH SYNOPSIS
@@ -28,7 +28,6 @@ lgrpinfo \- display information about locality groups
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBlgrpinfo\fR prints information about the locality group (\fBlgroup\fR)
 hierarchy and its contents.
@@ -70,7 +69,6 @@ lgroup.
 lgroups can be specified on the command line as lgroup IDs or by using specific
 keywords. See \fBOPERANDS\fR.
 .SH OPTIONS
-.sp
 .LP
 You can combine options together and the order in which options are specified
 is not important. Lowercase options select what information should be printed
@@ -221,7 +219,7 @@ Print memory information.
 Memory sizes are scaled to the unit of measure that yields an integer from
 \fB0\fR to \fB1023\fR unless the \fB-u\fR option is specified as well. The
 fractional part of the number is only displayed for values less than \fB10\fR.
-This behavior is similiar to using the \fB-h\fR option of \fBls\fR(1) or
+This behavior is similar to using the \fB-h\fR option of \fBls\fR(1) or
 \fBdf\fR(1M) to display a human readable format.
 .sp
 This is the default.
@@ -287,12 +285,11 @@ is printed for the \fBroot\fR lgroup unless it is the only lgroup.
 Specify memory units. Units should be b, k, m, g, t, p, or e for bytes,
 kilobytes, megabytes, gigabytes, terabytes, petabytes, or exabytes
 respectively. The fractional part of the number is only displayed for values
-less than 10. This behavior is similiar to using the \fB-h\fR option of
+less than 10. This behavior is similar to using the \fB-h\fR option of
 \fBls\fR(1) or \fBdf\fR(1M) to display a human readable format.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -504,7 +501,6 @@ The following example prints information about lgroup latencies:
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -544,7 +540,6 @@ Invalid syntax.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -563,7 +558,6 @@ Interface Stability	See below.
 .LP
 The human readable output is Unstable.
 .SH SEE ALSO
-.sp
 .LP
 \fBls\fR(1), \fBplgrp\fR(1), \fBpmap\fR(1), \fBproc\fR(1), \fBps\fR(1),
 \fBdf\fR(1M), \fBprstat\fR(1M), \fBlgrp_init\fR(3LGRP), \fBliblgrp\fR(3LIB),
diff --git a/usr/src/man/man1/localedef.1 b/usr/src/man/man1/localedef.1
index f7962baaf2..e19cd325d6 100644
--- a/usr/src/man/man1/localedef.1
+++ b/usr/src/man/man1/localedef.1
@@ -31,7 +31,7 @@
 .\" 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 LOCALEDEF 1 "Aug 24, 2013"
+.TH LOCALEDEF 1 "April 9, 2016"
 .SH NAME
 localedef \- define locale environment
 .SH SYNOPSIS
@@ -43,7 +43,6 @@ localedef \- define locale environment
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBlocaledef\fR utility converts source definitions for locale categories
 into a format usable by the functions and utilities whose operational behavior
@@ -115,7 +114,6 @@ Defines the format and values of affirmative and negative responses.
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -142,7 +140,7 @@ Emit verbose debugging output on standard output.
 \fB\fB-U\fR\fR
 .ad
 .RS 23n
-Ignore the presence of character symbols that have no maching character
+Ignore the presence of character symbols that have no matching character
 definition.  This facilitates the use of a common locale definition file
 to be used across multiple encodings, even when some symbols are not
 present in a given encoding.
@@ -200,7 +198,6 @@ ISO/IEC 10646-1: 2000 standard position constant values. See NOTES.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operand is supported:
 .sp
@@ -218,7 +215,6 @@ belonging to the same locale can be processed.)
 .RE
 
 .SH OUTPUT
-.sp
 .LP
 \fBlocaledef\fR creates a directory of files that represents the locale's
 data. The contants of this directory should generally be copied into the
@@ -226,13 +222,11 @@ appropriate subdirectory of /usr/lib/locale in order the definitions to
 be visible to programs linked with libc.
 .sp
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 See \fBenviron\fR(5) for definitions of the following environment variables
 that affect the execution of \fBlocaledef\fR: \fBLANG\fR, \fBLC_ALL\fR,
 \fBLC_COLLATE\fR, \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR, and \fBNLSPATH\fR.
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -277,8 +271,6 @@ Warnings or errors occurred and no output was created.
 .LP
 If an error is detected, no permanent output will be created.
 .SH FILES
-
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/locale/\fIlocalename\fR/
@@ -289,7 +281,6 @@ The directory containing locale data.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -305,13 +296,11 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlocale\fR(1), \fBiconv_open\fR(3C), \fBnl_langinfo\fR(3C),
 \fBstrftime\fR(3C), \fBattributes\fR(5), \fBcharmap\fR(5), \fBenviron\fR(5),
 \fBextensions\fR(5), \fBlocale\fR(5), \fBstandards\fR(5)
 .SH WARNINGS
-.sp
 .LP
 If warnings occur, permanent output will be created if the \fB-c\fR option was
 specified. The following conditions will cause warning messages to be issued:
@@ -331,7 +320,6 @@ If optional keywords not supported by the implementation are present in the
 source.
 .RE
 .SH NOTES
-.sp
 .LP
 When the \fB-u\fR option is used, the \fIcode_set_name\fR option-argument is
 interpreted as a name of a codeset to which the ISO/IEC 10646-1: 2000 standard
diff --git a/usr/src/man/man1/mailcompat.1 b/usr/src/man/man1/mailcompat.1
index f27569af75..5cd96ca8b1 100644
--- a/usr/src/man/man1/mailcompat.1
+++ b/usr/src/man/man1/mailcompat.1
@@ -3,13 +3,12 @@
 .\" 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 MAILCOMPAT 1 "Aug 4, 1994"
+.TH MAILCOMPAT 1 "April 9, 2016"
 .SH NAME
 mailcompat \- provide SunOS compatibility for Solaris mailbox format
 .SH DESCRIPTION
-.sp
 .LP
-\fBmailcompat\fR is a program to provide SunOS 4.\fIx\fR compatability for the
+\fBmailcompat\fR is a program to provide SunOS 4.\fIx\fR compatibility for the
 Solaris mailbox format. You would typically run  \fBmailcompat\fR to be able to
 read mail on a workstation running SunOS 4.\fIx\fR when your mail server is
 running Solaris.
@@ -25,7 +24,6 @@ To execute \fBmailcompat\fR, log onto the Solaris mail server and enter
 \fBmailcompat\fR on the command line. Answer the queries provided by the
 program.
 .SH USAGE
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBmailcompat\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
@@ -71,7 +69,6 @@ example%
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB~/.forward\fR\fR
@@ -81,6 +78,5 @@ list of recipients for forwarding messages
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBmailx\fR(1), \fBattributes\fR(5), \fBlargefile\fR(5)
diff --git a/usr/src/man/man1/mandoc.1 b/usr/src/man/man1/mandoc.1
index c60353d2e0..9654a08bd0 100644
--- a/usr/src/man/man1/mandoc.1
+++ b/usr/src/man/man1/mandoc.1
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 23 2015 $
+.Dd $Mdocdate: April 9 2016 $
 .Dt MANDOC 1
 .Os
 .Sh NAME
@@ -769,7 +769,7 @@ In the SEE ALSO section, an
 macro with a lower section number follows one with a higher number,
 or two
 .Ic \&Xr
-macros refering to the same section are out of alphabetical order.
+macros referring to the same section are out of alphabetical order.
 .It Sy "unusual Xr punctuation"
 .Pq mdoc
 In the SEE ALSO section, punctuation between two
diff --git a/usr/src/man/man1/plgrp.1 b/usr/src/man/man1/plgrp.1
index 95dd491b44..916e2d4908 100644
--- a/usr/src/man/man1/plgrp.1
+++ b/usr/src/man/man1/plgrp.1
@@ -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 PLGRP 1 "Sep 8, 2006"
+.TH PLGRP 1 "April 9, 2016"
 .SH NAME
 plgrp \- observe and affect home lgroup and lgroup affinities of threads
 .SH SYNOPSIS
@@ -29,7 +29,6 @@ plgrp \- observe and affect home lgroup and lgroup affinities of threads
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBplgrp\fR displays or sets the home \fBlgroup\fR and \fBlgroup\fR affinities
 for one or more processes, threads, or LWPs.
@@ -62,7 +61,6 @@ The different levels of lgroup affinities and their semantics are fully
 described in \fBlgrp_affinity_set\fR(3LGRP).
 .SH USAGE
 .SS "Specifying lgroups"
-.sp
 .LP
 \fIlgroup_list\fR is a comma separated list of one or more of the following:
 .sp
@@ -85,10 +83,9 @@ keyword represents the ID of the root \fBlgroup\fR. The \fBleaves\fR keyword
 represents the IDs of all \fBleaf\fR \fBlgroups\fR, that is, lgroups which do
 not have any children.
 .SS "Specifying Processes and Threads"
-.sp
 .LP
 \fBplgrp\fR takes one or more space separated processes or threads as
-arguments. Processes and threads can be specified in a manner similiar to the
+arguments. Processes and threads can be specified in a manner similar to the
 \fBproc\fR(1) tools. A process ID may be specified as an integer \fIpid\fR or
 \fB/proc/\fR\fIpid\fR. Shell expansions can be used to specify processes when
 \fB/proc/\fR\fIpid\fR is used. For example, \fB/proc/*\fR can be used to
@@ -102,7 +99,6 @@ selected at once by using the hyphen (\fB-\fR) and comma(\fB,\fR). For example,
 \fIpid\fR\fB/1,2,7-9\fR specifies threads 1, 2, 7, 8, and 9 of the process with
 \fIpid\fR as its process ID.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -172,7 +168,6 @@ to the \fBlgroups\fR in a round robin fashion.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -270,7 +265,6 @@ PID/LWPID    HOME       AFFINITY
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -301,7 +295,6 @@ Non-fatal error or interrupt. Something might have changed.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -320,14 +313,12 @@ Interface Stability	See below.
 .LP
 The command syntax is Unstable. The output formats are Unstable.
 .SH SEE ALSO
-.sp
 .LP
 \fBlgrpinfo\fR(1), \fBmadv.so.1\fR(1), \fBpmadvise\fR(1), \fBpmap\fR(1),
 \fBproc\fR(1), \fBps\fR(1), \fBprstat\fR(1M), \fBlgrp_affinity_get\fR(3LGRP),
 \fBlgrp_affinity_set\fR(3LGRP), \fBlgrp_home\fR(3LGRP), \fBliblgrp\fR(3LIB),
 \fBproc\fR(4), \fBattributes\fR(5)
 .SH WARNINGS
-.sp
 .LP
 Like the \fBproc\fR(1) tools, the \fBplgrp\fR utility stops its target
 processes while inspecting them and reports the results when invoked with any
diff --git a/usr/src/man/man1/pmap.1 b/usr/src/man/man1/pmap.1
index 5f2c360872..d65ae166f1 100644
--- a/usr/src/man/man1/pmap.1
+++ b/usr/src/man/man1/pmap.1
@@ -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 PMAP 1 "Sep 9, 2006"
+.TH PMAP 1 "April 9, 2016"
 .SH NAME
 pmap \- display information about the address space of a process
 .SH SYNOPSIS
@@ -28,11 +28,9 @@ pmap \- display information about the address space of a process
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpmap\fR utility prints information about the address space of a process.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -172,7 +170,6 @@ Displays additional information per mapping. See USAGE for more information.
 .RE
 
 .SH USAGE
-.sp
 .LP
 The \fBpmap\fR utility prints information about the address space of a process.
 .sp
@@ -279,7 +276,6 @@ assured only if the primary controlling process, typically a debugger, has
 stopped the victim process and the primary controlling process is doing nothing
 at the moment of application of the \fBproc\fR tool in question.
 .SH DISPLAY FORMATS
-.sp
 .LP
 One line of output is printed for each mapping within the process, unless the
 -\fB-s\fR or -\fB-L\fR option is specified. With \fB-s\fR option, one line is
@@ -743,8 +739,8 @@ total Kb   50464   42264   18888   16384
 .sp
 .LP
 The \fB-s\fR option can be used to display the hardware translation page sizes
-for each portion of the address space. (See \fBmemcntl\fR(2) for futher
-information on Solaris multiple page size support).
+for each portion of the address space. (See \fBmemcntl\fR(2) for further
+information on illumos multiple page size support).
 
 .sp
 .LP
@@ -943,7 +939,6 @@ FFBFE000       8K rw---   2   [ stack ]
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -965,7 +960,6 @@ An error has occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/proc/*\fR\fR
@@ -984,7 +978,6 @@ process files
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1004,7 +997,6 @@ Interface Stability	See below.
 The command syntax is Evolving. The \fB-L\fR option and the output formats are
 Unstable.
 .SH SEE ALSO
-.sp
 .LP
 \fBldd\fR(1), \fBlgrpinfo\fR(1), \fBmadv.so.1\fR(1), \fBmdb\fR(1),
 \fBplgrp\fR(1), \fBpmadvise\fR(1), \fBproc\fR(1), \fBps\fR(1),
diff --git a/usr/src/man/man1/prctl.1 b/usr/src/man/man1/prctl.1
index db13fb2448..0e117a510b 100644
--- a/usr/src/man/man1/prctl.1
+++ b/usr/src/man/man1/prctl.1
@@ -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 PRCTL 1 "Oct 30, 2013"
+.TH PRCTL 1 "April 9, 2016"
 .SH NAME
 prctl \- get or set the resource controls of running processes, tasks, and
 projects
@@ -16,7 +16,6 @@ projects
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBprctl\fR utility allows the examination and modification of the resource
 controls associated with an active process, task, or project on the system. It
@@ -27,7 +26,6 @@ the     specified entity.
 See \fBresource_controls\fR(5) for a description of the resource controls
 supported in the current release of the Solaris operating system.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -238,7 +236,6 @@ If none of the \fB-s\fR, \fB-r\fR, \fB-x\fR, \fB-v\fR, \fB-d\fR, or \fB-e\fR
 options are specified, the invocation is considered a get operation. Otherwise,
 it is considered a modify operation.
 .SH OPERANDS
-.sp
 .LP
 The following operand is supported:
 .sp
@@ -497,7 +494,6 @@ The cap can be lowered to 50% using:
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -528,7 +524,6 @@ Invalid command line options were specified.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/proc/pid/*\fR\fR
@@ -538,7 +533,6 @@ Process information and control files
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -556,15 +550,13 @@ Interface Stability	See below.
 .sp
 .LP
 The command-line syntax is Committed. The human-readable output is Uncommitted.
-The parseable output is Committed.
+The parsable output is Committed.
 .SH SEE ALSO
-.sp
 .LP
 \fBrctladm\fR(1M), \fBzonecfg\fR(1M), \fBsetrctl\fR(2),
 \fBrctlblk_get_local_action\fR(3C), \fBproject\fR(4), \fBattributes\fR(5),
 \fBresource_controls\fR(5)
 .SH NOTES
-.sp
 .LP
 The valid signals that can be set on a resource control block allowing local
 actions are \fBSIGABRT\fR, \fBSIGXRES\fR, \fBSIGHUP\fR, \fBSIGSTOP\fR,
diff --git a/usr/src/man/man1/readonly.1 b/usr/src/man/man1/readonly.1
index 40f6f7c0a5..0cadf2bbee 100644
--- a/usr/src/man/man1/readonly.1
+++ b/usr/src/man/man1/readonly.1
@@ -5,7 +5,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 READONLY 1 "Nov 2, 2007"
+.TH READONLY 1 "April 9, 2016"
 .SH NAME
 readonly \- shell built-in function to protect the value of the given variable
 from reassignment
@@ -35,13 +35,11 @@ from reassignment
 
 .SH DESCRIPTION
 .SS "sh"
-.sp
 .LP
-The given \fIname\fRs are marked \fBreadonly\fR and the values of the these
+The given \fIname\fRs are marked \fBreadonly\fR and the values of these
 \fIname\fRs may not be changed by subsequent assignment. If no arguments are
 given, a list of all \fBreadonly\fR names is printed.
 .SS "ksh"
-.sp
 .LP
 The given \fIname\fRs are marked \fBreadonly\fR and these names cannot be
 changed by subsequent assignment.
@@ -118,7 +116,6 @@ This means that tilde substitution is performed after the \fB=\fR sign and word
 splitting and file name generation are not performed.
 .RE
 .SS "ksh93"
-.sp
 .LP
 \fBreadonly\fR sets the \fBreadonly\fR attribute on each of the variables
 specified by name which prevents their values from being changed. If
@@ -178,7 +175,6 @@ field splitting and file name generation are not performed.
 .RE
 .SH EXIT STATUS
 .SS "ksh93"
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -200,7 +196,6 @@ An error occurred.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBksh\fR(1), \fBksh93\fR(1), \fBsh\fR(1), \fBtypeset\fR(1),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1/rwho.1 b/usr/src/man/man1/rwho.1
index 4137b0491d..b5cb2ecb51 100644
--- a/usr/src/man/man1/rwho.1
+++ b/usr/src/man/man1/rwho.1
@@ -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 RWHO 1 "Nov 6, 2000"
+.TH RWHO 1 "April 9, 2016"
 .SH NAME
 rwho \- who is logged in on local machines
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ rwho \- who is logged in on local machines
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBrwho\fR command produces output similar to \fBwho\fR(1), but for all
 machines on your network.  If no report has been received from a machine for 5
@@ -26,7 +25,6 @@ this idle time.  If a user has not typed to the system for an hour or more, the
 user is omitted from the output of \fBrwho\fR unless the \fB-a\fR flag is
 given.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-a\fR\fR
@@ -36,7 +34,6 @@ Report all users whether or not they have typed to the system in the past hour.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/spool/rwho/whod.*\fR\fR
@@ -46,12 +43,10 @@ information about other machines
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBfinger\fR(1), \fBruptime\fR(1), \fBwho\fR(1), \fBin.rwhod\fR(1M),
 \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 \fBrwho\fR does not work through gateways.
 .sp
@@ -60,7 +55,7 @@ The directory \fB/var/spool/rwho\fR must exist on the host from which
 \fBrwho\fR is run.
 .sp
 .LP
-This service takes up progressively more network bandwith as the number of
+This service takes up progressively more network bandwidth as the number of
 hosts on the local net increases. For large networks, the cost becomes
 prohibitive.
 .sp
diff --git a/usr/src/man/man1/svcprop.1 b/usr/src/man/man1/svcprop.1
index a1be45b9fa..e4eaba64a2 100644
--- a/usr/src/man/man1/svcprop.1
+++ b/usr/src/man/man1/svcprop.1
@@ -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 SVCPROP 1 "Sep 13, 2007"
+.TH SVCPROP 1 "April 9, 2016"
 .SH NAME
 svcprop \- retrieve values of service configuration properties
 .SH SYNOPSIS
@@ -20,7 +20,6 @@ svcprop \- retrieve values of service configuration properties
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsvcprop\fR utility prints values of properties in the service
 configuration repository. Properties are selected by \fB-p\fR options and the
@@ -36,7 +35,6 @@ instance's directly attached properties. See \fBsmf\fR(5) for an explanation of
 property composition. If the \fBrunning\fR snapshot does not exist then the
 instance's directly attached properties are used instead.
 .SS "Output Format"
-.sp
 .LP
 By default, when a single property is selected, the values for each are printed
 on separate lines. Empty \fBASCII\fR string values are represented by a pair of
@@ -64,7 +62,6 @@ due to access controls, an error results.
 .LP
 Error messages are printed to the standard error stream.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -177,7 +174,6 @@ Uses properties from the service or instance in the specified \fIzone\fR.
 This option is only applicable from the global zone, see \fBzones\fR(5).
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -294,7 +290,7 @@ general/single_instance boolean true
 .sp
 
 .LP
-\fBExample 4 \fRTesting the Existance of a Property
+\fBExample 4 \fRTesting the Existence of a Property
 .sp
 .LP
 The following example tests the existence of the \fBgeneral/enabled\fR property
@@ -371,7 +367,6 @@ svcprop -p $1 $2 | (
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -402,7 +397,6 @@ Invalid command line options were specified.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsvcs\fR(1), \fBinetd\fR(1M), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M),
 \fBsvc.startd\fR(1M), \fBservice_bundle\fR(4), \fBattributes\fR(5),
diff --git a/usr/src/man/man1has/sh.1has b/usr/src/man/man1has/sh.1has
index 3ad2d596a5..366f4b9d1f 100644
--- a/usr/src/man/man1has/sh.1has
+++ b/usr/src/man/man1has/sh.1has
@@ -9,7 +9,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 SH 1HAS "Apr 3, 2008"
+.TH SH 1HAS "April 9, 2016"
 .SH NAME
 sh, jsh \- standard and job control shell and command interpreter
 .SH SYNOPSIS
@@ -30,7 +30,6 @@ sh, jsh \- standard and job control shell and command interpreter
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fB/usr/bin/sh\fR utility is a command programming language that executes
 commands read from a terminal or a file.
@@ -48,7 +47,6 @@ section below).
 .LP
 Arguments to the shell are listed in the \fBInvocation\fR section below.
 .SS "Definitions"
-.sp
 .LP
 A \fIblank\fR is a tab or a space. A \fIname\fR is a sequence of \fBASCII\fR
 letters, digits, or underscores, beginning with a letter or an underscore. A
@@ -56,7 +54,6 @@ letters, digits, or underscores, beginning with a letter or an underscore. A
 \fB#\fR, \fB?\fR, \fB\(mi\fR, \fB$\fR, and \fB!\fR.
 .SH USAGE
 .SS "Commands"
-.sp
 .LP
 A \fIsimple-command\fR is a sequence of non-blank \fIword\fRs separated by
 \fIblank\fRs. The first \fIword\fR specifies the name of the command to be
@@ -190,12 +187,10 @@ not quoted:
 .LP
 \fBif  then  else  elif  fi  case  esac  for  while  until  do  done  {  }\fR
 .SS "Comments Lines"
-.sp
 .LP
 A word beginning with \fB#\fR causes that word and all the following characters
 up to a newline to be ignored.
 .SS "Command Substitution"
-.sp
 .LP
 The shell reads commands from the string between two grave accents (\fB``\fR)
 and the standard output from these commands can be used as all or part of a
@@ -220,7 +215,6 @@ effect. Backslashes that precede characters other than \fB\e\fR, \fB`\fR,
 \fB"\fR, \fBnewline\fR, and \fB$\fR are left intact when the command string is
 read.
 .SS "Parameter Substitution"
-.sp
 .LP
 The character \fB$\fR is used to introduce substitutable \fIparameter\fRs.
 There are two types of parameters, positional and keyword. If \fIparameter\fR
@@ -483,7 +477,6 @@ The shell gives default values to \fBPATH\fR, \fBPS1\fR, \fBPS2\fR,
 \fBMAILCHECK\fR, and \fBIFS\fR. Default values for \fBHOME\fR and \fBMAIL\fR
 are set by \fBlogin\fR(1).
 .SS "Blank Interpretation"
-.sp
 .LP
 After parameter and command substitution, the results of substitution are
 scanned for internal field separator characters (those found in \fBIFS\fR) and
@@ -491,7 +484,6 @@ split into distinct arguments where such characters are found. Explicit null
 arguments (\fB""\fR or \fB\&''\fR) are retained. Implicit null arguments (those
 resulting from \fIparameter\fRs that have no values) are removed.
 .SS "Input/Output Redirection"
-.sp
 .LP
 A command's input and output can be redirected using a special notation
 interpreted by the shell. The following can appear anywhere in a
@@ -658,7 +650,6 @@ is the empty file, \fB/dev/null\fR. Otherwise, the environment for the
 execution of a command contains the file descriptors of the invoking shell as
 modified by input/output specifications.
 .SS "File Name Generation"
-.sp
 .LP
 Before a command is executed, each command \fIword\fR is scanned for the
 characters \fB*\fR, \fB?\fR, and \fB[\fR. If one of these characters appears
@@ -702,7 +693,6 @@ enclosed is matched.
 Notice that all quoted characters (see below) must be matched explicitly in a
 filename.
 .SS "Quoting"
-.sp
 .LP
 The following characters have a special meaning to the shell and cause
 termination of a word unless quoted:
@@ -739,14 +729,12 @@ the characters \fB\e\fR, \fB`\fR, \fB,\fR (comma), and \fB$\fR. The pair
 backslash precedes characters other than \fB\e\fR, \fB`\fR, \fB,\fR (comma),
 \fB$\fR, and newline, then the backslash itself is quoted by the shell.
 .SS "Prompting"
-.sp
 .LP
 When used interactively, the shell prompts with the value of \fBPS1\fR before
 reading a command. If at any time a newline is typed and further input is
 needed to complete a command, the secondary prompt (that is, the value of
 \fBPS2\fR) is issued.
 .SS "Environment"
-.sp
 .LP
 The \fIenvironment\fR (see \fBenviron\fR(5)) is a list of name-value pairs that
 is passed to an executed program in the same way as a normal argument list. The
@@ -822,14 +810,12 @@ c\fR
 .sp
 
 .SS "Signals"
-.sp
 .LP
 The \fBINTERRUPT\fR and \fBQUIT\fR signals for an invoked command are ignored
 if the command is followed by \fB&\fR\&. Otherwise, signals have the values
 inherited by the shell from its parent, with the exception of signal 11 (but
 see also the \fBtrap\fR command below).
 .SS "Execution"
-.sp
 .LP
 Each time a command is executed, the command substitution, parameter
 substitution, blank interpretation, input/output redirection, and filename
@@ -866,7 +852,6 @@ current directory changes. The shell forgets all remembered locations whenever
 the \fBPATH\fR variable is changed or the \fBhash\fR \fB-r\fR command is
 executed (see below).
 .SS "Special Commands"
-.sp
 .LP
 Input/output redirection is now permitted for these commands. File descriptor 1
 is the default output location. When Job Control is enabled, additional
@@ -1167,7 +1152,7 @@ code is \fB0\fR, unless an \fBEOF\fR is encountered.
 .ad
 .sp .6
 .RS 4n
-The given \fIname\fRs are marked \fBreadonly\fR and the values of the these
+The given \fIname\fRs are marked \fBreadonly\fR and the values of these
 \fIname\fRs can not be changed by subsequent assignment. If no arguments are
 given, a list of all \fBreadonly\fR names is printed.
 .RE
@@ -1527,7 +1512,6 @@ background processes are waited for and the return code is zero.
 .RE
 
 .SS "Invocation"
-.sp
 .LP
 If the shell is invoked through \fBexec\fR(2) and the first character of
 argument zero is \fB\(mi\fR, commands are initially read from
@@ -1597,7 +1581,6 @@ descriptor 2.
 The remaining flags and arguments are described under the \fBset\fR command
 above.
 .SS "Job Control (jsh)"
-.sp
 .LP
 When the shell is invoked as \fBjsh\fR, Job Control is enabled in addition to
 all of the functionality described previously for \fBsh\fR. Typically, Job
@@ -1807,20 +1790,17 @@ Stops the execution of the current shell (but not if it is the login shell).
 .RE
 
 .SS "Large File Behavior"
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBsh\fR and
 \fBjsh\fR when encountering files greater than or equal to 2 Gbyte ( 2^31
 bytes).
 .SH EXIT STATUS
-.sp
 .LP
 Errors detected by the shell, such as syntax errors, cause the shell to return
 a non-zero exit status. If the shell is being used non-interactively execution
 of the shell file is abandoned. Otherwise, the shell returns the exit status of
 the last command executed (see also the \fBexit\fR command above).
 .SS "jsh Only"
-.sp
 .LP
 If the shell is invoked as \fBjsh\fR and an attempt is made to exit the shell
 while there are stopped jobs, the shell issues one warning:
@@ -1833,7 +1813,6 @@ This is the only message. If another exit attempt is made, and there are still
 stopped jobs they are sent a \fBSIGHUP\fR signal from the kernel and the shell
 is exited.
 .SH FILES
-.sp
 .LP
 \fB$HOME/.profile\fR
 .sp
@@ -1846,13 +1825,9 @@ is exited.
 .LP
 \fB/tmp/sh*\fR
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .SS "/usr/bin/sh, /usr/bin/jsh"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -1863,9 +1838,6 @@ CSI	Enabled
 .TE
 
 .SS "/usr/xpg4/bin/sh"
-.sp
-
-.sp
 .TS
 box;
 c | c
@@ -1876,7 +1848,6 @@ CSI	Enabled
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBIntro\fR(1), \fBbc\fR(1), \fBecho\fR(1), \fBgetoptcvt\fR(1), \fBkill\fR(1),
 \fBksh\fR(1), \fBlogin\fR(1), \fBnewgrp\fR(1), \fBpfsh\fR(1), \fBpfexec\fR(1),
@@ -1887,11 +1858,9 @@ CSI	Enabled
 \fBsetlocale\fR(3C), \fBsignal.h\fR(3HEAD), \fBpasswd\fR(4), \fBprofile\fR(4),
 \fBattributes\fR(5), \fBenviron\fR(5), \fBlargefile\fR(5), \fBXPG4\fR(5)
 .SH WARNINGS
-.sp
 .LP
 The use of \fBsetuid\fR shell scripts is \fBstrongly\fR discouraged.
 .SH NOTES
-.sp
 .LP
 Words used for filenames in input/output redirection are not interpreted for
 filename generation (see \fBFile Name Generation\fR section above). For
diff --git a/usr/src/man/man1m/acctadm.1m b/usr/src/man/man1m/acctadm.1m
index ce6a1e19ef..2040762f06 100644
--- a/usr/src/man/man1m/acctadm.1m
+++ b/usr/src/man/man1m/acctadm.1m
@@ -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 ACCTADM 1M "Dec 17, 2008"
+.TH ACCTADM 1M "April 9, 2016"
 .SH NAME
 acctadm \- configure extended accounting facility
 .SH SYNOPSIS
@@ -15,13 +15,11 @@ acctadm \- configure extended accounting facility
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBacctadm\fR configures various attributes of the extended accounting
 facility. Without arguments, \fBacctadm\fR displays the current status of the
 extended accounting facility.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -126,7 +124,6 @@ This option requires an operand. See \fBOPERANDS\fR.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The \fB-d\fR, \fB-D\fR, \fB-e\fR, \fB-E\fR, \fB-f\fR, and \fB-x\fR options
 require an operand.
@@ -286,7 +283,6 @@ $ \fBacctadm -r task\fR
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -311,7 +307,7 @@ successfully.
 .RS 4n
 An error occurred.
 .sp
-A fatal error occured either in obtaining or modifying the accounting
+A fatal error occurred either in obtaining or modifying the accounting
 configuration.
 .RE
 
@@ -348,7 +344,6 @@ service instance.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -364,12 +359,10 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdladm\fR(1M), \fBflowadm\fR(1M), \fBacct\fR(2), \fBattributes\fR(5),
 \fBsmf\fR(5), \fBipqos\fR(7IPP)
 .SH NOTES
-.sp
 .LP
 Both extended accounting and regular accounting can be active.
 .sp
diff --git a/usr/src/man/man1m/catman.1m b/usr/src/man/man1m/catman.1m
index aba601c583..5a79706553 100644
--- a/usr/src/man/man1m/catman.1m
+++ b/usr/src/man/man1m/catman.1m
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\"
-.Dd Jul 19, 2014
+.Dd April 9, 2016
 .Dt CATMAN 1M
 .Os
 .Sh NAME
@@ -55,7 +55,7 @@ The following environment variables affect the execution of
 .Nm :
 .Bl -tag -width ".Ev MANPATH"
 .It Ev MANPATH
-Used to specify a colon seperated list of manual paths within
+Used to specify a colon separated list of manual paths within
 which to generate
 .Nm whatis
 database files.
diff --git a/usr/src/man/man1m/cfgadm_pci.1m b/usr/src/man/man1m/cfgadm_pci.1m
index 875b7e7a0b..7015a06f33 100644
--- a/usr/src/man/man1m/cfgadm_pci.1m
+++ b/usr/src/man/man1m/cfgadm_pci.1m
@@ -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 CFGADM_PCI 1M "Jun 13, 2008"
+.TH CFGADM_PCI 1M "April 9, 2016"
 .SH NAME
 cfgadm_pci \- PCI, CompactPCI, and PCI Express Hotplug hardware specific
 commands for cfgadm
@@ -39,7 +39,6 @@ commands for cfgadm
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The PCI hardware specific library, \fB/usr/lib/cfgadm/pci.so.1\fR, provides the
 support for hot plugging PCI, CompactPCI, and PCI Express adapter cards into
@@ -76,7 +75,6 @@ Note that the \fBap_type\fR is not the same as the information in the
 .LP
 See the \fI\fR for a detailed description of the hot plug procedure.
 .SS "PCI Express ap_id naming"
-.sp
 .LP
 For attachment points located in a PCI Express hierarchy (that is, the parent
 or an ancestor is a PCI Express device), including attachment points which are
@@ -117,7 +115,7 @@ is the PCI device number in standard PCI nomenclature.
 First, an \fIabsolute-slot-path\fR is constructed that attempts to describe the
 attachment point's topological location in more physically identifiable terms
 for the user . This \fIabsolute-slot-path\fR consists of \fIslot-path\fR
-components each seperated by a ":" (colon). The leaf or left-most
+components each separated by a ":" (colon). The leaf or left-most
 \fIslot-path\fR component describes the device of the attachment point itself
 while its right adjacent \fIslot-path\fR component up to the right or top-most
 \fIslot-path\fR component describes the parent up to the root devices,
@@ -254,7 +252,7 @@ Whichever final \fIap_id\fR name is used, the \fIabsolute-slot-path\fR is
 stored in the Information ("info") field which can be displayed using the
 \fB-s\fR or \fB-v\fRoptions. This information can be used to physically locate
 any \fIap_id\fRs named using "ap_id form (2)" or "ap_id form (3)". The
-\fIabsolute-slot-path\fR is tranformed slightly when stored in the information
+\fIabsolute-slot-path\fR is transformed slightly when stored in the information
 field, by the replacement of a colon (":") with forward slashes ("/") to more
 closely denote a topological context. The \fIabsolute-slot-path\fR can include
 \fIslot-path\fR components that are not hotpluggable above the leaf or
@@ -263,7 +261,6 @@ right-most \fIslot-path\fR component up to the onboard host slot.
 .LP
 See the EXAMPLES section for a list of hotpluggable examples.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -411,7 +408,7 @@ command outputs information about the attachment point. For attachment points
 located in a PCI Express hierarhcy, the Information field will contain the
 attachment point's absolute slot path location, including any hardware or
 platform specific labeling information for each component in the slot path.
-Each component in the slot path will be seperated by a "/" (foward slash). See
+Each component in the slot path will be separated by a "/" (forward slash). See
 the PCI Express ap_id naming section. For PCI Hot Plug attachment points not
 located in a PCI Express hieararchy, the \fBInformation\fR field will be the
 slot's system label, if any. This string will be obtained from the
@@ -935,7 +932,6 @@ component ".../iob.pcie2" represents a  PCI Express slot with device number 0,
 bound to driver instance 21 of "px_pci"
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB/usr/lib/cfgadm/pci.so.1\fR
@@ -946,7 +942,6 @@ Hardware specific library for PCI hot plugging.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcfgadm\fR(1M), \fBconfig_admin\fR(3CFGADM), \fBlibcfgadm\fR(3LIB),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/chat.1m b/usr/src/man/man1m/chat.1m
index 0f3b594215..db5b98ebd5 100644
--- a/usr/src/man/man1m/chat.1m
+++ b/usr/src/man/man1m/chat.1m
@@ -4,7 +4,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 CHAT 1M "May 4, 2001"
+.TH CHAT 1M "April 9, 2016"
 .SH NAME
 chat \- automated conversational exchange tool
 .SH SYNOPSIS
@@ -14,14 +14,12 @@ chat \- automated conversational exchange tool
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBchat\fR program implements a conversational text-based exchange between
 the computer and any serial device, including (but not limited to) a modem, an
 ISDN TA, and the remote peer itself, establishing a connection between the
 Point-To-Point Protocol daemon (\fBpppd\fR) and the remote \fBpppd\fR process.
 .SH OPTIONS
-.sp
 .LP
 The  \fBchat\fR command supports the following options:
 .sp
@@ -161,7 +159,6 @@ is included as parameters to the \fBchat\fR program.
 
 .SH EXTENDED DESCRIPTION
 .SS "Chat Script"
-.sp
 .LP
 The \fBchat\fR script defines communications. A script consists of one or more
 "expect-send" pairs of strings separated by spaces, with an optional
@@ -233,7 +230,6 @@ return sequence is sent and then the script looks for login: again. If line
 noise obscures the first login prompt, send the empty line to generate a login
 prompt again.
 .SS "Comments"
-.sp
 .LP
 Comments can be embedded in the \fBchat\fR script. Comment lines are ignored by
 the chat program. A comment starts with the hash ("#") character in column one.
@@ -249,7 +245,6 @@ with a \fB#\fR character, write something like this:
 .in -2
 
 .SS "Sending Data From A File"
-.sp
 .LP
 If the string to send begins with an at sign ("@"), the remainder of the string
 is interpreted as the name of the file that contains the string. If the last
@@ -258,7 +253,6 @@ pipe (or fifo) instead of a regular file. This enables \fBchat\fR to
 communicate with another program, for example, a program to prompt the user and
 receive a password typed in.
 .SS "Abort "
-.sp
 .LP
 Many modems report the status of a call as a string. These status strings are
 often "CONNECTED" or "NO CARRIER" or "BUSY." If the modem fails to connect to
@@ -281,13 +275,11 @@ sends the string BUSY, causing the string to match the abort character
 sequence. The script fails because it found a match to the abort string. If the
 NO CARRIER string is received, it aborts for the same reason.
 .SS "Clr_Abort "
-.sp
 .LP
 The CLR_ABORT sequence clears previously set ABORT strings. ABORT strings are
 kept in an array of a pre-determined size; CLR_ABORT reclaims the space for
 cleared entries, enabling new strings to use that space.
 .SS "Say "
-.sp
 .LP
 The SAY string enables the script to send strings to a user at a terminal via
 standard error. If \fBchat\fR is being run by \fBpppd\fR and \fBpppd\fR is
@@ -334,7 +326,6 @@ Logged in OK ...
 .in -2
 
 .SS "Report"
-.sp
 .LP
 REPORT is similar to the ABORT string. With REPORT, however, strings and all
 characters to the next control character (such as a carriage return), are
@@ -368,13 +359,11 @@ remainder of the script is executed. In addition, the program writes the string
 CONNECT to the report file (specified by \fB-r\fR) in addition to any
 characters that follow.
 .SS "Clr_Report"
-.sp
 .LP
 CLR_REPORT clears previously set REPORT strings. REPORT strings are kept in an
 array of a pre-determined size; CLR_REPORT reclaims the space for cleared
 entries so that new strings can use that space.
 .SS "Echo"
-.sp
 .LP
 ECHO determines if modem output is echoed to \fBstderr\fR. This option may be
 set with the \fB-e\fR option, but can also be controlled by the ECHO keyword.
@@ -400,7 +389,6 @@ ogin:   account
 All output resulting from modem configuration and dialing is not visible, but
 output is echoed beginning with the CONNECT (or BUSY) message.
 .SS "Hangup"
-.sp
 .LP
 The HANGUP option determines if a modem hangup is considered as an error.
 HANGUP is useful for dialing systems that hang up and call your system back.
@@ -431,10 +419,9 @@ ABORT   'BUSY'
 .in -2
 
 .SS "Timeout"
-.sp
 .LP
 The initial timeout value is 45 seconds. Use the \fB-t\fR parameter to change
-the intial timeout value.
+the initial timeout value.
 .sp
 .LP
 To change the timeout value for the next expect string, the following example
@@ -461,7 +448,6 @@ prompt.
 .LP
 Once changed, the timeout value remains in effect until it is changed again.
 .SS " EOT"
-.sp
 .LP
 The EOT special reply string instructs the \fBchat\fR program to send an EOT
 character to the remote. This is equivalent to using ^D\ec as the reply string.
@@ -469,7 +455,6 @@ The EOT string normally indicates the end-of-file character sequence. A return
 character is not sent following the EOT. The EOT sequence can embedded into the
 send string using the sequence ^D.
 .SS " BREAK"
-.sp
 .LP
 The BREAK special reply string sends a break condition. The break is a special
 transmitter signal. Many UNIX systems handle break by cycling through available
@@ -477,7 +462,6 @@ bit rates, and sending break is often needed when the remote system does not
 support autobaud. BREAK is equivalent to using \eK\ec as the reply string.
 You embed the break sequence into the send string using the \eK sequence.
 .SS "Escape Sequences"
-.sp
 .LP
 Expect and reply strings can contain escape sequences. Reply strings accept all
 escape sequences, while expect strings accept most sequences. A list of escape
@@ -653,7 +637,6 @@ in expect.)
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 Environment variables are available within \fBchat\fR scripts if the \fB-E\fR
 option is specified on the command line. The metacharacter \fB$\fR introduces
@@ -661,7 +644,6 @@ the name of the environment variable to substitute. If the substition fails
 because the requested environment variable is not set, nothing is replaced for
 the variable.
 .SH EXIT STATUS
-.sp
 .LP
 The \fBchat\fR program terminates with the following completion codes:
 .sp
@@ -759,7 +741,6 @@ possible to decide if the string "BUSY" was received from the modem versus "NO
 DIALTONE." While the first event may be retried, the second probably will not
 succeed during a retry.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5)  for descriptions of the following attributes:
 .sp
@@ -775,7 +756,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsleep\fR(1), \fBuucp\fR(1C), \fBpppd\fR(1M), \fBuucico\fR(1M),
 \fBsyslog\fR(3C), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/cpustat.1m b/usr/src/man/man1m/cpustat.1m
index e5a1a7c6c4..3ec2265bde 100644
--- a/usr/src/man/man1m/cpustat.1m
+++ b/usr/src/man/man1m/cpustat.1m
@@ -1,6 +1,6 @@
 '\" te
 .\" Copyright (c) 2005, Sun Microsystems, Inc.
-.TH CPUSTAT 1M "Jun 16, 2009"
+.TH CPUSTAT 1M "April 9, 2016"
 .SH NAME
 cpustat \- monitor system behavior using CPU performance counters
 .SH SYNOPSIS
@@ -16,7 +16,6 @@ cpustat \- monitor system behavior using CPU performance counters
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBcpustat\fR utility allows \fBCPU\fR performance counters to be used to
 monitor the overall behavior of the \fBCPU\fRs in the system.
@@ -28,7 +27,6 @@ statistics are repeated \fIcount\fR times. If neither are specified, an
 interval of five seconds is used, and there is no limit to the number of
 samples that are taken.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -157,7 +155,6 @@ current architecture.
 .RE
 
 .SH USAGE
-.sp
 .LP
 A closely related utility, \fBcputrack\fR(1), can be used to monitor the
 behavior of individual applications with little or no interference from other
@@ -195,7 +192,7 @@ processor clock cycles. If such an event is of interest, sampling should occur
 frequently so that less than 4 billion clock cycles can occur between samples.
 .sp
 .LP
-The output of cpustat is designed to be readily parseable by \fBnawk\fR(1) and
+The output of cpustat is designed to be readily parsable by \fBnawk\fR(1) and
 \fBperl\fR(1), thereby allowing performance tools to be composed by embedding
 \fBcpustat\fR in scripts. Alternatively, tools can be constructed directly
 using the same \fBAPI\fRs that \fBcpustat\fR is built upon using the facilities
@@ -295,7 +292,6 @@ cpustat -c \e
 .sp
 
 .SH WARNINGS
-.sp
 .LP
 By running the \fBcpustat\fR command, the super-user forcibly invalidates all
 existing performance counter context. This can in turn cause all invocations of
@@ -323,7 +319,6 @@ the problem and possible solutions.
 If a short interval is requested, \fBcpustat\fR might not be able to keep up
 with the desired sample rate. In this case, some samples might be dropped.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -339,14 +334,12 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcputrack\fR(1), \fBnawk\fR(1), \fBperl\fR(1), \fBiostat\fR(1M),
 \fBprstat\fR(1M), \fBpsrset\fR(1M), \fBvmstat\fR(1M), \fBcpc\fR(3CPC),
 \fBcpc_open\fR(3CPC), \fBcpc_bind_cpu\fR(3CPC), \fBgethrtime\fR(3C),
 \fBstrtoll\fR(3C), \fBlibcpc\fR(3LIB), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 When \fBcpustat\fR is run on a Pentium 4 with HyperThreading enabled, a CPC set
 is bound to only one logical CPU of each physical CPU. See
diff --git a/usr/src/man/man1m/dladm.1m b/usr/src/man/man1m/dladm.1m
index 12224b1ecb..67a82b0b63 100644
--- a/usr/src/man/man1m/dladm.1m
+++ b/usr/src/man/man1m/dladm.1m
@@ -548,12 +548,12 @@ Number of output errors.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -844,12 +844,12 @@ The name of the physical device under this link.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -1520,12 +1520,12 @@ fields listed under \fB-L\fR, above, can be used with \fB-o\fR.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -1835,7 +1835,7 @@ links. This option cannot be used with the \fB-f\fR and \fB-t\fR options.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -2637,12 +2637,12 @@ Additional flags might be defined in the future.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -2772,12 +2772,12 @@ Either \fBbss\fR for \fBBSS\fR (infrastructure) networks, or \fBibss\fR for
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .RE
@@ -3084,12 +3084,12 @@ displayed.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Displays using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Displays using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .RE
@@ -3202,12 +3202,12 @@ By default, all fields except \fBREM_FAULT\fR are displayed for the "current"
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Displays using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Displays using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -3440,12 +3440,12 @@ driver man page for details.
 .sp
 .ne 2
 .na
-\fB\fB-c\fR, \fB--parseable\fR\fR
+\fB\fB-c\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with this option. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with this option. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -3635,12 +3635,12 @@ The class of the secure object.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -3922,12 +3922,12 @@ A factory MAC address used by the VNIC.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The \fB-o\fR option is
-required with \fB-p\fR. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The \fB-o\fR option is
+required with \fB-p\fR. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -4290,12 +4290,12 @@ Display the persistent IP tunnel configuration.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format. The -o option is required with
--p. See "Parseable Output Format", below.
+Display using a stable machine-parsable format. The -o option is required with
+-p. See "Parsable Output Format", below.
 .RE
 
 .sp
@@ -4823,10 +4823,10 @@ display network usage for all links.
 
 .RE
 
-.SS "Parseable Output Format"
+.SS "Parsable Output Format"
 .LP
 Many \fBdladm\fR subcommands have an option that displays output in a
-machine-parseable format. The output format is one or more lines of colon
+machine-parsable format. The output format is one or more lines of colon
 (\fB:\fR) delimited fields. The fields displayed are specific to the subcommand
 used and are listed under the entry for the \fB-o\fR option for a given
 subcommand. Output includes only those fields requested by means of the
@@ -4835,7 +4835,7 @@ subcommand. Output includes only those fields requested by means of the
 .LP
 When you request multiple fields, any literal colon characters are escaped by a
 backslash (\fB\e\fR) before being output. Similarly, literal backslash
-characters will also be escaped (\fB\e\e\fR). This escape format is parseable
+characters will also be escaped (\fB\e\e\fR). This escape format is parsable
 by using shell \fBread\fR(1) functions with the environment variable
 \fBIFS=:\fR (see \fBEXAMPLES\fR, below). Note that escaping is not done when
 you request only a single field.
@@ -4849,7 +4849,7 @@ The following general link properties are supported:
 .ad
 .sp .6
 .RS 4n
-A comma-seperated list of IP addresses that are allowed on the interface.
+A comma-separated list of IP addresses that are allowed on the interface.
 .sp
 An address in CIDR format with no host address specified is used to indicate
 that any address on that subnet is allowed (e.g. 192.168.10.0/24 means any
@@ -5313,7 +5313,7 @@ capabilities allowed by the device and the link partner.
 .ad
 .sp .6
 .RS 4n
-A comma-seperated list of additional MAC addresses that are allowed on the
+A comma-separated list of additional MAC addresses that are allowed on the
 interface.
 .RE
 
@@ -5565,7 +5565,7 @@ hardware (\fBbge0\fR in this case) has been removed:
 .sp
 
 .LP
-\fBExample 10 \fRUsing Parseable Output to Capture a Single Field
+\fBExample 10 \fRUsing Parsable Output to Capture a Single Field
 .sp
 .LP
 The following assignment saves the MTU of link \fBnet0\fR to a variable named
@@ -5580,7 +5580,7 @@ The following assignment saves the MTU of link \fBnet0\fR to a variable named
 .sp
 
 .LP
-\fBExample 11 \fRUsing Parseable Output to Iterate over Links
+\fBExample 11 \fRUsing Parsable Output to Iterate over Links
 .sp
 .LP
 The following script displays the state of each link on the system.
diff --git a/usr/src/man/man1m/fbconf_xorg.1m b/usr/src/man/man1m/fbconf_xorg.1m
index a30e134568..ad87c5611a 100644
--- a/usr/src/man/man1m/fbconf_xorg.1m
+++ b/usr/src/man/man1m/fbconf_xorg.1m
@@ -47,7 +47,6 @@ For \fBkfb\fR devices:
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBfbconf_xorg\fR utility configures Frame Buffer devices and some of the
 X11 window system defaults for Xorg by updating the \fBxorg.conf\fR
@@ -89,7 +88,6 @@ These standard \fBxorg.conf\fR files can be written only by the superuser or
 someone with the Primary Administrator role. Consequently, the
 \fBfbconf_xorg\fR program is run with setuid root permission.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported for all frame buffer devices:
 .sp
@@ -130,7 +128,7 @@ the machine-specific \fB/etc/X11/xorg.conf\fR file is opened. If system is
 specified, the global \fB/usr/X11/xorg.conf\fR file is opened. The absolute
 pathname of  a configuration file can be used instead. If the specified file
 does not exist and is to be updated, it will be created. The file system that
-will contain the \fBxorg.conf\fR file must be writeable by someone with
+will contain the \fBxorg.conf\fR file must be writable by someone with
 superuser-like privileges. This option has no effect unless other options are
 specified. The default is \fBmachine\fR.
 .RE
@@ -605,7 +603,6 @@ be issued when the window system is running. The default is \fBdisable\fR.
 .RE
 
 .SH DEFAULTS
-.sp
 .LP
 Certain options have implied default arguments. The default argument is used
 when the option is not present on the \fBfbconf_xorg\fR command line. For
@@ -688,7 +685,6 @@ example% \fBfbconf_xorg -dev kfb0 -res 1280x1024x76\fR
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -722,7 +718,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/fb\fR\fR
@@ -753,7 +748,6 @@ Video mode definitions included in new configuration files.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -769,7 +763,6 @@ Interface Stability	Uncommitted
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBfbconfig\fR(1M), \fBsvccfg\fR(1M), \fBattributes\fR(5), \fBkfb\fR(7D),
 \fBfbio\fR(7I)
diff --git a/usr/src/man/man1m/flowadm.1m b/usr/src/man/man1m/flowadm.1m
index c9d5b846d5..860d5f1faa 100644
--- a/usr/src/man/man1m/flowadm.1m
+++ b/usr/src/man/man1m/flowadm.1m
@@ -4,7 +4,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 FLOWADM 1M "Feb 14, 2009"
+.TH FLOWADM 1M "April 9, 2016"
 .SH NAME
 flowadm \- administer bandwidth resource control and priority for protocols,
 services, containers, and virtual machines
@@ -37,7 +37,6 @@ services, containers, and virtual machines
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBflowadm\fR command is used to create, modify, remove, and show
 networking bandwidth and associated resources for a type of traffic on a
@@ -71,8 +70,7 @@ traffic for more observable and deterministic behavior.
 .LP
 \fBflowadm\fR is implemented as a set of subcommands with corresponding
 options. Options are described in the context of each subcommand.
-.SH SUB-COMMANDS
-.sp
+.SH SUBCOMMANDS
 .LP
 The following subcommands are supported:
 .sp
@@ -162,11 +160,11 @@ header.
 .sp
 .ne 2
 .na
-\fB\fB-p\fR, \fB--parseable\fR\fR
+\fB\fB-p\fR, \fB--parsable\fR\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format.
+Display using a stable machine-parsable format.
 .RE
 
 .sp
@@ -534,11 +532,11 @@ Flow properties are documented in the "Flow Properties" section, below.
 .sp
 .ne 2
 .na
-\fB\fB-c\fR, \fB--parseable\fR\fR
+\fB\fB-c\fR
 .ad
 .sp .6
 .RS 4n
-Display using a stable machine-parseable format.
+Display using a stable machine-parsable format.
 .RE
 
 .sp
@@ -656,7 +654,6 @@ Otherwise, display network usage from all flows.
 .RE
 
 .SS "Flow Attributes"
-.sp
 .LP
 The flow operand that identify a flow in a \fBflowadm\fR command is a
 comma-separated list of one or more keyword, value pairs from the list below.
@@ -747,11 +744,9 @@ dsfield=\fIval\fR[:\fIdsfield_mask\fR]
 On a given link, the combinations above are mutually exclusive. An attempt to
 create flows of different combinations will fail.
 .SS "Restrictions"
-.sp
 .LP
 There are individual flow restrictions and flow restrictions per zone.
 .SS "Individual Flow Restrictions"
-.sp
 .LP
 Restrictions on individual flows do not require knowledge of other flows that
 have been added to the link.
@@ -798,13 +793,11 @@ flow16\fR
 .sp
 
 .SS "Flow Restrictions Per Zone"
-.sp
 .LP
 Within a zone, no two flows can have the same name. After adding a flow with
 the link specified, the link will not be required for display, modification, or
 deletion of the flow.
 .SS "Flow Properties"
-.sp
 .LP
 The following flow properties are supported. Note that the ability to set a
 given property to a given value depends on the driver and hardware.
@@ -1004,7 +997,6 @@ Output the same information as above as a plotfile:
 .sp
 
 .SH EXIT STATUS
-.sp
 .ne 2
 .na
 \fB\fB0\fR\fR
@@ -1025,7 +1017,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1041,7 +1032,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBacctadm\fR(1M), \fBdladm\fR(1M), \fBifconfig\fR(1M), \fBprstat\fR(1M),
 \fBroute\fR(1M), \fBattributes\fR(5), \fBdlpi\fR(7P)
diff --git a/usr/src/man/man1m/getdevpolicy.1m b/usr/src/man/man1m/getdevpolicy.1m
index d4dd4cb675..838d392671 100644
--- a/usr/src/man/man1m/getdevpolicy.1m
+++ b/usr/src/man/man1m/getdevpolicy.1m
@@ -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 GETDEVPOLICY 1M "Apr 9, 2004"
+.TH GETDEVPOLICY 1M "April 9, 2016"
 .SH NAME
 getdevpolicy \- inspect the system's device policy
 .SH SYNOPSIS
@@ -13,22 +13,19 @@ getdevpolicy \- inspect the system's device policy
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Without arguments, \fBgetdevpolicy\fR outputs the device policy in effect to
 standard output.
 .sp
 .LP
 With arguments, each argument is treated as a pathname to a device and the
-device policy in effect for that specific device is printed preceeded by the
+device policy in effect for that specific device is printed preceded by the
 supplied pathname.
 .SH USAGE
-.sp
 .LP
  The device policy adds access restrictions over and above the file
 permissions.
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -50,7 +47,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -69,7 +65,6 @@ Interface Stability	See below
 .LP
 The invocation is evolving. The output is unstable.
 .SH SEE ALSO
-.sp
 .LP
 \fBadd_drv\fR(1M), \fBrem_drv\fR(1M), \fBupdate_drv\fR(1M),
 \fBattributes\fR(5), \fBprivileges\fR(5), \fBdevfs\fR(7FS)
diff --git a/usr/src/man/man1m/ickey.1m b/usr/src/man/man1m/ickey.1m
index 003dab71d7..10a01df891 100644
--- a/usr/src/man/man1m/ickey.1m
+++ b/usr/src/man/man1m/ickey.1m
@@ -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 ICKEY 1M "May 7, 2003"
+.TH ICKEY 1M "April 9, 2016"
 .SH NAME
 ickey \- install a client key for WAN boot
 .SH SYNOPSIS
@@ -23,7 +23,6 @@ ickey \- install a client key for WAN boot
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBickey\fR command is used to install WAN boot keys on a running UNIX
 system so that they can be used the next time the system is installed. You can
@@ -39,13 +38,12 @@ of data in transit.
 .sp
 .LP
 Keys are expected to be presented as strings of hexadecimal digits; they can
-(but need not) be preceeded by a \fB0x\fR or \fB0X\fR.
+(but need not) be preceded by a \fB0x\fR or \fB0X\fR.
 .sp
 .LP
 The \fBickey\fR command has a single option, described below. An argument of
 the type \fB-o\fR\ \fBtype=\fR\fIkeytype\fR is required.
 .SH OPTIONS
-.sp
 .LP
 The \fBickey\fR command the following option.
 .sp
@@ -58,12 +56,10 @@ Delete the key specified by the \fIkeytype\fR argument.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 On success, \fBickey\fR exits with status 0; if a problem occurs, a diagnostic
 message is printed and \fBickey\fR exits with non-zero status.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/openprom\fR\fR
@@ -73,7 +69,6 @@ WAN boot key storage driver
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -89,6 +84,5 @@ Interface Stability	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBssh\fR(1), \fBopenprom\fR(7D),  \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/ikecert.1m b/usr/src/man/man1m/ikecert.1m
index bba87a4b7a..601cb47f68 100644
--- a/usr/src/man/man1m/ikecert.1m
+++ b/usr/src/man/man1m/ikecert.1m
@@ -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 IKECERT 1M "Jun 10, 2009"
+.TH IKECERT 1M "April 9, 2016"
 .SH NAME
 ikecert \- manipulates the machine's on-filesystem public-key certificate
 databases
@@ -35,7 +35,6 @@ databases
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBikecert\fR command manipulates the machine's on-filesystem public-key
 certificate databases. See the "Files" section, below.
@@ -73,7 +72,6 @@ repository.
 The only supported PKCS#11 library and hardware is the Sun Cryptographic
 Accelerator 4000.
 .SH OPTIONS
-.sp
 .LP
 Except for \fBtokens\fR, each subcommand requires one option, possibly followed
 by one or more option-specific arguments.
@@ -543,7 +541,6 @@ token with \fBikeadm\fR(1M) once \fBin.iked\fR(1M) is running.
 .RE
 
 .SH PARAMETERS
-.sp
 .LP
 The following parameters are supported:
 .sp
@@ -729,7 +726,6 @@ instance.
 .RE
 
 .SH SECURITY
-.sp
 .LP
 This command can save private keys of a public-private key pair into a file.
 Any exposure of a private key may lead to compromise if the key is somehow
@@ -738,7 +734,7 @@ obtained by an adversary.
 .LP
 The PKCS#11 hardware object functionality can address some of the shortcomings
 of on-disk private keys. Because IKE is a system service, user intervention at
-boot is not desireable. The token's PIN, however, is still needed. The PINfor
+boot is not desirable. The token's PIN, however, is still needed. The PIN for
 the PKCS#11 token, therefore, is stored where normally the on-disk
 cryptographic keys would reside. This design decision is deemed acceptable
 because, with a hardware key store, \fBpossession\fR of the key is still
@@ -813,7 +809,6 @@ example# \fB# ikecert certlocal -kc -m 1024 -t rsa-md5 -T vca0-keystore \e
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -837,7 +832,6 @@ An error occurred. Writes an appropriate error message to standard error.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/inet/secret/ike.privatekeys/*\fR\fR
@@ -880,7 +874,6 @@ Consulted for the pathname of a PKCS#11 library.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -896,7 +889,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBikeadm\fR(1M), \fBin.iked\fR(1M), \fBgetdate\fR(3C), \fBike.config\fR(4),
 \fBattributes\fR(5), \fBpkcs11_softtoken\fR(5)
@@ -909,7 +901,6 @@ Code in C\fR. Second Edition. John Wiley & Sons. New York, NY. 1996.
 RSA Labs, PKCS#11 v2.11: \fICryptographic Token Interface Standards\fR,
 November 2001.
 .SH NOTES
-.sp
 .LP
 The following is the validity date and time syntax when the \fB-F\fR or
 \fB-S\fR flags are used:
diff --git a/usr/src/man/man1m/inetadm.1m b/usr/src/man/man1m/inetadm.1m
index 0164a4391e..e172e5e428 100644
--- a/usr/src/man/man1m/inetadm.1m
+++ b/usr/src/man/man1m/inetadm.1m
@@ -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 INETADM 1M "Jul 5, 2007"
+.TH INETADM 1M "April 9, 2016"
 .SH NAME
 inetadm \- observe or configure inetd-controlled services
 .SH SYNOPSIS
@@ -48,7 +48,6 @@ inetadm \- observe or configure inetd-controlled services
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBinetadm\fR utility provides the following capabilities for
 \fBinetd\fR-managed SMF services:
@@ -86,7 +85,6 @@ With no arguments, \fBinetadm\fR lists all services under \fBinetd\fR(1M)
 control, including such attributes as their current run state and whether or
 not they are enabled.
 .SH OPTIONS
-.sp
 .LP
 For options taking one or more FMRI operands (see \fBsmf\fR(5) for a
 description of an FMRI), if the operand specifies a service (instead of a
@@ -94,8 +92,8 @@ service instance), and that service has only a single instance, \fBinetadm\fR
 operates on that instance.
 .sp
 .LP
-If a service name is supplied and it contains more than one instances or a
-pattern is supplied and and it matches more than one instance, a warning
+If a service name is supplied and it contains more than one instance or a
+pattern is supplied and it matches more than one instance, a warning
 message is displayed and that operand is ignored.
 .sp
 .LP
@@ -287,7 +285,6 @@ default  connection_backlog=10
 .in -2
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -319,7 +316,6 @@ Invalid arguments were supplied, such as an ambiguous service FMRI or pattern.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -335,6 +331,5 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBinetd\fR(1M), \fBsvccfg\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5)
diff --git a/usr/src/man/man1m/inetd.1m b/usr/src/man/man1m/inetd.1m
index c51a4aec29..cf01f8c10e 100644
--- a/usr/src/man/man1m/inetd.1m
+++ b/usr/src/man/man1m/inetd.1m
@@ -4,7 +4,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 INETD 1M "Jul 5, 2007"
+.TH INETD 1M "April 9, 2016"
 .SH NAME
 inetd \- Solaris Management Facility delegated restarter for inet services
 .SH SYNOPSIS
@@ -19,7 +19,6 @@ inetd \- Solaris Management Facility delegated restarter for inet services
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBinetd\fR is the delegated restarter for internet services for the Service
 Management Facility (SMF). Its basic responsibilities are to manage service
@@ -66,7 +65,6 @@ configuration changes to Internet services within the SMF repository.
 \fBinetadm\fR has the advantage over \fBsvccfg\fR in that it provides an
 Internet/RPC service context.
 .SS "Service States"
-.sp
 .LP
 As part of its service management duties, \fBinetd\fR implements a state
 machine for each of its managed services. The states in this machine are made
@@ -170,7 +168,7 @@ exit this state.
 .sp .6
 .RS 4n
 A service is in this state because it is either malfunctioning and needs
-adminstrator attention or because an administrator has requested it.
+administrator attention or because an administrator has requested it.
 .sp
 Events constituting malfunctioning include: \fBinetd\fR's inability to listen
 on behalf on any of the service's protocols before exceeding the service's bind
@@ -187,7 +185,6 @@ this state.
 .LP
 Use \fBinetadm\fR(1M) to obtain the current state of a managed service.
 .SS "Service Methods"
-.sp
 .LP
 As part of certain state transitions \fBinetd\fR will execute, if supplied, one
 of a set of methods provided by the service. The set of supported methods are:
@@ -273,7 +270,6 @@ The only compulsory method is the \fBinetd_start\fR method. In the absence of
 any of the others, \fBinetd\fR runs no method but behaves as if one was run
 successfully.
 .SS "Service Properties"
-.sp
 .LP
 Configuration for SMF-managed services is stored in the SMF repository. The
 configuration is made up of the basic configuration of a service, the
@@ -645,7 +641,6 @@ were supplied, except that the \fBkill\fR signal is sent only to the parent
 process of the \fBwait\fR-type service's \fBstart\fR method, not to all members
 of its encompassing process contract (see \fBprocess\fR(4)).
 .SS "Configuring Protocols for Sockets-Based Services"
-.sp
 .LP
 When configuring \fBinetd\fR for a sockets-based service, you have the choice,
 depending on what is supported by the service, of the alternatives described
@@ -688,7 +683,6 @@ entry has \fBtcp\fR and the other has \fBtcp6only\fR, or \fBudp\fR plus
 See EXAMPLES for an example of a configuration of a service that supports both
 IPv4 and IPv6.
 .SS "\fBinetd\fR Methods"
-.sp
 .LP
 \fBinetd\fR provides the methods listed below for consumption by the master
 restarter, \fBsvc.startd\fR(1M).
@@ -770,11 +764,9 @@ if it is in the \fBonline\fR state and a re-binding is not necessary, then the
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 No options are supported.
 .SH OPERANDS
-.sp
 .ne 2
 .na
 \fB\fIconfiguration-file\fR\fR
@@ -825,7 +817,6 @@ online         15:52:10 svc:/network/mysvc:stream6
 See \fBsvcs\fR(1) and \fBinetadm\fR(1M) for descriptions of those commands.
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -841,7 +832,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBfmd\fR(1M), \fBinetadm\fR(1M), \fBinetconv\fR(1M), \fBsvcadm\fR(1M),
 \fBsvccfg\fR(1M), \fBsvcs\fR(1), \fBsvc.startd\fR(1M), \fBsyslog\fR(3C),
@@ -849,7 +839,6 @@ Interface Stability	Evolving
 \fBgetservbyname\fR(3SOCKET), \fBinetd.conf\fR(4), \fBprocess\fR(4),
 \fBsyslog.conf\fR(4), \fBattributes\fR(5), \fBsmf\fR(5), \fBsmf_method\fR(5)
 .SH NOTES
-.sp
 .LP
 The \fBinetd\fR daemon performs the same function as, but is implemented
 significantly differently from, the daemon of the same name in Solaris 9 and
diff --git a/usr/src/man/man1m/ipadm.1m b/usr/src/man/man1m/ipadm.1m
index 1ef5f44174..06e5f87cc2 100644
--- a/usr/src/man/man1m/ipadm.1m
+++ b/usr/src/man/man1m/ipadm.1m
@@ -13,7 +13,7 @@
 .\" Copyright (c) 2013 by Delphix. All rights reserved.
 .\" Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 .\"
-.Dd December 10, 2014
+.Dd April 9, 2016
 .Dt IPADM 1M
 .Os
 .Sh NAME
@@ -185,7 +185,7 @@ The following subcommands are supported:
 .Xc
 Create an IP interface that will handle both IPv4 and IPv6 packets. The
 interface will be enabled as part of the creation process. The IPv4 interface
-will have the address 0.0.0.0. The IPv6 interface will have the adress ::.
+will have the address 0.0.0.0. The IPv6 interface will have the address ::.
 .Bl -tag -width ""
 .It Fl t Ns , Ns Fl -temporary
 Temporary, not persistent across reboots.
diff --git a/usr/src/man/man1m/ipf.1m b/usr/src/man/man1m/ipf.1m
index e61bfba39c..5797e8c28e 100644
--- a/usr/src/man/man1m/ipf.1m
+++ b/usr/src/man/man1m/ipf.1m
@@ -3,7 +3,7 @@
 .\" location.
 .\" Portions Copyright (c) 2009, Sun Microsystems Inc. All Rights Reserved.
 .\" Portions Copyright (c) 2015, Joyent, Inc.
-.TH IPF 1M "Oct 7, 2014"
+.TH IPF 1M "April 9, 2016"
 .SH NAME
 ipf \- alter packet filtering lists for IP packet input and output
 .SH SYNOPSIS
@@ -233,7 +233,7 @@ determining that used to execute options.
 .ad
 .sp .6
 .RS 4n
-To flush entries from the state table, use the \fB-F\fR option in conjuction
+To flush entries from the state table, use the \fB-F\fR option in conjunction
 with either \fBs\fR (removes state information about any non-fully established
 connections) or \fBS\fR (deletes the entire state table). You can specify only
 one of these two options. A fully established connection will show up in
diff --git a/usr/src/man/man1m/ipmpstat.1m b/usr/src/man/man1m/ipmpstat.1m
index f08254a89f..6a9d793c4d 100644
--- a/usr/src/man/man1m/ipmpstat.1m
+++ b/usr/src/man/man1m/ipmpstat.1m
@@ -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 IPMPSTAT 1M "Feb 10, 2009"
+.TH IPMPSTAT 1M "April 9, 2016"
 .SH NAME
 ipmpstat \- display IPMP subsystem status
 .SH SYNOPSIS
@@ -13,19 +13,17 @@ ipmpstat \- display IPMP subsystem status
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBipmpstat\fR command concisely displays information about the IPMP
 subsystem. It supports five different output modes, each of which provides a
 different view of the IPMP subsystem (address, group, interface, probe, and
 target), described below. At most one output mode may be specified per
 invocation, and the displayed information is guaranteed to be self-consistent.
-It also provides a parseable output format which may be used by scripts to
+It also provides a parsable output format which may be used by scripts to
 examine the state of the IPMP subsystem. Only basic privileges are needed to
 invoke \fBipmpstat\fR, with the exception of probe mode which requires all
 privileges.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -109,13 +107,12 @@ Display IPMP target information ("target" output mode).
 .ad
 .sp .6
 .RS 4n
-Display using a machine-parseable format, described below. If this option is
+Display using a machine-parsable format, described below. If this option is
 specified, an explicit list of fields must be specified using the \fB-o\fR
 option.
 .RE
 
 .SH OUTPUT MODES
-.sp
 .LP
 The \fBipmpstat\fR utility supports the output modes listed below. Note that
 these modes map to some of the options described above.
@@ -765,7 +762,6 @@ If \fB-o\fR is not specified, all output fields are displayed.
 .RE
 
 .SH OUTPUT FORMAT
-.sp
 .LP
 By default, \fBipmpstat\fR uses a human-friendly tabular format for its output
 modes, where each row contains one or more fields of information about a given
@@ -778,8 +774,8 @@ displayed as "\fB?\fR" and a diagnostic message will be output to standard
 error.
 .sp
 .LP
-Machine-parseable format also uses a tabular format, but is designed to be
-efficient to programmatically parse. Specifically, machine-parseable format
+Machine-parsable format also uses a tabular format, but is designed to be
+efficient to programmatically parse. Specifically, machine-parsable format
 differs from human-friendly format in the following ways:
 .RS +4
 .TP
@@ -813,7 +809,7 @@ If multiple fields are requested, and a literal \fB:\fR or a backslash
 \fBExample 1 \fRObtaining Failure Detection Time of a Specific Interface
 .sp
 .LP
-The following code uses the machine-parseable output format to create a
+The following code uses the machine-parsable output format to create a
 \fBksh\fR function that outputs the failure detection time of a given IPMP IP
 interface:
 
@@ -830,7 +826,6 @@ interface:
 .sp
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -847,7 +842,7 @@ ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
 Interface Stability	Committed
 _
-Machine-Parseable Format	Committed
+Machine-Parsable Format	Committed
 _
 Human-Friendly Format	Not-an-Interface
 .TE
@@ -856,7 +851,6 @@ Human-Friendly Format	Not-an-Interface
 .LP
 \fB/sbin/ipmpstat\fR is not a Committed interface.
 .SH SEE ALSO
-.sp
 .LP
 \fBif_mpadm\fR(1M), \fBifconfig\fR(1M), \fBin.mpathd\fR(1M),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/ipsecconf.1m b/usr/src/man/man1m/ipsecconf.1m
index 5996a27093..4dd2e355d4 100644
--- a/usr/src/man/man1m/ipsecconf.1m
+++ b/usr/src/man/man1m/ipsecconf.1m
@@ -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 IPSECCONF 1M "Sep 28, 2009"
+.TH IPSECCONF 1M "April 9, 2016"
 .SH NAME
 ipsecconf \- configure system wide IPsec policy
 .SH SYNOPSIS
@@ -48,7 +48,6 @@ ipsecconf \- configure system wide IPsec policy
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBipsecconf\fR utility configures the IPsec policy for a host or for one
 of its tunnels. Once the policy is configured, all outbound and inbound
@@ -122,7 +121,6 @@ svc:/network/ipsec/policy
 See \fBNOTES\fR for more information on managing IPsec security policy and
 \fBSECURITY\fR for issues in securing \fB/etc/inet/ipsecinit.conf\fR.
 .SH OPTIONS
-.sp
 .LP
 \fBipsecconf\fR supports the following options:
 .sp
@@ -280,7 +278,6 @@ Quiet mode. Suppresses the warning message generated when adding policies.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 Each policy entry contains three parts specified as follows:
 .sp
@@ -1095,7 +1092,6 @@ at the end of all the old entries. See .
 A new entry is considered duplicate of the old entry if an old entry matches
 the same traffic pattern as the new entry. See  for information on duplicates.
 .SH SECURITY
-.sp
 .LP
 If, for example, the policy file comes over the wire from an \fBNFS\fR mounted
 file system, an adversary can modify the data contained in the file, thus
@@ -1379,7 +1375,7 @@ all other entries. \fBNULL\fR pattern matches all the traffic.
 .LP
 The following entry on the host with the link local address
 \fBfe80::a00:20ff:fe21:4483\fR specifies that any outbound traffic between the
-hosts wtih IPv6 link-local addresses \fBfe80::a00:20ff:fe21:4483\fR and
+hosts with IPv6 link-local addresses \fBfe80::a00:20ff:fe21:4483\fR and
 \fBfe80::a00:20ff:felf:e346\fR must be encrypted with \fB3DES\fR and \fBMD5.\fR
 
 .sp
@@ -1582,7 +1578,6 @@ C-prefix/24} ipsec {encr_algs aes encr_auth_algs md5}
 .in -2
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/run/ipsecpolicy.conf\fR\fR
@@ -1615,7 +1610,6 @@ Sample input file for \fBipseconf\fR.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1631,7 +1625,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBauths\fR(1), \fBprofiles\fR(1), \fBsvcprop\fR(1), \fBsvcs\fR(1),
 \fBin.iked\fR(1M), \fBinit\fR(1M), \fBifconfig\fR(1M), \fBipsecalgs\fR(1M),
@@ -1676,7 +1669,6 @@ The Internet Society. 1998.
 Frankel, S. and Kelly, R. Glenn, \fIThe AES Cipher Algorithm and Its Use With
 IPsec\fR. 2001.
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fBBad "string" on line \fIN\fR.\fR
@@ -1735,7 +1727,6 @@ new entry.
 .RE
 
 .SH NOTES
-.sp
 .LP
 IPsec manual keys are managed by the service management facility, \fBsmf\fR(5).
 The services listed below manage the components of IPsec. These services are
diff --git a/usr/src/man/man1m/itadm.1m b/usr/src/man/man1m/itadm.1m
index e3017f3ca7..f57fe25f24 100644
--- a/usr/src/man/man1m/itadm.1m
+++ b/usr/src/man/man1m/itadm.1m
@@ -18,7 +18,7 @@
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
 .\" Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 .\"
-.TH ITADM 1M "Mar 27, 2014"
+.TH ITADM 1M "April 9, 2016"
 .SH NAME
 itadm \- administer iSCSI targets
 .SH SYNOPSIS
@@ -163,7 +163,7 @@ example specifications.
 .in -2
 .sp
 
-.SH SUB-COMMANDS
+.SH SUBCOMMANDS
 .LP
 The following are the \fBitadm\fR subcommands with their options.
 .SS "\fBitadm create-target\fR"
diff --git a/usr/src/man/man1m/kdb5_util.1m b/usr/src/man/man1m/kdb5_util.1m
index 344d36be05..6e7a54ffb5 100644
--- a/usr/src/man/man1m/kdb5_util.1m
+++ b/usr/src/man/man1m/kdb5_util.1m
@@ -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 KDB5_UTIL 1M "Oct 29, 2015"
+.TH KDB5_UTIL 1M "April 9, 2016"
 .SH NAME
 kdb5_util \- Kerberos Database maintenance utility
 .SH SYNOPSIS
@@ -15,13 +15,11 @@ kdb5_util \- Kerberos Database maintenance utility
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBkdb5_util\fR utility enables you to create, dump, load, and destroy the
 Kerberos V5 database. You can also use \fBkdb5_util\fR to create a stash file
 containing the Kerberos database master key.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -162,7 +160,6 @@ Directory server connection port.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -311,7 +308,7 @@ be changed.
 .sp .6
 .RS 4n
 Dumps in reverse order. This might recover principals that do not dump
-normally, in cases where database corruption has occured.
+normally, in cases where database corruption has occurred.
 .RE
 
 .sp
@@ -466,7 +463,6 @@ jdb@ACME.COM pak@ACME.COM
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/krb5/principal\fR\fR
@@ -509,7 +505,6 @@ The update log file for incremental propagation.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -525,7 +520,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkpasswd\fR(1), \fBkadmin\fR(1M), \fBkadmind\fR(1M),
 \fBkadmin.local\fR(1M), \fBkdb5_ldap_util\fR(1M), \fBkproplog\fR(1M),
diff --git a/usr/src/man/man1m/kstat.1m b/usr/src/man/man1m/kstat.1m
index ecf696c2b0..8983df7266 100644
--- a/usr/src/man/man1m/kstat.1m
+++ b/usr/src/man/man1m/kstat.1m
@@ -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 KSTAT 1M "Jan 9, 2013"
+.TH KSTAT 1M "April 9, 2016"
 .SH NAME
 kstat \- display kernel statistics
 .SH SYNOPSIS
@@ -22,7 +22,6 @@ kstat \- display kernel statistics
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBkstat\fR utility examines the available kernel statistics, or kstats, on
 the system and reports those statistics which match the criteria specified on
@@ -50,7 +49,6 @@ When invoked without any module operands or options, kstat will match all
 defined statistics on the system. Example invocations are provided below. All
 times are displayed as fractional seconds since system boot.
 .SH OPTIONS
-.sp
 .LP
 The tests specified by the following options are logically ANDed, and all
 matching kstats will be selected. A regular expression containing shell
@@ -67,7 +65,7 @@ enclosed in '/' characters.
 \fB\fB-C\fR\fR
 .ad
 .RS 16n
-Displays output in parseable format with a colon as separator.
+Displays output in parsable format with a colon as separator.
 .RE
 
 .sp
@@ -131,7 +129,7 @@ Displays only kstats that match the specified name.
 \fB\fB-p\fR\fR
 .ad
 .RS 16n
-Displays output in parseable format. All example output in this document is
+Displays output in parsable format. All example output in this document is
 given in this format. If this option is not specified, \fBkstat\fR produces
 output in a human-readable, table format.
 .RE
@@ -167,7 +165,6 @@ format (\fBd\fR) or as an alphanumeric representation of the value returned by
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -206,7 +203,6 @@ The number of reports to be printed.
 .RE
 
 .SH EXAMPLES
-.sp
 .LP
 In the following examples, all the command lines in a block produce the same
 output, as shown immediately below. The exact statistics and values will of
@@ -327,7 +323,6 @@ unix:0:system_misc:avenrun_5min 18
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -367,7 +362,6 @@ A fatal error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/kstat\fR\fR
@@ -377,13 +371,11 @@ kernel statistics driver
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdate\fR(1), \fBsh\fR(1), \fBtime\fR(2), \fBgmatch\fR(3GEN),
 \fBkstat\fR(3KSTAT), \fBattributes\fR(5), \fBregex\fR(5), \fBkstat\fR(7D),
 \fBsd\fR(7D), \fBkstat\fR(9S)
 .SH NOTES
-.sp
 .LP
 If the pattern argument contains glob or RE metacharacters which are also
 shell metacharacters, it will be necessary to enclose the pattern with
diff --git a/usr/src/man/man1m/lofiadm.1m b/usr/src/man/man1m/lofiadm.1m
index 259a269f1c..5eede96b52 100644
--- a/usr/src/man/man1m/lofiadm.1m
+++ b/usr/src/man/man1m/lofiadm.1m
@@ -1,786 +1,620 @@
 '\" te
+.\" Copyright 2016 Toomas Soome <tsoome@me.com>
 .\" Copyright 2013 Nexenta Systems, Inc. All rights reserved.
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
 .\" 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 LOFIADM 1M "Aug 28, 2013"
-.SH NAME
-lofiadm \- administer files available as block devices through lofi
-.SH SYNOPSIS
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-c\fR \fIcrypto_algorithm\fR \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-c\fR \fIcrypto_algorithm\fR \fB-k\fR \fIraw_key_file\fR \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-c\fR \fIcrypto_algorithm\fR \fB-T\fR \fItoken_key\fR \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-c\fR \fIcrypto_algorithm\fR \fB-T\fR \fItoken_key\fR
-     \fB-k\fR \fIwrapped_key_file\fR \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [\fB-r\fR] \fB-c\fR \fIcrypto_algorithm\fR \fB-e\fR \fB-a\fR \fIfile\fR [\fIdevice\fR]
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR \fB-C\fR \fIalgorithm\fR [\fB-s\fR \fIsegment_size\fR] \fIfile\fR
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR \fB-d\fR \fIfile\fR | \fIdevice\fR
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR \fB-U\fR \fIfile\fR
-.fi
-
-.LP
-.nf
-\fBlofiadm\fR [ \fIfile\fR | \fIdevice\fR]
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-\fBlofiadm\fR administers \fBlofi\fR, the loopback file driver. \fBlofi\fR
+.Dd Jun 14, 2016
+.Dt LOFIADM 1M
+.Os
+.Sh NAME
+.Nm lofiadm
+.Nd administer files available as block devices through lofi
+.Sh SYNOPSIS
+.Nm
+.Op Fl r
+.Op Fl l
+.Fl a Ar file Op Ar device
+.Nm
+.Op Fl r
+.Fl c
+.Ar crypto_algorithm
+.Fl a
+.Ar file Op Ar device
+.Nm
+.Op Fl r
+.Fl c Ar crypto_algorithm
+.Fl k Ar raw_key_file
+.Fl a  Ar file Op Ar device
+.Nm
+.Op Fl r
+.Fl c Ar crypto_algorithm
+.Fl T Ar token_key
+.Fl a Ar file Op Ar device
+.Nm
+.Op Fl r
+.Fl c Ar crypto_algorithm
+.Fl T Ar token_key
+.Fl k Ar wrapped_key_file
+.Fl a Ar file Op Ar device
+.Nm
+.Op Fl r
+.Fl c Ar crypto_algorithm
+.Fl e
+.Fl a Ar file Op Ar device
+.Nm
+.Fl C Ar algorithm
+.Op Fl s Ar segment_size
+.Ar file
+.Nm
+.Fl d Ar file Ns | Ns Ar device
+.Nm
+.Fl U Ar file
+.Nm
+.Op Ar file Ns | Ns device
+.Sh DESCRIPTION
+.Nm
+administers
+.Sy lofi ,
+the loopback file driver.
+.Sy lofi
 allows a file to be associated with a block device. That file can then be
 accessed through the block device. This is useful when the file contains an
-image of some filesystem (such as a floppy or \fBCD-ROM\fR image), because the
-block device can then be used with the normal system utilities for mounting,
-checking or repairing filesystems. See \fBfsck\fR(1M) and \fBmount\fR(1M).
-.sp
-.LP
-Use \fBlofiadm\fR to add a file as a loopback device, remove such an
+image of some filesystem (such as a floppy or
+.Sy CD-ROM
+image), because the block device can then be used with the normal system
+utilities for mounting, checking or repairing filesystems. See
+.Xr fsck 1M
+and
+.Xr mount 1M .
+.Pp
+Use
+.Nm
+to add a file as a loopback device, remove such an
 association, or print information about the current associations.
-.sp
-.LP
+.Pp
 Encryption and compression options are mutually exclusive on the command line.
 Further, an encrypted file cannot be compressed later, nor can a compressed
 file be encrypted later.
-
-In the global zone, \fBlofiadm\fR can be used on both the global
+.Pp
+In the global zone,
+.Nm
+can be used on both the global
 zone devices and all devices owned by other non-global zones on the system.
-.sp
-.SH OPTIONS
-.sp
-.LP
+.Ss Labeled Devices
+If the command line flag,
+.Fl l ,
+is used while creating a loopack device,
+.Sy lofi
+will create a labeled loopback
+device, and will generate device links in
+.Pa /dev/{dsk,rdsk}
+directories for partitions or slices.
+.Pp
+Before using these devices, users should create or verify
+partitioning by using partition management tools such as
+.Xr format 1M and
+.Xr fdisk 1M .
+Once the device has been appropriately partitioned, the labeled
+device can be used as normal disk to create and mount file systems and to store
+data.  Mappings created by
+.Nm
+are not permanent and not persisted by the system. If power is lost or the system
+is rebooted, then the mappings will need to be created again.
+.Pp
+The partition table requires space from the mapped file.
+.Sy lofi
+does not support converting previously created unlabeled loopback device images
+to labeled loopback devices. If an unlabeled device is used as a labeled device,
+writing to it will corrupt it.
+.Sh OPTIONS
 The following options are supported:
-.sp
-.ne 2
-.na
-\fB\fB-a\fR \fIfile\fR [\fIdevice\fR]\fR
-.ad
-.sp .6
-.RS 4n
-Add \fIfile\fR as a block device.
-.sp
-If \fIdevice\fR is not specified, an available device is picked.
-.sp
-If \fIdevice\fR is specified, \fBlofiadm\fR attempts to assign it to
-\fIfile\fR. \fIdevice\fR must be available or \fBlofiadm\fR will fail. The
-ability to specify a device is provided for use in scripts that wish to
-reestablish a particular set of associations.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-C\fR {\fIgzip\fR | \fIgzip-N\fR | \fIlzma\fR}\fR
-.ad
-.sp .6
-.RS 4n
+.Bl -tag -width Ds
+.It Fl a Ar file Op Ar device
+Add
+.Sy file
+as a block device.
+.Pp
+If
+.Sy device
+is not specified, an available device is picked.
+.Pp
+If
+.Sy device
+is specified,
+.Nm
+attempts to assign it to
+.Sy file .
+.Sy device
+must be available or
+.Nm
+will fail. The ability to specify a device is provided for use in scripts that
+wish to reestablish a particular set of associations.
+A device may not be specified when using a labeled lofi device.
+.It Fl C Ar {gzip | gzip-N | lzma}
 Compress the file with the specified compression algorithm.
-.sp
-The \fBgzip\fR compression algorithm uses the same compression as the
-open-source \fBgzip\fR command. You can specify the \fBgzip\fR level by using
-the value \fBgzip-\fR\fIN\fR where \fIN\fR is 6 (fast) or 9 (best compression
-ratio). Currently, \fBgzip\fR, without a number, is equivalent to \fBgzip-6\fR
-(which is also the default for the \fBgzip\fR command).
-.sp
-\fIlzma\fR stands for the LZMA (Lempel-Ziv-Markov) compression algorithm.
-.sp
+.Pp
+The
+.Sy gzip
+compression algorithm uses the same compression as the open-source
+.Sy gzip
+command. You can specify the
+.Sy gzip
+level by using the value gzip-\fR\fIN\fR where \fIN\fR is 6 (fast) or 9
+(best compression ratio). Currently,
+.Sy gzip ,
+without a number, is equivalent to
+.Sy gzip-6
+(which is also the default for the
+.Sy gzip
+command).
+.Pp
+.Sy lzma
+stands for the LZMA (Lempel-Ziv-Markov) compression algorithm.
+.Pp
 Note that you cannot write to a compressed file, nor can you mount a compressed
 file read/write.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-d\fR \fIfile\fR | \fIdevice\fR\fR
-.ad
-.sp .6
-.RS 4n
-Remove an association by \fIfile\fR or \fIdevice\fR name, if the associated
-block device is not busy, and deallocates the block device.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-r\fR
-.ad
-.sp .6
-.RS 4n
-If the \fB-r\fR option is specified before the \fB-a\fR option, the
-\fIdevice\fR will be opened read-only.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-s\fR \fIsegment_size\fR\fR
-.ad
-.sp .6
-.RS 4n
-The segment size to use to divide the file being compressed. \fIsegment_size\fR
+.It Fl d Ar file Ns | Ns Ar device
+Remove an association by
+.Sy file
+or
+.Sy device
+name, if the associated block device is not busy, and deallocates the block
+device.
+.It Fl l
+This option should be used with
+.Fl a
+option to create labeled loopback device. If created in local zone, the device
+has to be enabled in zone configuration.
+.It Fl r
+If the
+.Fl r
+option is specified before the
+.Fl a
+option, the
+.Sy device
+will be opened read-only.
+.It Fl s Ar segment_size
+The segment size to use to divide the file being compressed.
+.Sy segment_size
 can be an integer multiple of 512.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-U\fR \fIfile\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl U Ar file
 Uncompress a compressed file.
-.RE
-
-.sp
-.LP
+.El
+.Pp
 The following options are used when the file is encrypted:
-.sp
-.ne 2
-.na
-\fB\fB-c\fR \fIcrypto_algorithm\fR\fR
-.ad
-.sp .6
-.RS 4n
+.Bl -tag -width Ds
+.It Fl c Ar crypto_algorithm
 Select the encryption algorithm. The algorithm must be specified when
 encryption is enabled because the algorithm is not stored in the disk image.
-.sp
-If none of \fB-e\fR, \fB-k\fR, or \fB-T\fR is specified, \fBlofiadm\fR prompts
-for a passphrase, with a minimum length of eight characters, to be entered .
+.Pp
+If none of
+.Fl e ,
+.Fl k ,
+or
+.Fl T
+is specified,
+.Nm
+prompts for a passphrase, with a minimum length of eight characters, to be
+entered.
 The passphrase is used to derive a symmetric encryption key using PKCS#5 PBKD2.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-k\fR \fIraw_key_file\fR | \fIwrapped_key_file\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl k Ar raw_key_file | Ar wrapped_key_file
 Path to raw or wrapped symmetric encryption key. If a PKCS#11 object is also
-given with the \fB-T\fR option, then the key is wrapped by that object. If
-\fB-T\fR is not specified, the key is used raw.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-T\fR \fItoken_key\fR\fR
-.ad
-.sp .6
-.RS 4n
+given with the
+.Fl T
+option, then the key is wrapped by that object. If
+.Fl T
+is not specified, the key is used raw.
+.It Fl T Ar token_key
 The key in a PKCS#11 token to use for the encryption or for unwrapping the key
 file.
-.sp
-If \fB-k\fR is also specified, \fB-T\fR identifies the unwrapping key, which
-must be an RSA private key.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB-e\fR\fR
-.ad
-.sp .6
-.RS 4n
+.Pp
+If
+.Fl k
+is also specified,
+.Fl T
+identifies the unwrapping key, which must be an RSA private key.
+.It Fl e
 Generate an ephemeral symmetric encryption key.
-.RE
-
-.SH OPERANDS
-.sp
-.LP
+.El
+.Sh OPERANDS
 The following operands are supported:
-.sp
-.ne 2
-.na
-\fB\fIcrypto_algorithm\fR\fR
-.ad
-.sp .6
-.RS 4n
-One of: \fBaes-128-cbc\fR, \fBaes-192-cbc\fR, \fBaes-256-cbc\fR,
-\fBdes3-cbc\fR, \fBblowfish-cbc\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIdevice\fR\fR
-.ad
-.sp .6
-.RS 4n
-Display the file name associated with the block device \fIdevice\fR.
-.sp
+.Bl -tag -width Ds
+.It Ar crypto_algorithm
+One of:
+.Sy aes-128-cbc ,
+.Sy aes-192-cbc ,
+.Sy aes-256-cbc ,
+.Sy des3-cbc ,
+.Sy blowfish-cbc .
+.It Ar device
+Display the file name associated with the block device
+.Sy device .
+.Pp
 Without arguments, print a list of the current associations. Filenames must be
 valid absolute pathnames.
-.sp
+.Pp
 When a file is added, it is opened for reading or writing by root. Any
-restrictions apply (such as restricted root access over \fBNFS\fR). The file is
-held open until the association is removed. It is not actually accessed until
-the block device is used, so it will never be written to if the block device is
-only opened read-only.
-
+restrictions apply (such as restricted root access over
+.Sy NFS Ns ).
+The file is held open until the association is removed. It is not actually
+accessed until the block device is used, so it will never be written to if the
+block device is only opened read-only.
+.Pp
 Note that the filename may appear as "?" if it is not possible to resolve the
 path in the current context (for example, if it's an NFS path in a non-global
 zone).
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIfile\fR\fR
-.ad
-.sp .6
-.RS 4n
-Display the block device associated with \fIfile\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIraw_key_file\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Ar file
+Display the block device associated with
+.Sy file .
+.It Ar raw_key_file
 Path to a file of the appropriate length, in bits, to use as a raw symmetric
 encryption key.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fItoken_key\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Ar token_key
 PKCS#11 token object in the format:
-.sp
-.in +2
-.nf
-\fItoken_name\fR:\fImanufacturer_id\fR:\fIserial_number\fR:\fIkey_label\fR
-.fi
-.in -2
-.sp
-
+.Pp
+.Ar token_name Ns : Ns Ar manufacturer_id Ns : Ns Ar serial_number Ns : Ns Ar key_label
+.Pp
 All but the key label are optional and can be empty. For example, to specify a
-token object with only its key label \fBMylofiKey\fR, use:
-.sp
-.in +2
-.nf
--T :::MylofiKey
-.fi
-.in -2
-.sp
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIwrapped_key_file\fR\fR
-.ad
-.sp .6
-.RS 4n
+token object with only its key label
+.Sy MylofiKey ,
+use:
+.Pp
+.Fl T Ar ::: Ns Ar MylofiKey
+.It Ar wrapped_key_file
 Path to file containing a symmetric encryption key wrapped by the RSA private
-key specified by \fB-T\fR.
-.RE
-
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRMounting an Existing CD-ROM Image
-.sp
-.LP
+key specified by
+.Fl T .
+.El
+.Sh ENVIRONMENT
+See
+.Xr environ 5
+for descriptions of the following environment variables
+that affect the execution of
+.Nm
+:
+.Sy LC_CTYPE ,
+.Sy LC_MESSAGES
+and
+.Sy NLSPATH .
+.Sh EXIT STATUS
+The following exit values are returned:
+.Bl -tag -width Ds
+.It Sy 0
+Successful completion.
+.It Sy >0
+An error occurred.
+.El
+.Sh EXAMPLES
+.Bl -tag -width Ds
+.It Sy Example 1 No Mounting an Existing CD-ROM Image
 You should ensure that Solaris understands the image before creating the
-\fBCD\fR. \fBlofi\fR allows you to mount the image and see if it works.
-
-.sp
-.LP
-This example mounts an existing \fBCD-ROM\fR image (\fBsparc.iso\fR), of the
-\fBRed Hat 6.0 CD\fR which was downloaded from the Internet. It was created
-with the \fBmkisofs\fR utility from the Internet.
-
-.sp
-.LP
-Use \fBlofiadm\fR to attach a block device to it:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -a /home/mike_s/RH6.0/sparc.iso\fR
+.Sy CD .
+.Sy lofi
+allows you to mount the image and see if it works.
+.Pp
+This example mounts an existing
+.Sy CD-ROM
+image
+.Pf ( Sy sparc.iso Ns ),
+of the
+.Sy Red Hat 6.0 CD
+which was downloaded from the Internet. It was created
+with the
+.Sy mkisofs
+utility from the Internet.
+.Pp
+Use
+.Nm
+to attach a block device to it:
+.Bd -literal
+# lofiadm -a /home/mike_s/RH6.0/sparc.iso
 /dev/lofi/1
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-\fBlofiadm\fR picks the device and prints the device name to the standard
-output. You can run \fBlofiadm\fR again by issuing the following command:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm\fR
+.Ed
+.Pp
+.Nm
+picks the device and prints the device name to the standard
+output. You can run
+.Nm
+again by issuing the following command:
+.Bd -literal
+# lofiadm
 Block Device     File                           Options
 /dev/lofi/1      /home/mike_s/RH6.0/sparc.iso   -
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Or, you can give it one name and ask for the other, by issuing the following
 command:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm /dev/lofi/1\fR
+.Bd -literal
+# lofiadm /dev/lofi/1
 /home/mike_s/RH6.0/sparc.iso
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-Use the \fBmount\fR command to mount the image:
-
-.sp
-.in +2
-.nf
-# \fBmount -F hsfs -o ro /dev/lofi/1 /mnt\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
+Use the
+.Xr mount 1M
+command to mount the image:
+.Bd -literal
+# mount -F hsfs -o ro /dev/lofi/1 /mnt
+.Ed
+.Pp
 Check to ensure that Solaris understands the image:
-
-.sp
-.in +2
-.nf
-# \fBdf -k /mnt\fR
+.Bd -literal
+# df -k /mnt
 Filesystem            kbytes    used   avail capacity  Mounted on
 /dev/lofi/1           512418  512418       0   100%    /mnt
-# \fBls /mnt\fR
+# ls /mnt
 \&./            RedHat/       doc/          ls-lR         rr_moved/
 \&../           TRANS.TBL     dosutils/     ls-lR.gz      sbin@
 \&.buildlog     bin@          etc@          misc/         tmp/
 COPYING       boot/         images/       mnt/          usr@
 README        boot.cat*     kernels/      modules/
 RPM-PGP-KEY   dev@          lib@          proc/
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Solaris can mount the CD-ROM image, and understand the filenames. The image was
-created properly, and you can now create the \fBCD-ROM\fR with confidence.
-
-.sp
-.LP
+created properly, and you can now create the
+.Sy CD-ROM
+with confidence.
+.Pp
 As a final step, unmount and detach the images:
-
-.sp
-.in +2
-.nf
-# \fBumount /mnt\fR
-# \fBlofiadm -d /dev/lofi/1\fR
-# \fBlofiadm\fR
+.Bd -literal
+# umount /mnt
+# lofiadm -d /dev/lofi/1
+# lofiadm
 Block Device             File             Options
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 2 \fRMounting a Floppy Image
-.sp
-.LP
+.Ed
+.It Sy Example 2 No Mounting a Floppy Image
 This is similar to the first example.
-
-.sp
-.LP
-Using \fBlofi\fR to help you mount files that contain floppy images is helpful
+.Pp
+Using
+.Sy lofi
+to help you mount files that contain floppy images is helpful
 if a floppy disk contains a file that you need, but the machine which you are
 on does not have a floppy drive. It is also helpful if you do not want to take
-the time to use the \fBdd\fR command to copy the image to a floppy.
-
-.sp
-.LP
-This is an example of getting to \fBMDB\fR floppy for Solaris on an x86
-platform:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -a /export/s28/MDB_s28x_wos/latest/boot.3\fR
+the time to use the
+.Sy dd
+command to copy the image to a floppy.
+.Pp
+This is an example of getting to
+.Sy MDB
+floppy for Solaris on an x86 platform:
+.Bd -literal
+# lofiadm -a /export/s28/MDB_s28x_wos/latest/boot.3
 /dev/lofi/1
-# \fBmount -F pcfs /dev/lofi/1 /mnt\fR
-# \fBls /mnt\fR
+# mount -F pcfs /dev/lofi/1 /mnt
+# ls /mnt
 \&./            COMMENT.BAT*  RC.D/         SOLARIS.MAP*
 \&../           IDENT*        REPLACE.BAT*  X/
 APPEND.BAT*   MAKEDIR.BAT*  SOLARIS/
-# \fBumount /mnt\fR
-# \fBlofiadm -d /export/s28/MDB_s28x_wos/latest/boot.3\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 3 \fRMaking a \fBUFS\fR Filesystem on a File
-.sp
-.LP
-Making a \fBUFS\fR filesystem on a file can be useful, particularly if a test
+# umount /mnt
+# lofiadm -d /export/s28/MDB_s28x_wos/latest/boot.3
+.Ed
+.It Sy Example 3 No Making a Sy UFS No Filesystem on a File
+Making a
+.Sy UFS
+filesystem on a file can be useful, particularly if a test
 suite requires a scratch filesystem. It can be painful (or annoying) to have to
 repartition a disk just for the test suite, but you do not have to. You can
-\fBnewfs\fR a file with \fBlofi\fR
-
-.sp
-.LP
+.Sy newfs
+a file with
+.Sy lofi .
+.Pp
 Create the file:
-
-.sp
-.in +2
-.nf
-# \fBmkfile 35m /export/home/test\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-Attach it to a block device. You also get the character device that \fBnewfs\fR
-requires, so \fBnewfs\fR that:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -a /export/home/test\fR
+.Bd -literal
+# mkfile 35m /export/home/test
+.Ed
+.Pp
+Attach it to a block device. You also get the character device that
+.Sy newfs
+requires, so
+.Sy newfs
+that:
+.Bd -literal
+# lofiadm -a /export/home/test
 /dev/lofi/1
-# \fBnewfs /dev/rlofi/1\fR
-newfs: construct a new file system /dev/rlofi/1: (y/n)? \fBy\fR
+# newfs /dev/rlofi/1
+newfs: construct a new file system /dev/rlofi/1: (y/n)? y
 /dev/rlofi/1:   71638 sectors in 119 cylinders of 1 tracks, 602 sectors
         35.0MB in 8 cyl groups (16 c/g, 4.70MB/g, 2240 i/g)
 super-block backups (for fsck -F ufs -o b=#) at:
  32, 9664, 19296, 28928, 38560, 48192, 57824, 67456,
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-Note that \fBufs\fR might not be able to use the entire file. Mount and use the
-filesystem:
-
-.sp
-.in +2
-.nf
-# \fBmount /dev/lofi/1 /mnt\fR
-# \fBdf -k /mnt\fR
+.Ed
+.Pp
+Note that
+.Sy ufs
+might not be able to use the entire file. Mount and use the filesystem:
+.Bd -literal
+# mount /dev/lofi/1 /mnt
+# df -k /mnt
 Filesystem            kbytes    used   avail capacity  Mounted on
 /dev/lofi/1            33455       9   30101     1%    /mnt
-# \fBls /mnt\fR
+# ls /mnt
 \&./           ../          lost+found/
-# \fBumount /mnt\fR
-# \fBlofiadm -d /dev/lofi/1\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 4 \fRCreating a PC (FAT) File System on a Unix File
-.sp
-.LP
-The following series of commands creates a \fBFAT\fR file system on a Unix
-file. The file is associated with a block device created by \fBlofiadm\fR.
-
-.sp
-.in +2
-.nf
-# \fBmkfile 10M /export/test/testfs\fR
-# \fBlofiadm -a /export/test testfs\fR
+# umount /mnt
+# lofiadm -d /dev/lofi/1
+.Ed
+.It Sy Example 4 No Creating a PC (FAT) File System on a Unix File
+The following series of commands creates a
+.Sy FAT
+file system on a Unix file. The file is associated with a block device created by
+.Nm
+.
+.Bd -literal
+# mkfile 10M /export/test/testfs
+# lofiadm -a /export/test testfs
 /dev/lofi/1
-\fBNote use of\fR rlofi\fB, not\fR lofi\fB, in following command.\fR
-# \fBmkfs -F pcfs -o nofdisk,size=20480 /dev/rlofi/1\fR
-\fBConstruct a new FAT file system on /dev/rlofi/1: (y/n)?\fR y
-# \fBmount -F pcfs /dev/lofi/1 /mnt\fR
-# \fBcd /mnt\fR
-# \fBdf -k .\fR
+.Ed
+.Pp
+Note use of
+.Sy rlofi ,
+not
+.Sy lofi ,
+in following command.
+.Bd -literal
+# mkfs -F pcfs -o nofdisk,size=20480 /dev/rlofi/1
+Construct a new FAT file system on /dev/rlofi/1: (y/n)? y
+# mount -F pcfs /dev/lofi/1 /mnt
+# cd /mnt
+# df -k .
 Filesystem            kbytes    used   avail capacity  Mounted on
 /dev/lofi/1            10142       0   10142     0%    /mnt
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 5 \fRCompressing an Existing CD-ROM Image
-.sp
-.LP
+.Ed
+.It Sy Example 5 No Compressing an Existing CD-ROM Image
 The following example illustrates compressing an existing CD-ROM image
-(\fBsolaris.iso\fR), verifying that the image is compressed, and then
-uncompressing it.
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -C gzip /export/home/solaris.iso\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-Use \fBlofiadm\fR to attach a block device to it:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -a /export/home/solaris.iso\fR
+.Pf ( Sy solaris.iso Ns ),
+verifying that the image is compressed, and then uncompressing it.
+.Bd -literal
+# lofiadm -C gzip /export/home/solaris.iso
+.Ed
+.Pp
+Use
+.Nm
+to attach a block device to it:
+.Bd -literal
+# lofiadm -a /export/home/solaris.iso
   /dev/lofi/1
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Check if the mapped image is compressed:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm\fR
+.Bd -literal
+# lofiadm
 Block Device      File                            Options
 /dev/lofi/1       /export/home/solaris.iso        Compressed(gzip)
 /dev/lofi/2       /export/home/regular.iso        -
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Unmap the compressed image and uncompress it:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -d /dev/lofi/1\fR
-# \fBlofiadm -U /export/home/solaris.iso\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 6 \fRCreating an Encrypted UFS File System on a File
-.sp
-.LP
+.Bd -literal
+# lofiadm -d /dev/lofi/1
+# lofiadm -U /export/home/solaris.iso
+.Ed
+.It Sy Example 6 No Creating an Encrypted UFS File System on a File
 This example is similar to the example of making a UFS filesystem on a file,
 above.
-
-.sp
-.LP
+.Pp
 Create the file:
-
-.sp
-.in +2
-.nf
-# \fBmkfile 35m /export/home/test\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Bd -literal
+# mkfile 35m /export/home/test
+.Ed
+.Pp
 Attach the file to a block device and specify that the file image is encrypted.
 As a result of this command, you obtain the character device, which is
-subsequently used by \fBnewfs\fR:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -c aes-256-cbc -a /export/home/secrets\fR
-Enter passphrase: \fBMy-M0th3r;l0v3s_m3+4lw4ys!\fR           (\fBnot echoed\fR)
-Re-enter passphrase: \fBMy-M0th3r;l0v3s_m3+4lw4ys!\fR        (\fBnot echoed\fR)
+subsequently used by
+.Sy newfs :
+.Bd -literal
+# lofiadm -c aes-256-cbc -a /export/home/secrets
+Enter passphrase: My-M0th3r;l0v3s_m3+4lw4ys!           (not echoed)
+Re-enter passphrase: My-M0th3r;l0v3s_m3+4lw4ys!        (not echoed)
 /dev/lofi/1
 
-# \fBnewfs /dev/rlofi/1\fR
-newfs: construct a new file system /dev/rlofi/1: (y/n)? \fBy\fR
+# newfs /dev/rlofi/1
+newfs: construct a new file system /dev/rlofi/1: (y/n)? y
 /dev/rlofi/1:   71638 sectors in 119 cylinders of 1 tracks, 602 sectors
        35.0MB in 8 cyl groups (16 c/g, 4.70MB/g, 2240 i/g)
 super-block backups (for fsck -F ufs -o b=#) at:
 32, 9664, 19296, 28928, 38560, 48192, 57824, 67456,
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 The mapped file system shows that encryption is enabled:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm\fR
+.Bd -literal
+# lofiadm
 Block Device    File                     Options
 /dev/lofi/1     /export/home/secrets     Encrypted
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Mount and use the filesystem:
-
-.sp
-.in +2
-.nf
-# \fBmount /dev/lofi/1 /mnt\fR
-# \fBcp moms_secret_*_recipe /mnt\fR
-# \fBls /mnt\fR
-\&./           moms_secret_cookie_recipe    moms_secret_soup_recipe
-\&../          moms_secret_fudge_recipe     moms_secret_stuffing_recipe
+.Bd -literal
+# mount /dev/lofi/1 /mnt
+# cp moms_secret_*_recipe /mnt
+# ls /mnt
+\&./         moms_secret_cookie_recipe    moms_secret_soup_recipe
+\&../        moms_secret_fudge_recipe     moms_secret_stuffing_recipe
 lost+found/  moms_secret_meatloaf_recipe  moms_secret_waffle_recipe
-# \fBumount /mnt\fR
-# \fBlofiadm -d /dev/lofi/1\fR
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+# umount /mnt
+# lofiadm -d /dev/lofi/1
+.Ed
+.Pp
 Subsequent attempts to map the filesystem with the wrong key or the wrong
 encryption algorithm will fail:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -c blowfish-cbc -a /export/home/secrets\fR
-Enter passphrase: \fBmommy\fR                                (\fInot echoed\fR)
-Re-enter passphrase: \fBmommy\fR                             (\fInot echoed\fR)
+.Bd -literal
+# lofiadm -c blowfish-cbc -a /export/home/secrets\fR
+Enter passphrase: mommy                                (not echoed)
+Re-enter passphrase: mommy                             (not echoed)
 lofiadm: could not map file /root/lofi: Invalid argument
-# \fBlofiadm\fR
+# lofiadm
 Block Device    File                    Options
 #
-.fi
-.in -2
-.sp
-
-.sp
-.LP
+.Ed
+.Pp
 Attempts to map the filesystem without encryption will succeed, however
 attempts to mount and use the filesystem will fail:
-
-.sp
-.in +2
-.nf
-# \fBlofiadm -a /export/home/secrets\fR
+.Bd -literal
+# lofiadm -a /export/home/secrets
 /dev/lofi/1
-# \fBlofiadm\fR
+# lofiadm
 Block Device    File                     Options
 /dev/lofi/1     /export/home/secrets     -
-# \fBmount /dev/lofi/1 /mnt\fR
+# mount /dev/lofi/1 /mnt
 mount: /dev/lofi/1 is not this fstype
 #
-.fi
-.in -2
-.sp
-
-.SH ENVIRONMENT VARIABLES
-.sp
-.LP
-See \fBenviron\fR(5) for descriptions of the following environment variables
-that affect the execution of \fBlofiadm\fR: \fBLC_CTYPE\fR, \fBLC_MESSAGES\fR
-and \fBNLSPATH\fR.
-.SH EXIT STATUS
-.sp
-.LP
-The following exit values are returned:
-.sp
-.ne 2
-.na
-\fB\fB0\fR\fR
-.ad
-.sp .6
-.RS 4n
-Successful completion.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB>0\fR\fR
-.ad
-.sp .6
-.RS 4n
-An error occurred.
-.RE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBfsck\fR(1M), \fBmount\fR(1M), \fBmount_ufs\fR(1M), \fBnewfs\fR(1M),
-\fBattributes\fR(5), \fBlofi\fR(7D), \fBlofs\fR(7FS)
-.SH NOTES
-.sp
-.LP
+.Ed
+.El
+.Sh SEE ALSO
+.Xr fdisk 1M ,
+.Xr format 1M ,
+.Xr fsck 1M ,
+.Xr mount 1M ,
+.Xr mount_ufs 1M ,
+.Xr newfs 1M ,
+.Xr attributes 5 ,
+.Xr lofi 7D ,
+.Xr lofs 7FS
+.Sh NOTES
 Just as you would not directly access a disk device that has mounted file
 systems, you should not access a file associated with a block device except
-through the \fBlofi\fR file driver. It might also be appropriate to ensure that
+through the
+.Sy lofi
+file driver. It might also be appropriate to ensure that
 the file has appropriate permissions to prevent such access.
-.sp
-.LP
-The abilities of \fBlofiadm\fR, and who can use them, are controlled by the
-permissions of \fB/dev/lofictl\fR. Read-access allows query operations, such as
+.Pp
+The abilities of
+.Nm
+, and who can use them, are controlled by the
+permissions of
+.Pa /dev/lofictl .
+Read-access allows query operations, such as
 listing all the associations. Write-access is required to do any state-changing
-operations, like adding an association. As shipped, \fB/dev/lofictl\fR is owned
-by \fBroot\fR, in group \fBsys\fR, and mode \fB0644\fR, so all users can do
-query operations but only root can change anything. The administrator can give
-users write-access, allowing them to add or delete associations, but that is
-very likely a security hole and should probably only be given to a trusted
-group.
-.sp
-.LP
+operations, like adding an association. As shipped,
+.Pa /dev/lofictl
+is owned by
+.Sy root ,
+in group
+.Sy sys ,
+and mode
+.Sy 0644 ,
+so all users can do query operations but only root can change anything.
+The administrator can give users write-access, allowing them to add or
+delete associations, but that is very likely a security hole and should
+probably only be given to a trusted group.
+.Pp
 When mounting a filesystem image, take care to use appropriate mount options.
-In particular, the \fBnosuid\fR mount option might be appropriate for \fBUFS\fR
+In particular, the
+.Sy nosuid
+mount option might be appropriate for
+.Sy UFS
 images whose origin is unknown. Also, some options might not be useful or
-appropriate, like \fBlogging\fR or \fBforcedirectio\fR for \fBUFS\fR. For
-compatibility purposes, a raw device is also exported along with the block
-device. For example, \fBnewfs\fR(1M) requires one.
-.sp
-.LP
-The output of \fBlofiadm\fR (without arguments) might change in future
-releases.
+appropriate, like
+.Sy logging
+or
+.Sy forcedirectio
+for
+.Sy UFS .
+For compatibility purposes, a raw device is also exported along with the block
+device. For example,
+.Xr newfs 1M
+requires one.
+.Pp
+The output of
+.Nm
+(without arguments) might change in future releases.
diff --git a/usr/src/man/man1m/lpadmin.1m b/usr/src/man/man1m/lpadmin.1m
index 1601d9ef0a..7a601e756b 100644
--- a/usr/src/man/man1m/lpadmin.1m
+++ b/usr/src/man/man1m/lpadmin.1m
@@ -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 LPADMIN 1M "May 24, 2006"
+.TH LPADMIN 1M "April 9, 2016"
 .SH NAME
 lpadmin \- configure the LP print service
 .SH SYNOPSIS
@@ -29,14 +29,12 @@ lpadmin \- configure the LP print service
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBlpadmin\fR configures the LP print service by defining printers and devices.
 It is used to add and change printers, to remove printers from service, to set
 or change the system default destination, to define alerts for printer faults,
 and to mount print wheels.
 .SH OPTIONS
-.sp
 .LP
 The \fBlpadmin\fR command has options for:
 .RS +4
@@ -83,7 +81,6 @@ one,two,three
 .in -2
 
 .SS "Adding or Changing a Printer"
-.sp
 .LP
 The first form of the \fBlpadmin\fR command (\fBlpadmin\fR \fB-p\fR
 \fIprinter\fR {\fIoptions\fR}) configures a new printer or changes the
@@ -896,7 +893,6 @@ See the \fB/usr/sfw/man/man1m/smbspool.1m\fR man page for details.
 .RE
 
 .SS "Removing a Printer Destination"
-.sp
 .LP
 The \fB-x\fR \fIdest\fR option removes the destination \fIdest\fR (a printer or
 a class), from the \fBLP\fR print service. If \fIdest\fR is a printer and is
@@ -907,14 +903,12 @@ local printers and the scheduler is still running, the scheduler is shut down.
 .LP
 No other \fIoptions\fR are allowed with \fB-x\fR.
 .SS "Setting/Changing the System Default Destination"
-.sp
 .LP
 The \fB-d\fR [\fIdest\fR] option makes \fIdest\fR (an existing printer or
 class) the new system default destination. If \fIdest\fR is not supplied, then
 there is no system default destination. No other \fIoptions\fR are allowed with
 \fB-d\fR.
 .SS "Setting an Alert for a Print Wheel"
-.sp
 .ne 2
 .na
 \fB\fB-S\fR \fIprint-wheel\fR [\fB-A\fR \fIalert-type\fR] [\fB-W\fR
@@ -1035,7 +1029,6 @@ anyone submits a print request for the print wheel when it is not mounted.
 .RE
 
 .SH PREDEFINED OPTIONS USED WITH THE \fB-o\fR OPTION
-.sp
 .LP
 A number of options, described below, are predefined for use with \fB-o\fR.
 These options are used for adjusting printer capabilities, adjusting printer
@@ -1043,7 +1036,6 @@ port characteristics, configuring network printers, and controlling the use of
 banner. The \fB-o\fR also supports an arbitrary \fB\fIkeyword\fR=\fIvalue\fR\fR
 format, which is referred to below as an undefined option.
 .SS "Adjusting Printer Capabilities"
-.sp
 .LP
 The \fBlength\fR, \fBwidth\fR, \fBcpi\fR, and \fBlpi\fR parameters can be used
 in conjunction with the \fB-o\fR option to adjust printer capabilities. The
@@ -1090,7 +1082,6 @@ lpadmin -p \fIprintername\fR -o lpi=\fR
 .sp
 
 .SS "Adjusting Printer Port Characteristics"
-.sp
 .LP
 You use the \fBstty\fR keyword in conjunction with the o option to adjust
 printer port characteristics. The general form of the \fBstty\fR portion of the
@@ -1135,7 +1126,6 @@ The default can be reset by:
 .sp
 
 .SS "Configuring Network Printers"
-.sp
 .LP
 The \fBdest\fR, \fBprotocol\fR, \fBbsdctrl\fR, and \fBtimeout\fR parameters are
 used in conjunction with the \fB-o\fR option to configure network printers. The
@@ -1179,7 +1169,6 @@ lpadmin -p \fIprintername\fR -o timeout=
 .sp
 
 .SS "Controlling the Use of the Banner Page"
-.sp
 .LP
 Use the following commands to control the use of the banner page:
 .sp
@@ -1211,7 +1200,6 @@ The fourth command (\fB-o\fR \fBbanner=never\fR) causes a banner page never to
 be printed, even if a user specifies \fBlp\fR \fB-o\fR \fBbanner\fR. The root
 user can override this command.
 .SS "Undefined Options"
-.sp
 .LP
 The \fB-o\fR option supports the use of arbitrary, user-defined options with
 the following format:
@@ -1249,7 +1237,6 @@ Sets boolean values \fBfoo=true | foo=false\fR.
 .RE
 
 .SH EXAMPLES
-.sp
 .LP
 In the following examples, \fIprtr\fR can be any name up to 14 characters and
 can be the same name as the \fBping\fR(1M) name.
@@ -1291,7 +1278,6 @@ example# \fBaccept \fIprtr\fR\fR
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -1313,7 +1299,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/spool/lp/*\fR\fR
@@ -1350,7 +1335,6 @@ System printer configuration database
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1366,7 +1350,6 @@ Interface Stability	Obsolete
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBenable\fR(1), \fBlp\fR(1), \fBlpstat\fR(1), \fBmail\fR(1), \fBstty\fR(1),
 \fBaccept\fR(1M), \fBlpforms\fR(1M), \fBlpsched\fR(1M), \fBlpsystem\fR(1M),
@@ -1375,7 +1358,6 @@ Interface Stability	Obsolete
 .LP
 \fI\fR
 .SH NOTES
-.sp
 .LP
 When using lpadmin to provide access to a remote printer, remote configuration
 data is stored in \fB/etc/printers.conf\fR. This data includes a \fBbsdaddr\fR
@@ -1385,5 +1367,5 @@ systems. If the data is shared, it is important to make sure that the
 \fBbsdaddr\fR and \fBprinter-uri-supported\fR contain hostname information that
 is correctly resolved on all hosts sharing this data. Also, the
 \fBprinter-uri-supported\fR is the preferred means of accessing remote print
-service. The \fBbsdaddr\fR is supplied for backward compatability with Solaris
+service. The \fBbsdaddr\fR is supplied for backward compatibility with Solaris
 2.6-10 systems.
diff --git a/usr/src/man/man1m/metaset.1m b/usr/src/man/man1m/metaset.1m
index c9d1b81d16..98e9613bca 100644
--- a/usr/src/man/man1m/metaset.1m
+++ b/usr/src/man/man1m/metaset.1m
@@ -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 METASET 1M "Mar 4, 2009"
+.TH METASET 1M "April 9, 2016"
 .SH NAME
 metaset \- configure disk sets
 .SH SYNOPSIS
@@ -94,7 +94,6 @@ metaset \- configure disk sets
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBmetaset\fR command administers sets of disks in named disk sets. Named
 disk sets include any disk set that is not in the local set. While disk sets
@@ -200,14 +199,12 @@ convention:
 where \fIsetname\fR is the name of the disk set, and \fIhot_spare_pool\fR is
 the name of the hot spare pool associated with the disk set.
 .SS "Multi-node Environment"
-.sp
 .LP
 To create and work with a disk set in a multi\(emnode environment, \fBroot\fR
 must be a member of Group 14 on all hosts, or the \fB/.rhosts\fR file must
 contain an entry for all other host names. This is not required in a SunCluster
-3.x enviroment.
+3.x environment.
 .SS "Tagged data"
-.sp
 .LP
 Tagged data occurs when there are different versions of a disk set's replicas.
 This tagged data consists of the set owner's nodename, the hardware serial
@@ -236,7 +233,6 @@ take. An error message is displayed, and user intervention is required.
 Use the \fB-q\fR to query the disk set and the \fB-t\fR, \fB-u\fR, and
 \fB-y\fR, options to select the tag and take the disk set. See \fBOPTIONS\fR.
 .SS "Mediator Configuration"
-.sp
 .LP
 SVM provides support for a low-end HA solution consisting of two hosts that
 share only two strings of drives. The hosts in this type of configuration,
@@ -254,7 +250,6 @@ data accessible. See \fBmediator\fR(7D) for further details.
 .LP
 Use the \fB-m\fR option to add or delete a mediator host. See \fBOPTIONS\fR.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -827,7 +822,6 @@ additional hosts added later. The last host cannot be deleted until all of the
 drives within the set have been deleted.
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/lvm/md.tab\fR\fR
@@ -838,7 +832,6 @@ Contains list of metadevice configurations.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -862,7 +855,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -878,7 +870,6 @@ Interface Stability	Stable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBmdmonitord\fR(1M), \fBmetaclear\fR(1M), \fBmetadb\fR(1M),
 \fBmetadetach\fR(1M), \fBmetahs\fR(1M), \fBmetainit\fR(1M),
@@ -891,7 +882,6 @@ Interface Stability	Stable
 .LP
 \fI\fR
 .SH NOTES
-.sp
 .LP
 Disk set administration, including the addition and deletion of hosts and
 drives, requires all hosts in the set to be accessible from the network.
diff --git a/usr/src/man/man1m/mount_nfs.1m b/usr/src/man/man1m/mount_nfs.1m
index 63ce0d4805..1eeb435310 100644
--- a/usr/src/man/man1m/mount_nfs.1m
+++ b/usr/src/man/man1m/mount_nfs.1m
@@ -5,7 +5,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 MOUNT_NFS 1M "Mar 13, 2016"
+.TH MOUNT_NFS 1M "April 9, 2016"
 .SH NAME
 mount_nfs \- mount remote NFS resources
 .SH SYNOPSIS
@@ -286,7 +286,7 @@ the client. When a file is opened the client sends a request to the server to
 validate the client's local caches. This behavior ensures a file's consistency
 across multiple NFS clients. When \fB-nocto\fR is in effect, the client does
 not perform the flush on close and the request for validation, allowing the
-possiblity of differences among copies of the same file as stored on multiple
+possibility of differences among copies of the same file as stored on multiple
 clients.
 .sp
 This option can be used where it can be guaranteed that accesses to a specified
diff --git a/usr/src/man/man1m/ndmpadm.1m b/usr/src/man/man1m/ndmpadm.1m
index 287c8f8c44..04c3947f4d 100644
--- a/usr/src/man/man1m/ndmpadm.1m
+++ b/usr/src/man/man1m/ndmpadm.1m
@@ -4,7 +4,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 NDMPADM 1M "Dec 11, 2015"
+.TH NDMPADM 1M "April 9, 2016"
 .SH NAME
 ndmpadm \- administer Network Data Management Protocol activities
 .SH SYNOPSIS
@@ -107,7 +107,7 @@ The following option is supported:
 Display a list of all subcommands and options.
 .RE
 
-.SH SUB-COMMANDS
+.SH SUBCOMMANDS
 .LP
 The \fBndmpadm\fR command supports the subcommands described below.
 .SS "\fBdisable\fR Subcommand"
diff --git a/usr/src/man/man1m/pkgadd.1m b/usr/src/man/man1m/pkgadd.1m
index 2bae037332..29a7d3ae08 100644
--- a/usr/src/man/man1m/pkgadd.1m
+++ b/usr/src/man/man1m/pkgadd.1m
@@ -4,7 +4,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 PKGADD 1M "Oct 30, 2007"
+.TH PKGADD 1M "April 9, 2016"
 .SH NAME
 pkgadd \- transfer software packages to the system
 .SH SYNOPSIS
@@ -24,7 +24,6 @@ pkgadd \- transfer software packages to the system
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBpkgadd\fR transfers the contents of a software package from the distribution
 medium or directory to install it onto the system. Used without the \fB-d\fR
@@ -35,7 +34,7 @@ option, it writes the package to a spool directory instead of installing it.
 .LP
 The \fBpkgadd\fR utility requires an amount of temporary space the size of the
 package that is being installed. \fBpkgadd\fR determines which temporary
-directory to use by checking for the existance of the \fB$TMPDIR\fR environment
+directory to use by checking for the existence of the \fB$TMPDIR\fR environment
 variable. If \fB$TMPDIR\fR is not defined, \fBpkgadd\fR uses \fBP_tmpdir\fR
 from \fBstdio.h\fR. \fBP_tmpdir\fR has a default of \fB/var/tmp/\fR.
 .sp
@@ -83,7 +82,6 @@ datastream of  up to 4 GB.
 The \fB-d\fR, \fB-Y\fR, and \fIpkginst\fR arguments shown in the SYNOPSIS are
 described under OPERANDS, following OPTIONS.
 .SH OPTIONS
-.sp
 .LP
 The supported options are described as follows. The \fB-d\fR \fIdevice\fR
 source specifier is described under OPERANDS, below.
@@ -257,11 +255,9 @@ for more information on alternate methods of specifying a default proxy.
 When executed without options or operands, \fBpkgadd\fR uses
 \fB/var/spool/pkg\fR (the default spool directory).
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .SS "Sources"
-.sp
 .LP
 By default, pkgadd looks in the \fB/var/spool/pkg\fR directory when searching
 for instances of a package to install or spool. Optionally, the source for the
@@ -312,7 +308,6 @@ comma-separated list of package names or the keyword \fBall\fR.
 .RE
 
 .SS "Instances"
-.sp
 .LP
 By default, \fBpkgadd\fR searches the specified source, and presents an
 interactive menu allowing the user to select which package instances found on
@@ -348,7 +343,6 @@ installation or spooling.
 .RE
 
 .SH KEYSTORE LOCATIONS
-.sp
 .LP
 Package and tools such as \fBpkgadd\fR use a set of trusted certificates to
 perform signature validation on any signatures found within the packages. If
@@ -401,7 +395,6 @@ the following locations are successively searched to find the trust store:
 This searching order enables administrators to have a single location for most
 applications, and special certificate locations for certain applications.
 .SH KEYSTORE AND CERTIFICATE FORMATS
-.sp
 .LP
 The packaging utilities, such as \fBpkgtrans\fR, require access to a set of
 keys and certificates in order to sign, and optionally verify, packages.
@@ -424,7 +417,6 @@ and keys into a PKCS#12 keystore. For example, a trusted certificate can be
 exported from Mozilla, and then imported into a PKCS#12 keystore for use with
 \fBpkgadd\fR with the OpenSSL Toolkit.
 .SH PASS PHRASE ARGUMENTS
-.sp
 .LP
 \fBpkgtrans\fR and \fBpkgadd\fR accept password arguments, typically using
 \fB-p\fR to specify the password. These allow the password to be obtained from
@@ -517,7 +509,6 @@ The keyword \fBall\fR specifies that all of the packages found in the
 designated datastream will be installed.
 
 .SH EXIT STATUS
-.sp
 .ne 2
 .na
 \fB\fB0\fR\fR
@@ -598,7 +589,6 @@ Reboot after installation of this package.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .ne 2
 .na
 \fB\fBHTTPPROXY\fR\fR
@@ -632,7 +622,6 @@ setting.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/sadm/install/logs/\fR\fR
@@ -643,7 +632,6 @@ Location where \fBpkgadd\fR logs an instance of software installation.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -659,7 +647,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpkginfo\fR(1), \fBpkgmk\fR(1), \fBpkgparam\fR(1), \fBpkgproto\fR(1),
 \fBpkgtrans\fR(1), \fBinstallf\fR(1M), \fBpkgadm\fR(1M), \fBpkgask\fR(1M),
@@ -672,7 +659,6 @@ Interface Stability	Evolving
 .LP
 \fBhttp://www.openssl.org\fR
 .SH NOTES
-.sp
 .LP
 When transferring a package to a spool directory, the \fB-r\fR, \fB-n\fR, and
 \fB-a\fR options cannot be used.
diff --git a/usr/src/man/man1m/prtfru.1m b/usr/src/man/man1m/prtfru.1m
index e51133385d..fc59f0a4cb 100644
--- a/usr/src/man/man1m/prtfru.1m
+++ b/usr/src/man/man1m/prtfru.1m
@@ -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 PRTFRU 1M "May 30, 2002"
+.TH PRTFRU 1M "April 9, 2016"
 .SH NAME
 prtfru \- print FRUID-specific information about the FRUs on a system or domain
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ prtfru \- print FRUID-specific information about the FRUs on a system or domain
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBprtfru\fR utility is used to obtain \fBFRUID\fR data from the system or
 domain. Its output is that of a tree structure echoing the path in the
@@ -26,7 +25,6 @@ well.
 of the \fBFRUID\fR container data. \fBprtfru\fR prints to stdout which may be
 redirected to a file.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -73,9 +71,8 @@ Prints in \fBXML\fR format with a system identifier (SYSTEM) of
 Options \fB-c\fR and \fB-l\fR can be used together to obtain a list of the
 containers.
 .SH OPERANDS
-.sp
 .LP
-The folowing operand is supported:
+The following operand is supported:
 .sp
 .ne 2
 .na
@@ -87,7 +84,6 @@ the name or path/name of a container as displayed in the \fB-l\fR option.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -109,6 +105,5 @@ An error has occurred.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBfruadm\fR(1M), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/psradm.1m b/usr/src/man/man1m/psradm.1m
index 917e715b27..9f7113757b 100644
--- a/usr/src/man/man1m/psradm.1m
+++ b/usr/src/man/man1m/psradm.1m
@@ -4,7 +4,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 PSRADM 1M "Feb 25, 2008"
+.TH PSRADM 1M "April 9, 2016"
 .SH NAME
 psradm \- change processor operational status
 .SH SYNOPSIS
@@ -19,7 +19,6 @@ psradm \- change processor operational status
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpsradm\fR utility changes the operational status of processors. The
 legal states for the processor are \fBon-line\fR, \fBoff-line\fR, \fBspare\fR,
@@ -75,7 +74,6 @@ one or more processors.
 Only users with the \fBPRIV_SYS_RES_CONFIG\fR privilege can use the
 \fBpsradm\fR utility.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -148,7 +146,6 @@ Output a message giving the results of each attempted operation.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -237,7 +234,6 @@ processor bindings from the processes bound to them:
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -259,7 +255,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/wtmpx\fR\fR
@@ -269,12 +264,10 @@ Records logging processor status changes
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpbind\fR(1M), \fBpsrinfo\fR(1M), \fBpsrset\fR(1M), \fBp_online\fR(2),
 \fBprocessor_bind\fR(2), \fBattributes\fR(5)
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fB\fBpsradm: processor 4: Invalid argument\fR\fR
@@ -304,7 +297,7 @@ needed by the system because it provides some essential service.
 .sp .6
 .RS 4n
 The specified processor could not be set \fBno-intr\fR because it is the last
-interruptible processor in the system, or or it is the only processor in the
+interruptible processor in the system, or it is the only processor in the
 system that can service interrupts needed by the system.
 .RE
 
diff --git a/usr/src/man/man1m/route.1m b/usr/src/man/man1m/route.1m
index 711eea3637..60cbf3f1ae 100644
--- a/usr/src/man/man1m/route.1m
+++ b/usr/src/man/man1m/route.1m
@@ -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 ROUTE 1M "Feb 3, 2009"
+.TH ROUTE 1M "April 9, 2016"
 .SH NAME
 route \- manually manipulate the routing tables
 .SH SYNOPSIS
@@ -40,7 +40,6 @@ route \- manually manipulate the routing tables
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBroute\fR manually manipulates the network routing tables. These tables are
 normally maintained by the system routing daemon, such as \fBin.routed\fR(1M)
@@ -57,15 +56,14 @@ of the programmatic interface discussed in \fBroute\fR(7P).
 can modify routing tables, the \fBRTM_GET\fR operation is allowed for
 non-privileged users.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-f\fR\fR
 .ad
 .RS 15n
 Flush the routing tables of all gateway entries. If you use the \fB-f\fR option
-in conjunction with any of the \fBroute\fR sub-commands, \fBroute\fR flushes
-the gateways before performing the sub-command. Specify the table to flush by
+in conjunction with any of the \fBroute\fR subcommands, \fBroute\fR flushes
+the gateways before performing the subcommand. Specify the table to flush by
 placing the \fBinet\fR or \fBinet6\fR modifier immediately after the \fB-f\fR
 option. If unspecified, flushing IPv4 (\fBinet\fR) routes is the default.
 .RE
@@ -131,7 +129,6 @@ Print additional details in verbose mode.
 .RE
 
 .SS "Subcommands"
-.sp
 .LP
 The following subcommands are supported:
 .sp
@@ -201,7 +198,7 @@ conjunction with the \fB-p\fR option.
 
 .sp
 .LP
-The \fBadd\fR and \fBdelete\fR sub-commands have the following syntax:
+The \fBadd\fR and \fBdelete\fR subcommands have the following syntax:
 .sp
 .in +2
 .nf
@@ -218,7 +215,7 @@ through which packets should be routed. Modifiers described in \fBOPERANDS\fR
 can be placed anywhere on the command line.
 .sp
 .LP
-The \fBget\fR and \fBchange\fR sub-commands have the following syntax:
+The \fBget\fR and \fBchange\fR subcommands have the following syntax:
 .sp
 .in +2
 .nf
@@ -235,7 +232,7 @@ through which packets should be routed. Modifiers described in \fBOPERANDS\fR
 can be placed anywhere on the command line.
 .sp
 .LP
-The \fBmonitor\fR sub-command has the following syntax:
+The \fBmonitor\fR subcommand has the following syntax:
 .sp
 .in +2
 .nf
@@ -245,12 +242,10 @@ route monitor [ -inet | -inet6 ]
 .sp
 
 .SH OPERANDS
-.sp
 .LP
-\fBroute\fR executes its sub-commands on routes to destinations by way of
+\fBroute\fR executes its subcommands on routes to destinations by way of
 gateways.
 .SS "Destinations and Gateways"
-.sp
 .LP
 By default, destination and gateway addresses are interpreted as IPv4
 addresses. All symbolic names are tried first as a host name, using
@@ -259,7 +254,7 @@ addresses. All symbolic names are tried first as a host name, using
 .sp
 .LP
 Including an optional modifier on the command line before the address changes
-how the \fBroute\fR sub-command interprets it.
+how the \fBroute\fR subcommand interprets it.
 .sp
 .LP
 The following modifiers are supported:
@@ -448,7 +443,6 @@ multipathing) group, then requests to add a route will automatically be
 translated to the corresponding IPMP IP interface, and requests to delete or
 change a route on an underlying interface will fail.
 .SS "Routing Flags"
-.sp
 .LP
 Routes have associated flags that influence operation of the protocols when
 sending to destinations matched by the routes. These flags can be set (and in
@@ -603,7 +597,6 @@ sensitivity label.
 .RE
 
 .SS "Compatibility"
-.sp
 .LP
 The modifiers \fBhost\fR and \fBnet\fR are taken to be equivalent to
 \fB-\fR\fBhost\fR and \fB-net\fR\fB\fR. To specify a symbolic address that
@@ -630,7 +623,6 @@ _
 The \fB\fR\fB-ifa\fR \fBhostname\fR modifier is also accepted, but has no
 effect.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/defaultrouter\fR\fR
@@ -658,7 +650,6 @@ List of network names and addresses
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBuname\fR(1), \fBin.ripngd\fR(1M), \fBin.routed\fR(1M), \fBnetstat\fR(1M),
 \fBrouted\fR(1M), \fBioctl\fR(2), \fBgetipnodebyname\fR(3SOCKET),
@@ -666,7 +657,6 @@ List of network names and addresses
 \fBhosts\fR(4), \fBnetworks\fR(4), \fBattributes\fR(5), \fBARP\fR(7P),
 \fBip\fR(7P), \fBroute\fR(7P), \fBrouting\fR(7P)
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fB\fBadd\fR [ \fBhost\fR\||\ \fBnetwork\|]\fR \fIdestination\fR:\fIgateway\fR
@@ -704,7 +694,7 @@ As \fBadd\fR, but when deleting or changing an entry.
 .ad
 .sp .6
 .RS 4n
-When the \fB-f\fR flag is specified, or the \fBflush\fR sub-command is used,
+When the \fB-f\fR flag is specified, or the \fBflush\fR subcommand is used,
 each routing table entry deleted is indicated with a message of this form.
 .RE
 
@@ -763,7 +753,6 @@ process does not have appropriate privileges.
 .RE
 
 .SH NOTES
-.sp
 .LP
 Specifying that destinations are local (with the \fB-interface\fRmodifier)
 assumes that the routers implement \fBproxy ARP\fR, meaning that they respond
diff --git a/usr/src/man/man1m/routeadm.1m b/usr/src/man/man1m/routeadm.1m
index 04bdc4eefe..66e43c8177 100644
--- a/usr/src/man/man1m/routeadm.1m
+++ b/usr/src/man/man1m/routeadm.1m
@@ -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 ROUTEADM 1M "Jul 18, 2007"
+.TH ROUTEADM 1M "April 9, 2016"
 .SH NAME
 routeadm \- IP forwarding and routing configuration
 .SH SYNOPSIS
@@ -34,7 +34,6 @@ routeadm \- IP forwarding and routing configuration
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBrouteadm\fR command is used to administer system-wide configuration for
 IP forwarding and routing. IP forwarding is the passing of IP packets from one
@@ -80,7 +79,6 @@ service as appropriate. This conversion process occurs when you issue an enable
 .LP
 The first usage, in the SYNOPSIS above, reports the current configuration.
 .SH OPTIONS
-.sp
 .LP
 The following command-line options are supported:
 .sp
@@ -90,7 +88,7 @@ The following command-line options are supported:
 .ad
 .sp .6
 .RS 4n
-Print the configuration in parseable format. If \fIoption\fR is specified, only
+Print the configuration in parsable format. If \fIoption\fR is specified, only
 the configuration for the specified option or variable is displayed.
 .RE
 
@@ -501,7 +499,6 @@ See \fBin.routed\fR(1M) for details of property names and how they relate to
 daemon behavior.
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -523,7 +520,6 @@ An error occurred while obtaining or modifying the system configuration.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/inet/routing.conf\fR\fR
@@ -533,7 +529,6 @@ Parameters for IP forwarding and routing. (Not to be edited.)
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -549,7 +544,6 @@ Interface Stability	Stable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBifconfig\fR(1M), \fBin.routed\fR(1M), \fBsvcadm\fR(1M), \fBgateways\fR(4),
 \fBattributes\fR(5), \fBsmf\fR(5)
diff --git a/usr/src/man/man1m/sasinfo.1m b/usr/src/man/man1m/sasinfo.1m
index 739d98ee84..3098e2b84d 100644
--- a/usr/src/man/man1m/sasinfo.1m
+++ b/usr/src/man/man1m/sasinfo.1m
@@ -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 SASINFO 1M "Jul 10, 2009"
+.TH SASINFO 1M "April 9, 2016"
 .SH NAME
 sasinfo \- Serial Attached SCSI HBA port command line interface
 .SH SYNOPSIS
@@ -43,7 +43,6 @@ sasinfo \- Serial Attached SCSI HBA port command line interface
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsasinfo\fR utility is a command line interface that collects
 administrative information on Serial Attached SCSI-2 (SAS-2) host bus adapter
@@ -53,8 +52,7 @@ that might be connected to those HBA ports.
 .sp
 .LP
 \fBsasinfo\fR is implemented as a set of subcommands, described below.
-.SH SUB-COMMANDS
-.sp
+.SH SUBCOMMANDS
 .LP
 The following subcommands are supported by \fBsasinfo\fR.
 .sp
@@ -120,7 +118,6 @@ including the SAS Management Protocol (SMP) target port.
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 The following options are supported.
 .sp
@@ -717,7 +714,6 @@ OS Device Name: /dev/rdsk/c4t50020F230000B4AFd0s2
 .sp
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -733,6 +729,5 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/sbdadm.1m b/usr/src/man/man1m/sbdadm.1m
index 10468d5f97..5445dff56f 100644
--- a/usr/src/man/man1m/sbdadm.1m
+++ b/usr/src/man/man1m/sbdadm.1m
@@ -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 SBDADM 1M "Aug 20, 2009"
+.TH SBDADM 1M "April 9, 2016"
 .SH NAME
 sbdadm \- SCSI Block Disk command line interface
 .SH SYNOPSIS
@@ -33,12 +33,10 @@ sbdadm \- SCSI Block Disk command line interface
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsbdadm\fR command creates and manages SCSI-block-device-based logical
 units that are registered with the SCSI Target Mode Framework (STMF).
-.SH SUB-COMMANDS
-.sp
+.SH SUBCOMMANDS
 .LP
 The \fBsbdadm\fR command supports the subcommands listed below. Note that if
 you enter a question mark as an argument to the command (\fBsbdadm ?\fR),
@@ -169,7 +167,6 @@ The size specified can exceed the size of the file or device represented by
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 \fBsbdadm\fR use the following operands:
 .sp
@@ -230,7 +227,6 @@ Found 2 LU(s)
 .sp
 
 .SH EXIT STATUS
-.sp
 .ne 2
 .na
 \fB\fB0\fR\fR
@@ -251,7 +247,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -267,6 +262,5 @@ Interface Stability	Obsolete Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBstmfadm\fR(1M), \fBattributes\fR(5)
diff --git a/usr/src/man/man1m/sendmail.1m b/usr/src/man/man1m/sendmail.1m
index 8fbf6c870b..45945aa83e 100644
--- a/usr/src/man/man1m/sendmail.1m
+++ b/usr/src/man/man1m/sendmail.1m
@@ -6,7 +6,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 SENDMAIL 1M "Feb 25, 2009"
+.TH SENDMAIL 1M "April 9, 2016"
 .SH NAME
 sendmail \- send mail over the internet
 .SH SYNOPSIS
@@ -23,7 +23,6 @@ sendmail \- send mail over the internet
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsendmail\fR utility sends a message to one or more people, routing the
 message over whatever networks are necessary. \fBsendmail\fR does internetwork
@@ -60,7 +59,6 @@ If a message is found to be undeliverable, it is returned to the sender with
 diagnostics that indicate the location and nature of the failure; or, the
 message is placed in a \fBdead.letter\fR file in the sender's home directory.
 .SS "Service Management"
-.sp
 .LP
 The \fBsendmail\fR service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifiers:
@@ -114,7 +112,6 @@ For the last two, note the difference, as the latter has the \fB":sendmail"\fR
 instance specification, whereas the former does not, thus representing the more
 general service.
 .SS "Enabling Access to Remote Clients"
-.sp
 .LP
 On an unmodified system, access to \fBsendmail\fR by remote clients is enabled
 and disabled through the service management facility (see \fBsmf\fR(5)). In
@@ -154,12 +151,10 @@ Note, however, on a system where any of the \fBsendmail\fR(4) files have been
 customized, setting this property might not have the intended effect. See
 \fBsendmail\fR(4) for details.
 .SS "Automated Rebuilding of Configuration Files"
-.sp
 .LP
 See \fBsendmail\fR(4) for details on which service properties can be set to
 automate (re)building of configuration files when the service is started.
 .SS "Restricting Host Access"
-.sp
 .LP
 \fBsendmail\fR uses TCP Wrappers to restrict access to hosts. It uses the
 service name of \fBsendmail\fR for \fBhosts_access()\fR. For more information
@@ -167,7 +162,6 @@ on TCP Wrappers, see \fBtcpd\fR(1M) and \fBhosts_access\fR(4) in the
 \fBSUNWtcpd\fR package. \fBtcpd\fR(1M) and \fBhosts_access\fR(4) are not part
 of the Solaris man pages.
 .SS "Startup Options"
-.sp
 .LP
 The \fB/etc/default/sendmail\fR file stores startup options for \fBsendmail\fR
 so that the options are not removed when a host is upgraded. See also
@@ -271,12 +265,10 @@ is not set.
 .RE
 
 .SS "Mail Filter API"
-.sp
 .LP
 \fBsendmail\fR supports a mail filter API called "milter". For more
 information, see \fB/usr/include/libmilter/README\fR and http://www.milter.org
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -545,7 +537,7 @@ Does not do aliasing.
 Tags all addresses being sent as wanting the indicated \fInotifications\fR,
 which consists of the word "NEVER" or a comma-separated list of "SUCCESS",
 "FAILURE", and "DELAY" for successful delivery, failure and a message that is
-stuck in a queue somwhere. The default is "FAILURE,DELAY".
+stuck in a queue somewhere. The default is "FAILURE,DELAY".
 .RE
 
 .sp
@@ -763,7 +755,6 @@ should be used sparingly.
 .RE
 
 .SS "Processing Options"
-.sp
 .LP
 There are a number of "random" options that can be set from a configuration
 file. Options are represented by a single character or by multiple character
@@ -3177,7 +3168,6 @@ long as the \fB/etc/mail/aliases*\fR files are owned by root \fIand\fR root has
 exclusive write permission. If invoked as \fBmailq\fR, \fBsendmail\fR prints
 the contents of the mail queue.
 .SH OPERANDS
-.sp
 .ne 2
 .na
 \fB\fIaddress\fR\fR
@@ -3188,12 +3178,10 @@ address of an intended recipient of the message being sent.
 .RE
 
 .SH USAGE
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBsendmail\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH EXIT STATUS
-.sp
 .LP
 \fBsendmail\fR returns an exit status describing what it did. The codes are
 defined in \fB/usr/include/sysexits.h\fR.
@@ -3278,7 +3266,6 @@ Message could not be sent immediately, but was queued.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 No environment variables are used. However, sendmail's start-up script, invoked
 by \fBsvcadm\fR(1M), reads \fB/etc/default/sendmail\fR. In this file, if the
@@ -3310,7 +3297,6 @@ for each \fIclient\fR name. This is comparable to running:
 .LP
 on the host \fIserver\fR.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fBdead.letter\fR\fR
@@ -3447,7 +3433,6 @@ Describes the steps needed to compile and run a filter
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsvcs\fR(1), \fBbiff\fR(1B), \fBmail\fR(1), \fBmailq\fR(1), \fBmailx\fR(1),
 \fBnice\fR(1), \fBcheck-hostname\fR(1M), \fBcheck-permissions\fR(1M),
@@ -3476,7 +3461,6 @@ http://www.sendmail.org
 .LP
 http://www.milter.org
 .SH NOTES
-.sp
 .LP
 The \fBsendmail\fR program requires a fully qualified host name when starting.
 A script has been included to help verify if the host name is defined properly
diff --git a/usr/src/man/man1m/smbadm.1m b/usr/src/man/man1m/smbadm.1m
index 3ce3ecf923..9fada6fca3 100644
--- a/usr/src/man/man1m/smbadm.1m
+++ b/usr/src/man/man1m/smbadm.1m
@@ -4,7 +4,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 SMBADM 1M "Feb 19, 2014"
+.TH SMBADM 1M "April 9, 2016"
 .SH NAME
 smbadm \- configure and manage CIFS local groups and users, and manage domain
 membership
@@ -201,7 +201,7 @@ Specifies the name of the \fBCIFS\fR local group.
 Specifies the name of a Solaris local user.
 .RE
 
-.SH SUB-COMMANDS
+.SH SUBCOMMANDS
 .LP
 The \fBsmbadm\fR command includes these subcommands:
 .sp
@@ -408,7 +408,7 @@ Selected domain controller
 .sp .6
 .RS 4n
 Lookup the SID for the given \fIaccount-name\fR, or lookup the
-\fIaccount-name\fR for the given SID.  This sub-command is
+\fIaccount-name\fR for the given SID.  This subcommand is
 primarily for diagnostic use, to confirm whether the server
 can lookup domain accounts and/or SIDs.
 .RE
diff --git a/usr/src/man/man1m/smtnrhdb.1m b/usr/src/man/man1m/smtnrhdb.1m
index 8b8486213e..74734855e3 100644
--- a/usr/src/man/man1m/smtnrhdb.1m
+++ b/usr/src/man/man1m/smtnrhdb.1m
@@ -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 SMTNRHDB 1M "Dec 19, 2008"
+.TH SMTNRHDB 1M "April 9, 2016"
 .SH NAME
 smtnrhdb \- manage entries in the tnrhdb database
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ smtnrhdb \- manage entries in the tnrhdb database
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsmtnrhdb\fR command adds, modifies, deletes, and lists entries in the
 \fBtnrhdb\fR database.
@@ -30,7 +29,6 @@ initialized for the command to succeed (see \fBsmc\fR(1M)). After rebooting the
 Solaris Management Console server, the first \fBsmc\fR connection can time out,
 so you might need to retry the command.
 .SS "Valid Host Addresses and Wildcards"
-.sp
 .LP
 The trusted network software uses a network "longest prefix of matching bits"
 mechanism when looking for a host. The software looks first for the IP address
@@ -56,8 +54,7 @@ addresses, see \fISystem Administration Guide: IP Services\fR.
 The \fBsmtnrhdb\fR command accepts a hostname, IP address, and wildcard address
 with as optional prefix as valid addresses. See \fIsubcommand_args\fR, below,
 for the format of valid addresses.
-.SH SUB-COMMANDS
-.sp
+.SH SUBCOMMANDS
 .LP
 \fBsmtnrhdb\fR \fIsubcommand\fRs are:
 .sp
@@ -109,7 +106,6 @@ administrator must have the \fBsolaris.network.host.write\fR and
 .RE
 
 .SH OPTIONS
-.sp
 .LP
 The \fBsmtnrhdb\fR authentication arguments, \fIauth_args\fR, are derived from
 the \fBsmc\fR arg set. These arguments are the same regardless of which
@@ -119,7 +115,6 @@ subcommand you use.
 The subcommand-specific options, \fIsubcommand_args\fR, must be preceded by the
 \fB--\fR option.
 .SS "\fIauth_args\fR"
-.sp
 .LP
 The valid \fIauth_args\fR are \fB-D\fR, \fB-H\fR, \fB-l\fR, \fB-p\fR, \fB-r\fR,
 and \fB-u\fR; they are all optional. If no \fIauth_args\fR are specified,
@@ -219,7 +214,6 @@ not enter the preceding options, you must still enter the \fB--\fR option.
 .RE
 
 .SS "\fIsubcommand_args\fR"
-.sp
 .LP
 \fBNote:\fR Descriptions and other arg options that contain white spaces must
 be enclosed in double quotes.
@@ -450,7 +444,6 @@ from machine1.ExampleCo.COM was successful.
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -484,7 +477,6 @@ An error occurred while executing the command. An error message displays.
 .RE
 
 .SH FILES
-.sp
 .LP
 The following files are used by the \fBsmtnrhdb\fR command:
 .sp
@@ -498,7 +490,6 @@ Trusted network remote-host database.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -514,14 +505,12 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsmc\fR(1M), \fBnetmasks\fR(4), \fBattributes\fR(5)
 .sp
 .LP
 \fISystem Administration Guide: Security Services\fR
 .SH NOTES
-.sp
 .LP
 The functionality described on this manual page is available only if the system
 is configured with Trusted Extensions.
diff --git a/usr/src/man/man1m/svccfg.1m b/usr/src/man/man1m/svccfg.1m
index cbb1a7ef29..600a1c85b5 100644
--- a/usr/src/man/man1m/svccfg.1m
+++ b/usr/src/man/man1m/svccfg.1m
@@ -4,7 +4,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 SVCCFG 1M "Jun 29, 2009"
+.TH SVCCFG 1M "April 9, 2016"
 .SH NAME
 svccfg \- import, export, and modify service configurations
 .SH SYNOPSIS
@@ -573,7 +573,7 @@ currently selected, its "method_context" property group is used. If the
 option nor the \fB-s\fR option is used, the "start" property group is searched
 for in the currently selected entity and, if an instance is currently selected,
 its parent is also searched. If the "inetd_start" property group is not
-located, it is searched for in a similiar manner.
+located, it is searched for in a similar manner.
 .sp
 Once the property is located, all values which begin with \fIenvvar\fR followed
 by a "=" are removed, and the value "\fIenvvar\fR=\fIvalue\fR" is added. See
@@ -623,7 +623,7 @@ currently selected, its "method_context" property group is used. If the
 option nor the \fB-s\fR option is used, the "start" property group is searched
 for in the currently selected entity and, if an instance is currently selected,
 its parent is also searched. If the "inetd_start" property group is not
-located, it is searched for in a similiar manner.
+located, it is searched for in a similar manner.
 .sp
 Once the property is located, all values which begin with \fIenvvar\fR followed
 by "=" are removed. See \fBsmf_security\fR(5) for the privileges required to
diff --git a/usr/src/man/man1m/th_define.1m b/usr/src/man/man1m/th_define.1m
index 0428555376..1e4d89428c 100644
--- a/usr/src/man/man1m/th_define.1m
+++ b/usr/src/man/man1m/th_define.1m
@@ -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 TH_DEFINE 1M "Apr 11, 2001"
+.TH TH_DEFINE 1M "April 9, 2016"
 .SH NAME
 th_define \- create fault injection test harness error specifications
 .SH SYNOPSIS
@@ -40,7 +40,6 @@ th_define \- create fault injection test harness error specifications
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBth_define\fR utility provides an interface to the \fBbus_ops\fR fault
 injection \fBbofi\fR device driver for defining error injection specifications
@@ -95,7 +94,6 @@ the final value for the option is used. If an option is not specified, its
 associated value is set to an appropriate default, which will provide maximal
 error coverage as described below.
 .SH OPTIONS
-.sp
 .LP
 The following options are available:
 .sp
@@ -157,7 +155,7 @@ If \fIacc_types\fR is set to \fBlog\fR, logging will match all \fBPIO\fR
 accesses, interrupts and DMA accesses to and from areas mapped for both reading
 and writing. \fBlog\fR can be combined with other \fIacc_types\fR, in which
 case the matching condition for logging will be restricted to the specified
-addional \fIacc_types\fR. Note that \fBdma_r\fR will match only DMA handles
+additional \fIacc_types\fR. Note that \fBdma_r\fR will match only DMA handles
 mapped for reading only; \fBdma_w\fR will match only DMA handles mapped for
 writing only; \fBdma\fR will match only DMA handles mapped for both reading and
 writing.
@@ -659,7 +657,6 @@ given, a default script is used. This script repeatedly attempts to detach and
 then re-attach the device instance under test.
 .SH EXAMPLES
 .SS "Examples of Error Definitions"
-.sp
 .LP
 \fBth_define -n foo -i 1 -a log\fR
 .sp
@@ -802,7 +799,6 @@ driver occurs, a further ten interrupts are also generated.
 Causes the next interrupt for instance 3 of the \fBfoo\fR driver to be delayed
 by 1024 microseconds.
 .SH NOTES
-.sp
 .LP
 The policy option in the \fBth_define\fR \fB-p\fR syntax determines how a set
 of logged accesses will be converted into the set of error definitions. Each
@@ -813,7 +809,6 @@ an error definition should be created based on the access.
 Any number of policy options can be combined to modify the generated error
 definitions.
 .SS "Bytewise Policies"
-.sp
 .LP
 These select particular I/O transfer sizes. Specifing a byte policy will
 exclude other byte policies that have not been chosen. If none of the byte type
@@ -865,7 +860,6 @@ Create errdefs for repeated byte accesses (\fBddi_rep_get*()\fR)
 .RE
 
 .SS "Frequency of Access Policies"
-.sp
 .LP
 The frequency of access to a location is determined according to the access
 type, location and transfer size (for example, a two-byte read access to
@@ -917,7 +911,6 @@ Create errdefs for locations that are accessed a median frequency.
 .RE
 
 .SS "Policies for Minimizing errdefs"
-.sp
 .LP
 If a transaction is duplicated, either a single or multiple errdefs will be
 written to the test scripts, depending upon the following two policies:
@@ -952,7 +945,6 @@ operators.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkill\fR(1), \fBth_manage\fR(1M), \fBalarm\fR(2),
 \fBddi_check_acc_handle\fR(9F), \fBddi_check_dma_handle\fR(9F)
diff --git a/usr/src/man/man1m/tpmadm.1m b/usr/src/man/man1m/tpmadm.1m
index 77cdde7826..c60b356165 100644
--- a/usr/src/man/man1m/tpmadm.1m
+++ b/usr/src/man/man1m/tpmadm.1m
@@ -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 TPMADM 1M "Jul 7, 2009"
+.TH TPMADM 1M "April 9, 2016"
 .SH NAME
 tpmadm \- administer Trusted Platform Module
 .SH SYNOPSIS
@@ -38,7 +38,6 @@ tpmadm \- administer Trusted Platform Module
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 A Trusted Platform Module (TPM) is a hardware component that provides for
 protected key storage and reliable measurements of software used to boot the
@@ -69,8 +68,7 @@ regardless of the privilege level of the calling process. Second, the TPM owner
 is not able to override access controls for data protected by TPM keys. The
 owner can effectively destroy data by re-initializing the TPM, but he cannot
 access data that has been encrypted using TPM keys owned by other users.
-.SH SUB-COMMANDS
-.sp
+.SH SUBCOMMANDS
 .LP
 The following subcommands are used in the form:
 .sp
@@ -170,7 +168,6 @@ storage.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 After completing the requested operation, \fBtpmadm\fR exits with one of the
 following status values.
@@ -205,7 +202,6 @@ Usage error. The \fBtpmadm\fR command was invoked with invalid arguments.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -221,7 +217,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5)
 .sp
diff --git a/usr/src/man/man1m/trapstat.1m b/usr/src/man/man1m/trapstat.1m
index 1c2b8f2263..5ad30a6ba9 100644
--- a/usr/src/man/man1m/trapstat.1m
+++ b/usr/src/man/man1m/trapstat.1m
@@ -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 TRAPSTAT 1M "May 11, 2004"
+.TH TRAPSTAT 1M "April 9, 2016"
 .SH NAME
 trapstat \- report trap statistics
 .SH SYNOPSIS
@@ -20,7 +20,6 @@ trapstat \- report trap statistics
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBtrapstat\fR utility gathers and displays run-time trap statistics on
 UltraSPARC-based systems. The default output is a table of trap types and
@@ -28,7 +27,7 @@ UltraSPARC-based systems. The default output is a table of trap types and
 column of the table denoting a \fBCPU\fR. If standard output is a terminal, the
 table contains as many columns of data as can fit within the terminal width; if
 standard output is not a terminal, the table contains at most six columns of
-data. By default, data is gathered and and displayed for all \fBCPU\fRs; if the
+data. By default, data is gathered and displayed for all \fBCPU\fRs; if the
 data cannot fit in a single table, it is printed across multiple tables. The
 set of \fBCPU\fRs for which data is gathered and displayed can be optionally
 specified with the \fB-c\fR or \fB-C\fR option.
@@ -76,7 +75,6 @@ provides in-depth TLB miss information broken down by page size using the
 of that provided by the \fB-t\fR option; only one of \fB-t\fR and \fB-T\fR can
 be specified.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -576,7 +574,6 @@ example# \fBtrapstat -e level-10 -P -r 1000\fR
 .sp
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -593,7 +590,6 @@ Interface Stability
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlockstat\fR(1M), \fBpmap\fR(1), \fBpsrset\fR(1M), \fBpsrinfo\fR(1M),
 \fBpbind\fR(1M), \fBppgsz\fR(1), \fBgetpagesizes\fR(3C)
@@ -604,7 +600,6 @@ Interface Stability
 .LP
 \fIThe SPARC Architecture Manual, Version 9,\fR 1994, Prentice-Hall.
 .SH NOTES
-.sp
 .LP
 When enabled, \fBtrapstat\fR induces a varying probe effect, depending on the
 type of information collected. While the precise probe effect depends upon the
diff --git a/usr/src/man/man1m/ufsdump.1m b/usr/src/man/man1m/ufsdump.1m
index 85edc0e155..10303c00f3 100644
--- a/usr/src/man/man1m/ufsdump.1m
+++ b/usr/src/man/man1m/ufsdump.1m
@@ -4,7 +4,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 UFSDUMP 1M "Mar 17, 2008"
+.TH UFSDUMP 1M "April 9, 2016"
 .SH NAME
 ufsdump \- incremental file system dump
 .SH SYNOPSIS
@@ -14,10 +14,9 @@ ufsdump \- incremental file system dump
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBufsdump\fR backs up all files specified by \fIfiles_to_dump\fR (usually
-either a whole file system or files within a file sytem changed after a certain
+either a whole file system or files within a file system changed after a certain
 date) to magnetic tape, diskette, or disk file.
 .sp
 .LP
@@ -52,7 +51,6 @@ multi-volume dumps, unless \fBufsdump\fR does not understand the way the device
 detects the end-of-media, or the files are to be restored on a system with an
 older version of the \fBrestore\fR command.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -422,7 +420,6 @@ that have not been backed up within a day are highlighted.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operand is supported:
 .sp
@@ -453,7 +450,6 @@ line.
 If no \fIoptions\fR are given, the default is \fB9uf\fR \fB/dev/rmt/0\fR
 \fIfiles_to_dump\fR.
 .SH USAGE
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBufsdump\fR
 when encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
@@ -488,7 +484,6 @@ example# ufsdump 5fuv /dev/rmt/1 /dev/rdsk/c0t3d0s6
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 While running, \fBufsdump\fR emits many verbose messages. \fBufsdump\fR returns
 the following exit values:
@@ -523,7 +518,6 @@ Abort \(mi no checkpoint attempted.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/rmt/0\fR\fR
@@ -574,7 +568,6 @@ list of file systems
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcpio\fR(1), \fBtar\fR(1), \fBdd\fR(1M), \fBdevnm\fR(1M), \fBfssnap\fR(1M),
 \fBprtvtoc\fR(1M), \fBrmt\fR(1M), \fBshutdown\fR(1M), \fBufsrestore\fR(1M),
@@ -582,16 +575,13 @@ list of file systems
 \fBattributes\fR(5), \fBlargefile\fR(5), \fBst\fR(7D)
 .SH NOTES
 .SS "Read Errors"
-.sp
 .LP
 Fewer than 32 read errors on the file system are ignored.
 .SS "Process Per Reel"
-.sp
 .LP
 Because each reel requires a new process, parent processes for reels that are
 already written hang around until the entire tape is written.
 .SS "Operator Intervention"
-.sp
 .LP
 \fBufsdump\fR requires operator intervention on these conditions: end of
 volume, end of dump, volume write error, volume open error or disk read error
@@ -607,7 +597,6 @@ checkpoints at the start of each volume. If writing that volume fails for some
 reason, \fBufsdump\fR will, with operator permission, restart itself from the
 checkpoint after a defective volume has been replaced.
 .SS "Suggested Dump Schedule"
-.sp
 .LP
 It is vital to perform full, "level \fB0\fR", dumps at regular intervals. When
 performing a full dump, bring the machine down to single-user mode using
@@ -644,7 +633,6 @@ Although the Tuesday through Friday incrementals contain "extra copies" of
 files from Monday, this scheme assures that any file modified during the week
 can be recovered from the previous day's incremental dump.
 .SS "Process Priority of ufsdump"
-.sp
 .LP
 \fBufsdump\fR uses multiple processes to allow it to read from the disk and
 write to the media concurrently. Due to the way it synchronizes between these
@@ -652,7 +640,6 @@ processes, any attempt to run dump with a \fBnice\fR (process priority) of
 `\(mi5' or better will likely make \fBufsdump\fR run \fIslower\fR instead of
 faster.
 .SS "Overlapping Partitions"
-.sp
 .LP
 Most disks contain one or more overlapping slices because slice 2 covers the
 entire disk. The other slices are of various sizes and usually do not overlap.
@@ -667,7 +654,6 @@ entire disk would instead dump only the \fBroot\fR file system on slice 0. To
 dump the entire disk, the user must dump the file systems on each slice
 separately.
 .SH BUGS
-.sp
 .LP
 The \fB/etc/vfstab\fR file does not allow the desired frequency of backup for
 file systems to be specified (as \fB/etc/fstab\fR did). Consequently, the
diff --git a/usr/src/man/man1m/utmpd.1m b/usr/src/man/man1m/utmpd.1m
index 7d5a9b29ee..b47dd23bd9 100644
--- a/usr/src/man/man1m/utmpd.1m
+++ b/usr/src/man/man1m/utmpd.1m
@@ -5,7 +5,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 UTMPD 1M "Jan 01, 2015"
+.TH UTMPD 1M "April 9, 2016"
 .SH NAME
 utmpd \- utmpx monitoring daemon
 .SH SYNOPSIS
@@ -146,7 +146,7 @@ inhibit or defer access time updates, an unknown amount of error will be
 introduced into the \fButmp\fR \fBDOWN_TIME\fR record's timestamp in the event
 of an uncontrolled shutdown (for example, a crash or loss of power ).
 Controlled shutdowns will update the modify time of \fB/var/adm/wtmpx\fR, which
-will be used on the next boot to determine when the previous shutdown ocurred,
+will be used on the next boot to determine when the previous shutdown occurred,
 regardless of access time deferral or inhibition.
 .sp
 .LP
diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m
index ddf7eb908b..cec17d299e 100644
--- a/usr/src/man/man1m/zfs.1m
+++ b/usr/src/man/man1m/zfs.1m
@@ -28,7 +28,7 @@
 .\" Copyright (c) 2014 Integros [integros.com]
 .\" Copyright 2016 Nexenta Systems, Inc.
 .\"
-.Dd March 20, 2016
+.Dd April 9, 2016
 .Dt ZFS 1M
 .Os
 .Sh NAME
@@ -2459,7 +2459,7 @@ By default, a full stream is generated.
 .It Fl D
 Generate a deduplicated stream. Blocks which would have been sent multiple times
 in the send stream will only be sent once. The receiving system must also
-support this feature to recieve a deduplicated stream. This flag can be used
+support this feature to receive a deduplicated stream. This flag can be used
 regardless of the dataset's
 .Sy dedup
 property, but performance will be much better if the filesystem uses a
@@ -3500,7 +3500,7 @@ M       F       /tank/test/modified
 .Ed
 .El
 .Sh INTERFACE STABILITY
-.Sy Commited .
+.Sy Committed .
 .Sh SEE ALSO
 .Xr gzip 1 ,
 .Xr ssh 1 ,
diff --git a/usr/src/man/man2/issetugid.2 b/usr/src/man/man2/issetugid.2
index 711a3eb300..b0bd3faf98 100644
--- a/usr/src/man/man2/issetugid.2
+++ b/usr/src/man/man2/issetugid.2
@@ -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 ISSETUGID 2 "Feb 19, 2003"
+.TH ISSETUGID 2 "April 9, 2016"
 .SH NAME
 issetugid \- determine if current executable is running setuid or setgid
 .SH SYNOPSIS
@@ -15,12 +15,11 @@ issetugid \- determine if current executable is running setuid or setgid
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBissetugid()\fR function enables library functions (in \fBlibtermlib\fR,
 \fBlibc\fR, or other libraries) to guarantee safe behavior when used in
 \fBsetuid\fR or \fBsetgid\fR programs or programs that run with more privileges
-after a succesful \fBexec\fR(2). Some library functions might be passed
+after a successful \fBexec\fR(2). Some library functions might be passed
 insufficient information and not know whether the current program was started
 \fBsetuid\fR or \fBsetgid\fR because a higher level calling code might have
 made changes to the \fBuid\fR, \fBeuid\fR, \fBgid\fR, or \fBegid\fR. These
@@ -49,18 +48,15 @@ executable file. If the new executable file modes are \fBsetuid\fR or
 before the call to the \fBexec\fR function is not a superset of the inheritable
 set at that time, \fBissetugid()\fR returns 1 in the new process.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBissetugid()\fR function returns 1 if the process was made \fBsetuid\fR
 or \fBsetgid\fR as the result of the last or a previous call to \fBexecve()\fR.
 Otherwise it returns 0.
 .SH ERRORS
-.sp
 .LP
 The \fBissetugid()\fR function is always successful. No return value is
 reserved to indicate an error.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -78,7 +74,6 @@ MT-Level	Async-Signal-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBexec\fR(2), \fBfork\fR(2), \fBsetuid\fR(2), \fBgetenv\fR(3C),
 \fBattributes\fR(5), \fBprivileges\fR(5)
diff --git a/usr/src/man/man2/mmap.2 b/usr/src/man/man2/mmap.2
index c32b561a73..6d2e92675d 100644
--- a/usr/src/man/man2/mmap.2
+++ b/usr/src/man/man2/mmap.2
@@ -8,7 +8,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 MMAP 2 "Feb 4, 2009"
+.TH MMAP 2 "April 9, 2016"
 .SH NAME
 mmap \- map pages of memory
 .SH SYNOPSIS
@@ -21,7 +21,6 @@ mmap \- map pages of memory
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBmmap()\fR function establishes a mapping between a process's address
 space and a file or shared memory object. The format of the call is as follows:
@@ -285,7 +284,7 @@ the dynamic linker when it maps text segments of shared objects. When the
 \fBMAP_TEXT\fR option is used for regular file mappings on some platforms, the
 system can choose a mapping size larger than the page size returned by
 \fBsysconf\fR(3C). The specific page sizes that are used depend on the platform
-and the alignment of the addr and len arguments. Several diffrent mapping sizes
+and the alignment of the addr and len arguments. Several different mapping sizes
 can be used to map the region with larger page sizes used in the parts of the
 region that meet alignment and size requirements for those page sizes.
 .sp
@@ -663,7 +662,6 @@ application:
 .RE
 
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, the \fBmmap()\fR function returns the address at
 which the mapping was placed (\fIpa\fR); otherwise, it returns a value of
@@ -676,7 +674,6 @@ If \fBmmap()\fR fails for reasons other than \fBEBADF\fR, \fBEINVAL\fR or
 \fBENOTSUP\fR, some of the mappings in the address range starting at \fIaddr\fR
 and continuing for \fIlen\fR bytes may have been unmapped.
 .SH ERRORS
-.sp
 .LP
 The \fBmmap()\fR function will fail if:
 .sp
@@ -825,7 +822,6 @@ locking. See \fBfcntl\fR(2).
 .RE
 
 .SH USAGE
-.sp
 .LP
 Use of \fBmmap()\fR may reduce the amount of memory available to other memory
 allocation functions.
@@ -883,7 +879,6 @@ address = mmap((caddr_t) 0, len, (PROT_READ | PROT_WRITE),
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -901,7 +896,6 @@ MT-Level	Async-Signal-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBclose\fR(2), \fBexec\fR(2), \fBfcntl\fR(2), \fBfork\fR(2),
 \fBgetrlimit\fR(2), \fBmemcntl\fR(2), \fBmmapobj\fR(2), \fBmprotect\fR(2),
diff --git a/usr/src/man/man2/p_online.2 b/usr/src/man/man2/p_online.2
index 4506daa081..cd8e659361 100644
--- a/usr/src/man/man2/p_online.2
+++ b/usr/src/man/man2/p_online.2
@@ -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 P_ONLINE 2 "Jan 11, 2009"
+.TH P_ONLINE 2 "April 9, 2016"
 .SH NAME
 p_online \- return or change processor operational status
 .SH SYNOPSIS
@@ -16,7 +16,6 @@ p_online \- return or change processor operational status
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBp_online()\fR function changes or returns the operational status of
 processors. The state of the processor specified by the \fIprocessorid\fR
@@ -57,13 +56,13 @@ one processor must always be available to service system clock interrupts.
 .sp
 .LP
 A processor in the \fBP_SPARE\fR state is not allowed to process LWPs. In many
-respects the \fBP_SPARE\fR state is similiar to the \fBP_OFFLINE\fR state, but
+respects, the \fBP_SPARE\fR state is similar to the \fBP_OFFLINE\fR state, but
 describes a processor that is available for reactivation by management tools
 without administrator intervention.
 .sp
 .LP
 A processor in the \fBP_FAULTED\fR state is not allowed to process LWPs. In
-many respects the \fBP_FAULTED\fR state is similiar to the \fBP_OFFLINE\fR
+many respects, the \fBP_FAULTED\fR state is similar to the \fBP_OFFLINE\fR
 state, but describes a processor that has been diagnosed as faulty. The
 privileged caller can change the state of the processor from \fBP_FAULTED\fR to
 any of the other states, but since the processor might generate additional
@@ -89,14 +88,12 @@ determined by calling \fBp_online()\fR with \fIprocessorid\fR values from 0 to
 the maximum returned by \fBsysconf(_SC_CPUID_MAX)\fR. The \fBEINVAL\fR error is
 returned for invalid processor numbers.  See \fBEXAMPLES\fR below.
 .SH RETURN VALUES
-.sp
 .LP
 On successful completion, the value returned is the previous state of the
 processor, \fBP_ONLINE\fR, \fBP_OFFLINE\fR, \fBP_NOINTR\fR, \fBP_FAULTED\fR,
 \fBP_SPARE\fR, or \fBP_POWEROFF\fR. Otherwise, \fB\(mi1\fR is returned, the CPU
 state remains unchanged, and  \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBp_online()\fR function will fail if:
 .sp
@@ -182,7 +179,6 @@ main()
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -198,7 +194,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpooladm\fR(1M), \fBpsradm\fR(1M), \fBpsrinfo\fR(1M), \fBzoneadm\fR(1M),
 \fBprocessor_bind\fR(2), \fBprocessor_info\fR(2), \fBpset_create\fR(2),
diff --git a/usr/src/man/man3c/door_getparam.3c b/usr/src/man/man3c/door_getparam.3c
index 969a8a61ba..ae17a48dd7 100644
--- a/usr/src/man/man3c/door_getparam.3c
+++ b/usr/src/man/man3c/door_getparam.3c
@@ -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 DOOR_GETPARAM 3C "Mar 22, 2005"
+.TH DOOR_GETPARAM 3C "April 9, 2016"
 .SH NAME
 door_getparam, door_setparam \- retrieve and set door parameters
 .SH SYNOPSIS
@@ -21,7 +21,6 @@ door_getparam, door_setparam \- retrieve and set door parameters
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBdoor_getparam()\fR function retrieves the value of \fIparam\fR for the
 door descriptor \fId\fR and writes it through the pointer \fIout\fR. The
@@ -49,7 +48,7 @@ is initialized to \fBSIZE_MAX\fR and can be set to any value from 0 to
 \fB\fBDOOR_PARAM_DATA_MIN\fR\fR
 .ad
 .RS 23n
-This parameter represents the the minimum amount of data that can be passed to
+This parameter represents the minimum amount of data that can be passed to
 the door routine. Any attempt to call \fBdoor_call\fR(3C) on a door with a
 \fIdata_size\fR value smaller than the door's \fBDOOR_PARAM_DATA_MIN\fR
 parameter will fail with \fBENOBUFS\fR. At door creation time, this parameter
@@ -64,7 +63,7 @@ inclusive. This parameter must be less than or equal to the
 \fB\fBDOOR_PARAM_DESC_MAX\fR\fR
 .ad
 .RS 23n
-This parameter represents the the maximum number of argument descriptors that
+This parameter represents the maximum number of argument descriptors that
 can be passed to the door routine. Any attempt to call \fBdoor_call\fR(3C) on a
 door with a \fIdesc_nu\fRm value larger than the door's
 \fBDOOR_PARAM_DESC_MAX\fR parameter will fail with \fBENFILE\fR. If the door
@@ -78,12 +77,10 @@ to 0 and cannot be changed to any other value. Otherwise, it is initialized to
 The \fBdoor_setparam()\fR function can only affect doors that were created by
 the current process.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, 0 is returned.  Otherwise, -1 is returned and
 \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBdoor_getparam()\fR function will fail if:
 .sp
@@ -203,7 +200,6 @@ if (door_setparam(fd, DOOR_PARAM_DATA_MIN,
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -221,11 +217,9 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdoor_call\fR(3C), \fBdoor_create\fR(3C), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 The parameters that can be manipulated by \fBdoor_setparam()\fR are not the
 only limitation on the size of requests. If the door server thread's stack size
diff --git a/usr/src/man/man3c/econvert.3c b/usr/src/man/man3c/econvert.3c
index e8f7ae6814..d2af5c2ef2 100644
--- a/usr/src/man/man3c/econvert.3c
+++ b/usr/src/man/man3c/econvert.3c
@@ -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 ECONVERT 3C "May 3, 1999"
+.TH ECONVERT 3C "April 9, 2016"
 .SH NAME
 econvert, fconvert, gconvert, seconvert, sfconvert, sgconvert, qeconvert,
 qfconvert, qgconvert \- output conversion
@@ -62,7 +62,6 @@ qfconvert, qgconvert \- output conversion
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBeconvert()\fR function converts the \fIvalue\fR to a null-terminated
 string of \fIndigit\fR \fBASCII\fR digits in \fIbuf\fR and returns a pointer to
@@ -80,7 +79,7 @@ correct digit has been rounded as if for  \fBsprintf(%w.nf)\fR output with
 \fIn\fR=\fIndigit\fR digits to the right of the decimal point. \fIndigit\fR can
 be negative to indicate rounding to the left of the decimal point. The return
 value is a pointer to \fIbuf\fR. \fIbuf\fR should contain at least
-\fI310+max(0,ndigit)\fR characters to accomodate any double-precision
+\fI310+max(0,ndigit)\fR characters to accommodate any double-precision
 \fIvalue\fR.
 .sp
 .LP
@@ -123,13 +122,11 @@ are documented on the \fBecvt\fR(3C) manual page.  They constitute the default
 implementation of these functions and conform to the X/Open CAE Specification,
 System Interfaces and Headers, Issue 4, Version 2.
 .SH USAGE
-.sp
 .LP
 \fBIEEE\fR Infinities and NaNs are treated similarly by these functions.
 ``NaN'' is returned for NaN, and ``Inf'' or ``Infinity'' for Infinity.  The
 longer form is produced when \fIndigit\fR >= 8.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -145,6 +142,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBecvt\fR(3C),\fBsprintf\fR(3C), \fBattributes\fR(5)
diff --git a/usr/src/man/man3c/epoll_create.3c b/usr/src/man/man3c/epoll_create.3c
index 6f54f638f7..83ea81e204 100644
--- a/usr/src/man/man3c/epoll_create.3c
+++ b/usr/src/man/man3c/epoll_create.3c
@@ -8,7 +8,7 @@
 .\"  A full copy of the text of the CDDL should have accompanied this
 .\"  source.  A copy of the CDDL is also available via the Internet at
 .\"  http://www.illumos.org/license/CDDL.
-.TH EPOLL_CREATE 3C "Apr 17, 2014"
+.TH EPOLL_CREATE 3C "April 9, 2016"
 .SH NAME
 epoll_create, epoll_create1 \- create an epoll instance
 .SH SYNOPSIS
@@ -50,7 +50,7 @@ Instance should be closed upon an
 
 .SH RETURN VALUES
 .LP
-Upon succesful completion, 0 is returned. Otherwise, -1 is returned and errno
+Upon successful completion, 0 is returned. Otherwise, -1 is returned and errno
 is set to indicate the error.
 .SH ERRORS
 .LP
diff --git a/usr/src/man/man3c/epoll_ctl.3c b/usr/src/man/man3c/epoll_ctl.3c
index 19c02f2abb..dac849d5c3 100644
--- a/usr/src/man/man3c/epoll_ctl.3c
+++ b/usr/src/man/man3c/epoll_ctl.3c
@@ -8,7 +8,7 @@
 .\"  A full copy of the text of the CDDL should have accompanied this
 .\"  source.  A copy of the CDDL is also available via the Internet at
 .\"  http://www.illumos.org/license/CDDL.
-.TH EPOLL_CTL 3C "Apr 17, 2014"
+.TH EPOLL_CTL 3C "April 9, 2016"
 .SH NAME
 epoll_ctl \- control an epoll instance
 .SH SYNOPSIS
@@ -245,7 +245,7 @@ with caution.
 
 .SH RETURN VALUES
 .LP
-Upon succesful completion, \fBepoll_ctl()\fR returns 0.
+Upon successful completion, \fBepoll_ctl()\fR returns 0.
 If an error occurs, -1 is returned and errno is set to indicate
 the error.
 
diff --git a/usr/src/man/man3c/eventfd.3c b/usr/src/man/man3c/eventfd.3c
index 74e164404e..459f0457f9 100644
--- a/usr/src/man/man3c/eventfd.3c
+++ b/usr/src/man/man3c/eventfd.3c
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright (c) 2014, Joyent, Inc. All Rights Reserved.
 .\"
-.Dd Dec 3, 2014
+.Dd April 9, 2016
 .Dt EVENTFD 3C
 .Os
 .Sh NAME
@@ -158,7 +158,7 @@ will be set.
 .Ed
 .El
 .Sh RETURN VALUES
-Upon succesful completion, a file descriptor associated with the instance
+Upon successful completion, a file descriptor associated with the instance
 is returned. Otherwise,
 .Sy -1 is returned and
 .Sy errno
diff --git a/usr/src/man/man3c/getline.3c b/usr/src/man/man3c/getline.3c
index a8db7df218..4339315d38 100644
--- a/usr/src/man/man3c/getline.3c
+++ b/usr/src/man/man3c/getline.3c
@@ -12,7 +12,7 @@
 .\"
 .\" Copyright (c) 2013, Joyent, Inc. All rights reserved.
 .\"
-.TH GETLINE 3C "Apr 24, 2013"
+.TH GETLINE 3C "April 9, 2016"
 .SH NAME
 getline, getdelim \- read delimited input from streams
 .SH SYNOPSIS
@@ -36,7 +36,7 @@ getline, getdelim \- read delimited input from streams
 .fi
 
 .SH DESCRIPTION
-The \fBgetdelim\fR() function reads bytes from the \fIstream\fR into the the
+The \fBgetdelim\fR() function reads bytes from the \fIstream\fR into the
 array pointed to by \fIptr\fR, until the \fIdelimiter\fR byte or an end-of-file
 condition is encountered.  The \fBgetline\fR() function is identical in
 behaviour, but uses the newline character as the delimiter.  The delimiter
@@ -51,7 +51,6 @@ hold the string it will be expanded, as if via \fBrealloc(3C)\fR.  The caller
 must \fBfree(3C)\fR the buffer when it is no longer required.
 
 .SH RETURN VALUES
-.sp
 .LP
 If successful, \fBgetdelim\fR() and \fBgetline\fR() return the number of bytes
 written into the buffer, excluding the terminating null byte.  If an error
@@ -59,7 +58,6 @@ occurs, or if end-of-file is reached prior to reading any bytes, the value
 \fB\(mi1\fR is returned and \fIerrno\fR is set to indicate the error.
 
 .SH ERRORS
-.sp
 .LP
 The \fBgetline\fR() and \fBgetdelim\fR() functions may fail due to the
 following errors:
@@ -117,7 +115,6 @@ free(ptr);
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .TS
 box;
 c | c
@@ -130,7 +127,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBfgetc\fR(3C), \fBfgets\fR(3C), \fBfree\fR(3C), \fBmalloc\fR(3C),
 \fBrealloc\fR(3C), \fBattributes\fR(5)
diff --git a/usr/src/man/man3c/gettext.3c b/usr/src/man/man3c/gettext.3c
index d213b9cbbb..b0a272753c 100644
--- a/usr/src/man/man3c/gettext.3c
+++ b/usr/src/man/man3c/gettext.3c
@@ -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 GETTEXT 3C "Jun 4, 2008"
+.TH GETTEXT 3C "April 9, 2016"
 .SH NAME
 gettext, dgettext, dcgettext, ngettext, dngettext, dcngettext, textdomain,
 bindtextdomain, bind_textdomain_codeset \- message handling functions
@@ -77,7 +77,6 @@ extern int *_nl_domain_bindings;
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBgettext()\fR, \fBdgettext()\fR, and \fBdcgettext()\fR functions attempt
 to retrieve a target string based on the specified \fImsgid\fR argument within
@@ -200,7 +199,6 @@ in the function and must not be changed by the user.
 The external variables \fB_nl_msg_cat_cntr\fR and \fB_nl_domain_bindings\fR are
 provided for the compatibility with the GNU \fBgettext()\fR implementation.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBgettext()\fR, \fBdgettext()\fR, and \fBdcgettext()\fR functions return
 the message string if the search succeeds. Otherwise they return the
@@ -219,7 +217,7 @@ is a null pointer, the return value is undefined. The string returned must not
 be modified by the program and can be invalidated by a subsequent call to
 \fBbind_textdomain_codeset()\fR or \fBsetlocale\fR(3C). If the
 \fIdomainname\fR argument to  \fBdgettext()\fR,\fBdcgettext()\fR,
-\fBdngettext()\fR, or \fBdcngettext()\fR is a null pointer, the the domain
+\fBdngettext()\fR, or \fBdcngettext()\fR is a null pointer, the domain
 currently bound by \fBtextdomain()\fR is used.
 .sp
 .LP
@@ -240,7 +238,6 @@ pointer or an empty string, \fBbindtextdomain()\fR takes no action and returns
 a null pointer. The string returned must not be modified by the caller. If
 \fBbindtextdomain()\fR fails, a null pointer is returned.
 .SH USAGE
-.sp
 .LP
 These functions impose no limit on message length. However, a text
 \fIdomainname\fR is limited to \fBTEXTDOMAINMAX\fR (256) bytes.
@@ -261,7 +258,6 @@ functions work only with GNU-compatible message catalogues.  See
 \fBmsgfmt\fR(1) for information about Solaris message catalogues and
 GNU-compatible message catalogues.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/locale\fR\fR
@@ -325,7 +321,6 @@ location for files containing messages for domain \fIdomainname,\fR language
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -347,7 +342,6 @@ MT-Level	Safe with exceptions
 The external variables \fB_nl_msg_cat_cntr\fR and \fB_nl_domain_bindings\fR are
 Uncommitted.
 .SH SEE ALSO
-.sp
 .LP
 \fBmsgfmt\fR(1), \fBxgettext\fR(1), \fBiconv_open\fR(3C),
 \fBlibintl.h\fR(3HEAD), \fBsetlocale\fR(3C), \fBattributes\fR(5),
diff --git a/usr/src/man/man3c/getutent.3c b/usr/src/man/man3c/getutent.3c
index 7ca4d19939..76b25cec9c 100644
--- a/usr/src/man/man3c/getutent.3c
+++ b/usr/src/man/man3c/getutent.3c
@@ -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 GETUTENT 3C "Oct 27, 1998"
+.TH GETUTENT 3C "April 9, 2016"
 .SH NAME
 getutent, getutid, getutline, pututline, setutent, endutent, utmpname \- user
 accounting database functions
@@ -46,7 +46,6 @@ accounting database functions
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 These functions provide access to the user accounting database, \fButmp\fR.
 Entries in the database are described by the definitions and data structures in
@@ -81,13 +80,11 @@ short   e_exit;          /* exit status */
 .in -2
 
 .SS "\fBgetutent()\fR"
-.sp
 .LP
 The \fBgetutent()\fR function reads in the next entry from a \fButmp\fR
 database.  If the database is not already open, it opens it.  If it reaches the
 end of the database, it fails.
 .SS "\fBgetutid()\fR"
-.sp
 .LP
 The \fBgetutid()\fR function searches forward from the current point in the
 \fButmp\fR database until it finds an entry with a \fBut_type\fR matching
@@ -99,20 +96,18 @@ pointer to the first entry whose type is one of these four and whose
 \fBut_id\fR member matches \fIid\fR->\fBut_id\fR. If the end of database is
 reached without a match, it fails.
 .SS "\fBgetutline()\fR"
-.sp
 .LP
 The \fBgetutline()\fR function searches forward from the current point in the
 \fButmp\fR database until it finds an entry of the type \fBLOGIN_PROCESS\fR or
 \fBut_line\fR string matching the \fIline\fR->\fBut_line\fR string. If the end
 of database is reached without a match, it fails.
 .SS "\fBpututline()\fR"
-.sp
 .LP
 The \fBpututline()\fR function writes the supplied \fButmp\fR structure into
 the \fButmp\fR database.  It uses \fBgetutid()\fR to search forward for the
 proper place if it finds that it is not already at the proper place.  It is
 expected that normally the user of \fBpututline()\fR will have searched for the
-proper entry using one of the these functions.  If so, \fBpututline()\fR will
+proper entry using one of these functions.  If so, \fBpututline()\fR will
 not search.  If \fBpututline()\fR does not find a matching slot for the new
 entry, it will add a new entry to the end of the database.  It returns a
 pointer to the \fButmp\fR structure. When called by a non-root user,
@@ -123,17 +118,14 @@ associated with the process; the  \fBut_type\fR member must be either
 \fBUSER_PROCESS\fR or \fBDEAD_PROCESS\fR; and the \fBut_line\fR member must be
 a device special file and be writable by the user.
 .SS "\fBsetutent()\fR"
-.sp
 .LP
 The \fBsetutent()\fR function resets the input stream to the beginning.  This
 reset should be done before each search for a new entry if it is desired that
 the entire database be examined.
 .SS "\fBendutent()\fR"
-.sp
 .LP
 The \fBendutent()\fR function closes the currently open database.
 .SS "\fButmpname()\fR"
-.sp
 .LP
 The \fButmpname()\fR function allows the user to change the name of the
 database file examined to another file.  If the file does not exist, this will
@@ -141,14 +133,12 @@ not be apparent until the first attempt to reference the file is made.  The
 \fButmpname()\fR function does not open the file but closes the old file if it
 is currently open and saves the new file name.
 .SH RETURN VALUES
-.sp
 .LP
 A null pointer is returned upon failure to read, whether for permissions or
 having reached the end of file, or upon failure to write. If the file name
 given is longer than 79 characters, \fButmpname()\fR returns \fB0\fR.
 Otherwise, it returns \fB1\fR.
 .SH USAGE
-.sp
 .LP
 These functions use buffered standard I/O for input, but \fBpututline()\fR uses
 an unbuffered non-standard write to avoid race conditions between processes
@@ -162,7 +152,6 @@ to fail if user accounting data cannot be represented properly in the
 \fButmp\fR structure (for example, on a system where PIDs can exceed 32767).
 Use the functions described on the \fBgetutxent\fR(3C) manual page instead.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -178,11 +167,9 @@ MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBgetutxent\fR(3C), \fBttyslot\fR(3C), \fButmpx\fR(4), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 The most current entry is saved in a static structure.  Multiple accesses
 require that it be copied before further accesses are made. On each call to
diff --git a/usr/src/man/man3c/iswalpha.3c b/usr/src/man/man3c/iswalpha.3c
index 916aad0ffc..bf50de8402 100644
--- a/usr/src/man/man3c/iswalpha.3c
+++ b/usr/src/man/man3c/iswalpha.3c
@@ -8,7 +8,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 ISWALPHA 3C "Jun 23, 2014"
+.TH ISWALPHA 3C "April 9, 2016"
 .SH NAME
 iswalpha, isenglish, isideogram, iswideogram, isnumber, iswnumber,
 isphonogram, iswphonogram, isspecial, iswspecial, iswalnum, iswascii,
@@ -207,7 +207,7 @@ current locale, they operate on the locale specified by \fIloc\fR.
 The functions, \fBiswideogram()\fR, \fBiswnumber()\fR, \fBiswphonogram()\fR,
 \fBiswspecial()\fR, and \fBiswhexnumber()\fR, are respectively identical to
 \fBisideogram()\fR, \fBisnumber()\fR, \fBisphonogram()\fR, \fBisspecial()\fR,
-\fBiswxdigit()\fR respectively.  They are provided for compatability purposes.
+\fBiswxdigit()\fR respectively.  They are provided for compatibility purposes.
 .LP
 In all cases, \fIwc\fR is a \fBwint_t\fR, the value of which must be a
 wide-character code corresponding to a valid character in the current locale or
@@ -395,7 +395,6 @@ class "xdigit" in the program's current locale.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .TS
diff --git a/usr/src/man/man3c/port_alert.3c b/usr/src/man/man3c/port_alert.3c
index 886d43de79..642eb79cd9 100644
--- a/usr/src/man/man3c/port_alert.3c
+++ b/usr/src/man/man3c/port_alert.3c
@@ -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 PORT_ALERT 3C "Oct 1, 2003"
+.TH PORT_ALERT 3C "April 9, 2016"
 .SH NAME
 port_alert \- set a port in alert mode
 .SH SYNOPSIS
@@ -15,7 +15,6 @@ port_alert \- set a port in alert mode
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBport_alert()\fR function transitions a port into or out of alert mode.
 A port in alert mode immediately awakens all threads blocked in
@@ -67,12 +66,10 @@ function with a zero \fIevents\fR parameter.
 Events can be queued to a port that is in alert mode, but they will not be
 retrievable until the port is transitioned out of alert mode.
 .SH RETURN VALUES
-.sp
 .LP
-Upon succesful completion, 0 is returned. Otherwise, -1 is returned and
+Upon successful completion, 0 is returned. Otherwise, -1 is returned and
 \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBport_alert()\fR function will fail if:
 .sp
@@ -112,7 +109,6 @@ Mutually exclusive \fIflags\fR are set.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -132,7 +128,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBport_associate\fR(3C), \fBport_create\fR(3C), \fBport_get\fR(3C),
 \fBport_send\fR(3C), \fBattributes\fR(5)
diff --git a/usr/src/man/man3c/port_associate.3c b/usr/src/man/man3c/port_associate.3c
index f1c085731c..1d8e34d1a8 100644
--- a/usr/src/man/man3c/port_associate.3c
+++ b/usr/src/man/man3c/port_associate.3c
@@ -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 PORT_ASSOCIATE 3C "Aug 8, 2015"
+.TH PORT_ASSOCIATE 3C "April 9, 2016"
 .SH NAME
 port_associate, port_dissociate \- associate or dissociate the object with the
 port
@@ -151,7 +151,7 @@ On NFS file systems, events from only the client side (local)
 access/modifications to files or directories will be delivered.
 .SH RETURN VALUES
 .LP
-Upon succesful completion, 0 is returned. Otherwise, \(mi1 is returned and
+Upon successful completion, 0 is returned. Otherwise, \(mi1 is returned and
 \fBerrno\fR is set to indicate the error.
 .SH ERRORS
 .LP
diff --git a/usr/src/man/man3c/port_create.3c b/usr/src/man/man3c/port_create.3c
index 654c8d6a4b..3421c6d0be 100644
--- a/usr/src/man/man3c/port_create.3c
+++ b/usr/src/man/man3c/port_create.3c
@@ -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 PORT_CREATE 3C "Feb 5, 2008"
+.TH PORT_CREATE 3C "April 9, 2016"
 .SH NAME
 port_create \- create a port
 .SH SYNOPSIS
@@ -15,7 +15,6 @@ port_create \- create a port
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBport_create()\fR function establishes a queue that multiplexes events
 from disjoint sources.  Each source has a corresponding object type and
@@ -103,13 +102,11 @@ processes when child processes inherit opened file decriptors from the parent
 process. See \fBfork\fR(2). \fBPORT_SOURCE_TIMER\fR and \fBPORT_SOURCE_AIO\fR
 cannot be shared between processes.
 .SH RETURN VALUES
-.sp
 .LP
-Upon succesful completion, the \fBport_create()\fR function returns a
+Upon successful completion, the \fBport_create()\fR function returns a
 non-negative value, the port identifier. Otherwise, \(mi1 is returned and errno
 is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBport_create()\fR function will fail if:
 .sp
@@ -134,7 +131,6 @@ The process has too many open descriptors.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -154,7 +150,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBrctladm\fR(1M), \fBclose\fR(2), \fBexit\fR(2), \fBfork\fR(2), \fBpoll\fR(2),
 \fBsetrctl\fR(2), \fBaio_read\fR(3C), \fBaio_write\fR(3C), \fBaio.h\fR(3HEAD),
diff --git a/usr/src/man/man3c/port_get.3c b/usr/src/man/man3c/port_get.3c
index 95b2f8c2b7..2683ebde5d 100644
--- a/usr/src/man/man3c/port_get.3c
+++ b/usr/src/man/man3c/port_get.3c
@@ -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 PORT_GET 3C "Jan 31, 2007"
+.TH PORT_GET 3C "April 9, 2016"
 .SH NAME
 port_get, port_getn \- retrieve event information from a port
 .SH SYNOPSIS
@@ -22,7 +22,6 @@ port_get, port_getn \- retrieve event information from a port
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBport_get()\fR and \fBport_getn()\fR functions retrieve events from a
 port. The \fBport_get()\fR function retrieves at most a single event. The
@@ -66,7 +65,7 @@ in or enters alert mode. See \fBport_alert\fR(3C) for details on alert mode.
 The \fBport_getn()\fR function can retrieve multiple events from a port. The
 \fIlist\fR argument is an array of uninitialized \fBport_event_t\fR structures
 that is filled in by the system when the \fBport_getn()\fR function returns
-succesfully. The \fInget\fR argument points to the desired number of events to
+successfully. The \fInget\fR argument points to the desired number of events to
 be retrieved. The \fImax\fR parameter specifies the maximum number of events
 that can be returned in \fIlist\fR[]. If \fImax\fR is 0, the value pointed to
 by \fInget\fR is set to the number of events available on the port. The
@@ -91,12 +90,10 @@ waiting in the \fBport_getn()\fR function for more than \fIn\fR events.
 The \fBport_get()\fR and the \fBport_getn()\fR functions ignore non-shareable
 events (see \fBport_create\fR(3C)) generated by other processes.
 .SH RETURN VALUES
-.sp
 .LP
-Upon succesful completion, 0 is returned. Otherwise, -1 is returned and errno
+Upon successful completion, 0 is returned. Otherwise, -1 is returned and errno
 is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBport_get()\fR and \fBport_getn()\fR functions will fail if:
 .sp
@@ -124,7 +121,7 @@ The \fIport\fR argument is not an event port file descriptor.
 .ad
 .RS 10n
 Event or event list can not be delivered (\fIlist\fR[] pointer and/or user
-space reserved to accomodate the list of events is not reasonable), or the
+space reserved to accommodate the list of events is not reasonable), or the
 \fItimeout\fR argument is not reasonable.
 .RE
 
@@ -262,7 +259,6 @@ close(myport);
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -282,7 +278,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBport_alert\fR(3C), \fBport_associate\fR(3C), \fBport_create\fR(3C),
 \fBport_send\fR(3C), \fBattributes\fR(5)
diff --git a/usr/src/man/man3c/pthread_rwlock_timedrdlock.3c b/usr/src/man/man3c/pthread_rwlock_timedrdlock.3c
index 4c6270a46c..b1f9fe5dbb 100644
--- a/usr/src/man/man3c/pthread_rwlock_timedrdlock.3c
+++ b/usr/src/man/man3c/pthread_rwlock_timedrdlock.3c
@@ -8,7 +8,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 PTHREAD_RWLOCK_TIMEDRDLOCK 3C "Jan 30, 2004"
+.TH PTHREAD_RWLOCK_TIMEDRDLOCK 3C "April 9, 2016"
 .SH NAME
 pthread_rwlock_timedrdlock, pthread_rwlock_reltimedrdlock_np \- lock a
 read-write lock for reading
@@ -30,7 +30,6 @@ cc \fB-mt\fR [ \fIflag\fR... ] \fIfile\fR... [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpthread_rwlock_timedrdlock()\fR function applies a read lock to the
 read-write lock referenced by \fIrwlock\fR as in the
@@ -72,16 +71,14 @@ write lock on rwlock.
 The results are undefined if this function is called with an uninitialized
 read-write lock.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBpthread_rwlock_timedrdlock()\fR and
 \fBpthread_rwlock_reltimedrdlock_np()\fR functions return 0 if the lock for
 reading on the read-write lock object referenced by \fIrwlock\fR is acquired.
 Otherwise, an error number is returned to indicate the error.
 .SH ERRORS
-.sp
 .LP
-The \fBpthread_rwlock_timedrdlock()\fR and and
+The \fBpthread_rwlock_timedrdlock()\fR and
 \fBpthread_rwlock_reltimedrdlock_np()\fR functions will fail if:
 .sp
 .ne 2
@@ -127,7 +124,6 @@ or equal to 1 000 million.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -149,7 +145,6 @@ MT-Level	MT-Safe
 The \fBpthread_rwlock_timedrdlock()\fR function is Standard. The
 \fBpthread_rwlock_reltimedrdlock_np()\fR is Stable.
 .SH SEE ALSO
-.sp
 .LP
 \fBpthread_rwlock_destroy\fR(3C), \fBpthread_rwlock_rdlock\fR(3C),
 \fBpthread_rwlock_timedwrlock\fR(3C), \fBpthread_rwlock_trywrlock\fR(3C),
diff --git a/usr/src/man/man3c/signalfd.3c b/usr/src/man/man3c/signalfd.3c
index aa1bb90b1d..f08e85b273 100644
--- a/usr/src/man/man3c/signalfd.3c
+++ b/usr/src/man/man3c/signalfd.3c
@@ -165,7 +165,7 @@ the child only calls
 .Xr close 2
 on the descriptors.
 .Sh RETURN VALUES
-Upon succesful completion, a file descriptor associated with the instance
+Upon successful completion, a file descriptor associated with the instance
 is returned. Otherwise, -1 is returned and errno is set to indicate the error.
 When
 .Va fd
diff --git a/usr/src/man/man3c/timerfd_create.3c b/usr/src/man/man3c/timerfd_create.3c
index f597bfbdc3..68a7d17b17 100644
--- a/usr/src/man/man3c/timerfd_create.3c
+++ b/usr/src/man/man3c/timerfd_create.3c
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright (c) 2015, Joyent, Inc. All Rights Reserved.
 .\"
-.Dd Feb 23, 2105
+.Dd April 9, 2016
 .Dt TIMERFD 3C
 .Os
 .Sh NAME
@@ -164,7 +164,7 @@ same functional signature and semantics as
 .Ed
 .El
 .Sh RETURN VALUES
-Upon succesful completion, a file descriptor associated with the instance
+Upon successful completion, a file descriptor associated with the instance
 is returned. Otherwise,
 .Sy -1
 is returned and errno is set to indicate the error.
diff --git a/usr/src/man/man3c/wcscasecmp.3c b/usr/src/man/man3c/wcscasecmp.3c
index 6a6aca9922..d8af330cf7 100644
--- a/usr/src/man/man3c/wcscasecmp.3c
+++ b/usr/src/man/man3c/wcscasecmp.3c
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\"
-.Dd "Nov 4, 2014"
+.Dd "April 9, 2016"
 .Dt WCSCASECMP 3C
 .Os
 .Sh NAME
@@ -62,7 +62,7 @@ and
 .Fa ws2
 are compared consecutively, ignoring differences in case (if the
 .\"POSIX\." locale upper case characters are treated as lower case).  If
-the two values are different, the comparision stops and either
+the two values are different, the comparison stops and either
 a negative value is returned if the character from
 .Fa ws1
 is less than that from
diff --git a/usr/src/man/man3c/wcscoll.3c b/usr/src/man/man3c/wcscoll.3c
index 59f8d18800..248e473150 100644
--- a/usr/src/man/man3c/wcscoll.3c
+++ b/usr/src/man/man3c/wcscoll.3c
@@ -8,7 +8,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 WCSCOLL 3C "Jun 25, 2014"
+.TH WCSCOLL 3C "April 9, 2016"
 .SH NAME
 wcscoll, wcscoll_l wscoll \- wide character string comparison using collating information
 .SH SYNOPSIS
@@ -49,7 +49,7 @@ Upon successful completion, these functions return an
 integer greater than, equal to, or less than 0, depending upon whether the wide
 character string pointed to by \fIws1\fR is greater than, equal to, or less
 than the wide character string pointed to by \fIws2\fR, when both are
-interpreted as appropriate to the the current locale, or the locale
+interpreted as appropriate to the current locale, or the locale
 specified by \fIloc\fR. On error,
 they set \fBerrno\fR, but no return value is reserved to indicate an error.
 .SH ERRORS
@@ -65,10 +65,9 @@ The \fIws1\fR or \fIws2\fR arguments contain wide character codes outside the
 domain of the collating sequence.
 .RE
 .SH USAGE
-.sp
 .LP
 The \fBwcsxfrm\fR(3C) and \fBwcscmp\fR(3C) functions should be used for sorting
-large lists, or when performing many comparisions on the same strings.
+large lists, or when performing many comparisons on the same strings.
 .SH ATTRIBUTES
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
diff --git a/usr/src/man/man3contract/ct_event_read.3contract b/usr/src/man/man3contract/ct_event_read.3contract
index d94ca93ca0..800c5b375b 100644
--- a/usr/src/man/man3contract/ct_event_read.3contract
+++ b/usr/src/man/man3contract/ct_event_read.3contract
@@ -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 CT_EVENT_READ 3CONTRACT "Apr 1, 2004"
+.TH CT_EVENT_READ 3CONTRACT "April 9, 2016"
 .SH NAME
 ct_event_read, ct_event_read_critical, ct_event_reset, ct_event_reliable,
 ct_event_free, ct_event_get_flags, ct_event_get_ctid, ct_event_get_evid,
@@ -69,7 +69,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-D_LARGEFILE64_SOURCE\fR \fB -
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 These functions operate on contract event endpoint file descriptors obtained
 from the \fBcontract\fR(4) file system and event object handles returned by
@@ -157,7 +156,6 @@ when the negotiation referenced by the \fBCT_EV_NEGEND\fR event succeeded. If
 no contract was created, \fIctidp\fR will be 0.  If the operation was
 cancelled, *\fIctidp\fR will equal the ID of the existing contract.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBct_event_read()\fR,
 \fBct_event_read_critical()\fR, \fBct_event_reset()\fR,
@@ -170,7 +168,6 @@ The \fBct_event_get_flags()\fR, \fBct_event_get_ctid()\fR,
 \fBct_event_get_evid()\fR, and \fBct_event_get_type()\fR functions return data
 as described in the DESCRIPTION.
 .SH ERRORS
-.sp
 .LP
 The \fBct_event_reliable()\fR function will fail if:
 .sp
@@ -198,7 +195,7 @@ available to be read.
 
 .sp
 .LP
-The The \fBct_event_get_nevid()\fR and \fBct_event_get_newct()\fR functions
+The \fBct_event_get_nevid()\fR and \fBct_event_get_newct()\fR functions
 will fail if:
 .sp
 .ne 2
@@ -210,7 +207,6 @@ The \fIevthndl\fR argument is not a \fBCT_EV_NEGEND\fR event object.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -228,7 +224,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibcontract\fR(3LIB), \fBcontract\fR(4), \fBattributes\fR(5),
 \fBlfcompile\fR(5)
diff --git a/usr/src/man/man3cpc/cpc_seterrhndlr.3cpc b/usr/src/man/man3cpc/cpc_seterrhndlr.3cpc
index 3ffb25daa7..4bdb77328e 100644
--- a/usr/src/man/man3cpc/cpc_seterrhndlr.3cpc
+++ b/usr/src/man/man3cpc/cpc_seterrhndlr.3cpc
@@ -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 CPC_SETERRHNDLR 3CPC "Jan 30, 2004"
+.TH CPC_SETERRHNDLR 3CPC "April 9, 2016"
 .SH NAME
 cpc_seterrhndlr \- control libcpc error reporting
 .SH SYNOPSIS
@@ -22,7 +22,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lcpc\fR [ \fIlibrary\fR\&.\|.
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 For the convenience of programmers instrumenting their code, several
 \fBlibcpc\fR(3LIB) functions automatically emit to \fBstderr\fR error messages
@@ -35,7 +34,7 @@ file.
 The \fBcpc_seterrhndlr()\fR function allows the caller to provide an alternate
 function for reporting errors. The type signature is shown in the SYNOPSIS. The
 \fIfn\fR argument is passed the library function name that detected the error,
-an integer subcode indicating the specific error condidtion that has occurred,
+an integer subcode indicating the specific error condition that has occurred,
 and the format string \fIfmt\fR that contains a textual description of the
 integer subcode. The format string \fIfmt\fR and argument pointer \fIap\fR can
 be passed directly to \fBvsnprintf\fR(3C) or similar \fIvarargs\fR-based
@@ -166,7 +165,6 @@ myapp_errfn(const char *fn, int subcode, const char *fmt, va_list ap)
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -184,7 +182,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcpc_bind_curlwp\fR(3CPC), \fBlibcpc\fR(3LIB), \fBvsnprintf\fR(3C),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man3curses/menu_item_current.3curses b/usr/src/man/man3curses/menu_item_current.3curses
index 48d266aec2..253ef03e31 100644
--- a/usr/src/man/man3curses/menu_item_current.3curses
+++ b/usr/src/man/man3curses/menu_item_current.3curses
@@ -4,7 +4,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 MENU_ITEM_CURRENT 3CURSES "Dec 31, 1996"
+.TH MENU_ITEM_CURRENT 3CURSES "April 9, 2016"
 .SH NAME
 menu_item_current, set_current_item, current_item, set_top_row, top_row,
 item_index \- set and get current menus items
@@ -38,11 +38,10 @@ item_index \- set and get current menus items
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The current item of a menu is the item where the cursor is currently
 positioned. \fBset_current_item()\fR sets the current item of \fImenu\fR to
-\fIitem\fR. \fBcurrent_item()\fR returns a pointer to the the current item in
+\fIitem\fR. \fBcurrent_item()\fR returns a pointer to the current item in
 \fImenu\fR.
 .sp
 .LP
@@ -55,7 +54,6 @@ number  of the menu row currently displayed at the top of \fImenu\fR.
 array. The value of this index ranges from \fB0\fR through \fIN\fR\fB-1\fR,
 where \fIN\fR is the total number of items connected to the menu.
 .SH RETURN VALUES
-.sp
 .LP
 \fBcurrent_item()\fR returns \fBNULL\fR on error.
 .sp
@@ -110,7 +108,6 @@ No items are connected to the menu.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -126,11 +123,9 @@ MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcurses\fR(3CURSES), \fBmenus\fR(3CURSES), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 The header \fB<menu.h>\fR automatically includes the headers  \fB<eti.h>\fR and
 \fB<curses.h>\fR\&.
diff --git a/usr/src/man/man3dat/dat_ep_disconnect.3dat b/usr/src/man/man3dat/dat_ep_disconnect.3dat
index 5fee6a3254..13e51e1281 100644
--- a/usr/src/man/man3dat/dat_ep_disconnect.3dat
+++ b/usr/src/man/man3dat/dat_ep_disconnect.3dat
@@ -4,7 +4,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 DAT_EP_DISCONNECT 3DAT "Jul 16, 2004"
+.TH DAT_EP_DISCONNECT 3DAT "April 9, 2016"
 .SH NAME
 dat_ep_disconnect \- terminate a connection or a connection establishment
 .SH SYNOPSIS
@@ -21,7 +21,6 @@ DAT_RETURN
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIep_handle\fR\fR
@@ -58,7 +57,6 @@ Graceful close.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBdat_ep_disconnect()\fR function requests a termination of a connection
 or connection establishment. This operation is used by the active/client or a
@@ -75,7 +73,7 @@ unsuccessfully, and in-progress DTOs and RMR Binds can be completed
 successfully or unsuccessfully. If an in-progress DTO is completed
 unsuccessfully, all follow on in-progress DTOs in the same direction also must
 be completed unsuccessfully. This order is presented to the Consumer through a
-DTO completion Event Stream of the \fIrecv_evd_handle\fR and and
+DTO completion Event Stream of the \fIrecv_evd_handle\fR and
 \fIrequest_evd_handle\fR of the Endpoint.
 .sp
 .LP
@@ -123,7 +121,6 @@ establishment, \fBDAT_EP_STATE_ACTIVE_CONNECTION_PENDING\fR and
 and transitions the local Endpoint into \fBDAT_EP_STATE_DISCONNECTED\fR. That
 causes preposted Recv DTOs to be flushed to \fIrecv_evd_handle\fR.
 .SH RETURN VALUES
-.sp
 .ne 2
 .na
 \fB\fBDAT_SUCCESS\fR\fR
@@ -170,7 +167,6 @@ disconnect.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -188,6 +184,5 @@ MT-Level	 Unsafe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibdat\fR(3LIB), \fBattributes\fR(5)
diff --git a/usr/src/man/man3ext/SUNW_C_GetMechSession.3ext b/usr/src/man/man3ext/SUNW_C_GetMechSession.3ext
index 0f9171562a..8dc3d31e61 100644
--- a/usr/src/man/man3ext/SUNW_C_GetMechSession.3ext
+++ b/usr/src/man/man3ext/SUNW_C_GetMechSession.3ext
@@ -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 SUNW_C_GETMECHSESSION 3EXT "Oct 27, 2005"
+.TH SUNW_C_GETMECHSESSION 3EXT "April 9, 2016"
 .SH NAME
 SUNW_C_GetMechSession, SUNW_C_KeyToObject \- PKCS#11 Cryptographic Framework
 functions
@@ -26,7 +26,6 @@ cc [ \fIflag \&.\|.\|.\fR ] \fIfile\fR\&.\|.\|. \fB-lpkcs11\fR [ \fIlibrary\&.\|
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 These functions implement the RSA PKCS#11 v2.20 specification by using plug-ins
 to provide the slots.
@@ -35,7 +34,7 @@ to provide the slots.
 The \fBSUNW_C_GetMechSession()\fR function initializes the PKCS#11
 cryptographic framework and performs all necessary calls to Standard PKCS#11
 functions (see \fBlibpkcs11\fR(3LIB)) to create a session capable of providing
-operations on the requested mechanism. It is not neccessary to call
+operations on the requested mechanism. It is not necessary to call
 \fBC_Initalize()\fR or \fBC_GetSlotList()\fR before the first call to
 \fBSUNW_C_GetMechSession()\fR.
 .sp
@@ -53,7 +52,6 @@ The \fBSUNW_C_KeyToObject()\fR function creates a key object for the specified
 mechanism from the \fIrawkey\fR data. The object should be destroyed with
 \fBC_DestroyObject()\fR when it is no longer required.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBSUNW_C_GetMechSession()\fR function returns the following values:
 .sp
@@ -165,14 +163,12 @@ A general error occurred.
 The return values of each of the implemented functions are defined and listed
 in the RSA PKCS#11 v2.20 specification. See http://www.rsasecurity.com.
 .SH USAGE
-.sp
 .LP
 These functions are not part of the RSA PKCS#11 v2.20 specification. They are
 not likely to exist on non-Solaris systems. They are provided as a convenience
 to application programmers. Use of these functions will make the application
 non-portable to other systems.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -190,7 +186,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibpkcs11\fR(3LIB), \fBattributes\fR(5)
 .sp
diff --git a/usr/src/man/man3ext/efi_alloc_and_init.3ext b/usr/src/man/man3ext/efi_alloc_and_init.3ext
index d2eee37e4f..ad82078869 100644
--- a/usr/src/man/man3ext/efi_alloc_and_init.3ext
+++ b/usr/src/man/man3ext/efi_alloc_and_init.3ext
@@ -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 EFI_ALLOC_AND_INIT 3EXT "May 8, 2008"
+.TH EFI_ALLOC_AND_INIT 3EXT "April 9, 2016"
 .SH NAME
 efi_alloc_and_init, efi_alloc_and_read, efi_free, efi_write, efi_use_whole_disk
 \- manipulate a disk's EFI Partition Table
@@ -38,13 +38,12 @@ cc [ \fIflag \&.\|.\|.\fR ] \fIfile\fR\&.\|.\|. \fB-lefi\fR [ \fIlibrary \&.\|.\
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBefi_alloc_and_init()\fR function initializes the \fBdk_gpt_t\fR
 structure specified by \fIvtoc\fR in preparation for a call to
 \fBefi_write()\fR. It calculates and initializes the \fBefi_version\fR,
 \fBefi_lbasize\fR, \fBefi_nparts\fR, \fBefi_first_u_lba\fR, \fBefi_last_lba\fR,
-and \fBefi_last_u_lba\fR members of this sturcture. The caller can then set the
+and \fBefi_last_u_lba\fR members of this structure. The caller can then set the
 \fBefi_nparts\fR member.
 .sp
 .LP
@@ -87,7 +86,6 @@ struct dk_part  efi_parts[];     /* array of partitions */
 .in -2
 
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBefi_alloc_and_init()\fR returns 0. Otherwise it
 returns \fBVT_EIO\fR if an I/O operation to the disk fails.
@@ -195,7 +193,6 @@ Space out of label was not found.
 .RE
 
 .SH USAGE
-.sp
 .LP
 The EFI label is used on disks with more than 1^32-1 blocks. For compatibility
 reasons, the \fBread_vtoc\fR(3EXT) and \fBwrite_vtoc()\fR functions should be
@@ -203,7 +200,6 @@ used on smaller disks. The application should attempt the \fBread_vtoc()\fR or
 \fBwrite_vtoc()\fR call, check for an error of \fBVT_ENOTSUP\fR, then call the
 analogous EFI function.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -221,7 +217,6 @@ MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBfmthard\fR(1M), \fBformat\fR(1M), \fBprtvtoc\fR(1M), \fBioctl\fR(2),
 \fBopen\fR(2), \fBlibefi\fR(3LIB), \fBread_vtoc\fR(3EXT), \fBattributes\fR(5),
diff --git a/usr/src/man/man3gss/gss_store_cred.3gss b/usr/src/man/man3gss/gss_store_cred.3gss
index c12194bc46..334e75d1e2 100644
--- a/usr/src/man/man3gss/gss_store_cred.3gss
+++ b/usr/src/man/man3gss/gss_store_cred.3gss
@@ -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 GSS_STORE_CRED 3GSS "Jun 30, 2005"
+.TH GSS_STORE_CRED 3GSS "April 9, 2016"
 .SH NAME
 gss_store_cred \- store a credential in the current credential store
 .SH SYNOPSIS
@@ -20,7 +20,6 @@ gss_store_cred \- store a credential in the current credential store
 .fi
 
 .SH PARAMETERS
-.sp
 .LP
 The parameter descriptions for \fBgss_store_cred()\fR follow:
 .sp
@@ -117,9 +116,8 @@ single mechanism in the \fIinput_cred_handle\fR. In all other cases,
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
-The \fBgss_store_cred()\fR function stores a credential in the the current
+The \fBgss_store_cred()\fR function stores a credential in the current
 GSS-API credential store for the calling process. Input credentials can be
 re-acquired through \fBgss_add_cred\fR(3GSS) and \fBgss_acquire_cred\fR(3GSS).
 .sp
@@ -143,7 +141,6 @@ effective UID.
 In general, acceptor applications should switch the current credential store by
 changing the effective UID before storing a delegated credential.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBgss_store_cred()\fR can return the following status codes:
 .sp
@@ -211,7 +208,6 @@ the \fIminor_status\fR parameter details the error condition.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -229,7 +225,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBgss_accept_sec_context\fR(3GSS), \fBgss_acquire_cred\fR(3GSS),
 \fBgss_add_cred\fR(3GSS), \fBgss_init_sec_context\fR(3GSS),
diff --git a/usr/src/man/man3head/fcntl.h.3head b/usr/src/man/man3head/fcntl.h.3head
index edefbc6d56..0e598a4155 100644
--- a/usr/src/man/man3head/fcntl.h.3head
+++ b/usr/src/man/man3head/fcntl.h.3head
@@ -8,7 +8,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 FCNTL.H 3HEAD "Feb 5, 2008"
+.TH FCNTL.H 3HEAD "April 9, 2016"
 .SH NAME
 fcntl.h, fcntl \- file control options
 .SH SYNOPSIS
@@ -18,7 +18,6 @@ fcntl.h, fcntl \- file control options
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fB<fcntl.h>\fR header defines the following requests and arguments for use
 by the functions \fBfcntl\fR(2), \fBopen\fR(2), and \fBopenat\fR(2).
@@ -507,7 +506,7 @@ working directory.
 \fB\fBAT_SYMLINK_NOFOLLOW\fR\fR
 .ad
 .RS 23n
-Flag passed to \fBfstatat\fR(2) and \fBfchownat\fR(2) to change the bahavior of
+Flag passed to \fBfstatat\fR(2) and \fBfchownat\fR(2) to change the behavior of
 these functions when they are given a file as an argument that is a symbolic
 link. In this case the functions operate on the symbolic link file rather than
 the file the link references.
@@ -553,7 +552,6 @@ long    f_id;     /* Process unique identifier */
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -571,13 +569,11 @@ Standard	See \fBstandards\fR(5).
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcreat\fR(2), \fBexec\fR(2), \fBfcntl\fR(2), \fBopen\fR(2),
 \fBfdatasync\fR(3C), \fBfsync\fR(3C), \fBfsattr\fR(5), \fBattributes\fR(5),
 \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 Data is successfully  transferred for a write operation to a regular file when
 the system ensures that all data written is readable on any subsequent open of
diff --git a/usr/src/man/man3head/langinfo.h.3head b/usr/src/man/man3head/langinfo.h.3head
index 68b0654c37..99cf84768e 100644
--- a/usr/src/man/man3head/langinfo.h.3head
+++ b/usr/src/man/man3head/langinfo.h.3head
@@ -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 LANGINFO.H 3HEAD "Aug 30, 2002"
+.TH LANGINFO.H 3HEAD "April 9, 2016"
 .SH NAME
 langinfo.h, langinfo \- language information constants
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ langinfo.h, langinfo \- language information constants
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The <\fBlanginfo.h\fR> header contains the constants used to identify items of
 \fBlanginfo\fR data (see \fBnl_langinfo\fR(3C)). The type of the constant,
@@ -171,7 +170,9 @@ _
 \fBNOSTR\fR	\fBLC_MESSAGES\fR	negative response ro yes/no queries
 _
 \fBCRNCYSTR\fR	\fBLC_MONETARY\fR	T{
-local currency symbol, preceded by '-' if the symbol sould appear before the value, '+' if the symbol should appear after the value, or '.' if the symbol should replace the radix character
+local currency symbol, preceded by '-' if the symbol should appear before the
+value, '+' if the symbol should appear after the value, or '.' if the symbol
+should replace the radix character
 T}
 .TE
 
@@ -194,7 +195,6 @@ char *nl_langinfo(nl_item);
 Inclusion of <\fBlanginfo.h\fR> header may also make visible all symbols from
 <\fBnl_types.h\fR>.
 .SH USAGE
-.sp
 .LP
 Wherever possible, users are advised to use functions compatible with those in
 the ISO C standard to access items of \fBlanginfo\fR data. In particular, the
@@ -203,7 +203,6 @@ defined in category \fBLC_TIME\fR. The \fBlocaleconv\fR(3C) function should be
 used to access information corresponding to \fBRADIXCHAR\fR, \fBTHOUSEP\fR, and
 \fBCRNCYSTR\fR.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -219,7 +218,6 @@ Interface Stability	Standard
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBmkmsgs\fR(1), \fBlocaleconv\fR(3C), \fBnl_langinfo\fR(3C),
 \fBnl_types.h\fR(3HEAD), \fBsetlocale\fR(3C), \fBstrftime\fR(3C),
diff --git a/usr/src/man/man3ldap/ldap.3ldap b/usr/src/man/man3ldap/ldap.3ldap
index 1b72738ee2..79e283fa62 100644
--- a/usr/src/man/man3ldap/ldap.3ldap
+++ b/usr/src/man/man3ldap/ldap.3ldap
@@ -4,7 +4,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 LDAP 3LDAP "Jan 27, 2002"
+.TH LDAP 3LDAP "April 9, 2016"
 .SH NAME
 ldap \- Lightweight Directory Access Protocol package
 .SH SYNOPSIS
@@ -16,7 +16,6 @@ cc[ \fIflag\fR... ] \fIfile\fR... -lldap[ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The Lightweight Directory Access Protocol ("LDAP") package (SUNWlldap) includes
 various command line LDAP clients and a LDAP client library to provide
@@ -45,7 +44,6 @@ Asynchronous routines provide an invocation identifier which can be used to
 obtain the  result of a specific operation by passing it to
 the\fBldap_result\fR(3LDAP) function.
 .SS "Initializing a LDAP session"
-.sp
 .LP
 Initializing a LDAP session involves calling the \fBldap_init\fR(3LDAP)
 function. However, the call does not actually open a connection to the LDAP
@@ -54,7 +52,6 @@ connection is opened when the first operation is attempted. Unlike
 \fBldap_init()\fR, \fBldap_open\fR(3LDAP) attempts to open a connection with
 the LDAP server. However, the use of \fBldap_open()\fR is deprecated.
 .SS "Authenticating to a LDAP server"
-.sp
 .LP
 The \fBldap_sasl_bind\fR(3LDAP) and \fBldap_sasl_bind_s\fR(3LDAP) functions
 provide general and extensible authenticaton for an LDAP client to a LDAP
@@ -63,7 +60,6 @@ routines \fBldap_simple_bind\fR(3LDAP) and \fBldap_simple_bind_s\fR(3LDAP) use
 cleartext passwords to bind to the LDAP server. Use of \fBldap_bind\fR(3LDAP)
 and \fBldap_bind_s\fR(3LDAP)(3LDAP) is deprecated.
 .SS "Searching a LDAP directory"
-.sp
 .LP
 Search for an entry in a LDAP directory by calling the
 \fBldap_search_ext\fR(3LDAP) or the \fBldap_search_ext_s\fR(3LDAP) functions.
@@ -72,7 +68,6 @@ size and time limits as arguments for each search operation.
 \fBldap_search\fR(3LDAP) and \fBldap_search_s\fR(3LDAP) are identical functions
 but do not support the controls and limits as arguments to the call.
 .SS "Adding or Deleting an entry"
-.sp
 .LP
 Use \fBldap_add_ext\fR(3LDAP) and \fBldap_delete_ext\fR(3LDAP) to add or delete
 entries in a LDAP directory server. The synchronous counterparts to these
@@ -81,7 +76,6 @@ The \fBldap_add\fR(3LDAP), \fBldap_add_s\fR(3LDAP), \fBldap_delete\fR(3LDAP),
 and \fBldap_delete_s\fR(3LDAP) provide identical functionality to add and to
 delete entries, but they do not support LDAP v3 server and client controls.
 .SS "Modifying Entries"
-.sp
 .LP
 Use \fBldap_modify_ext\fR(3LDAP) and \fBldap_modify_ext_s\fR(3LDAP) to modify
 an existing entry in a LDAP server that supports for LDAPv3 server and client
@@ -90,18 +84,16 @@ controls. Similarly, use \fBldap_rename\fR(3LDAP) and
 \fBldap_modrdn\fR(3LDAP), \fBldap_modrdn_s\fR(3LDAP), \fBldap_modrdn2\fR(3LDAP)
 and \fBldap_modrdn2_s\fR(3LDAP) interfaces are deprecated.
 .SS "Obtaining Results"
-.sp
 .LP
 Use \fBldap_result\fR(3LDAP) to obtain the results of a previous asynchronous
 operation. For all LDAP operations other than search, only one message is
 returned. For the search operation, a list of result messages can be returned.
 .SS "Handling Errors and Parsing Results"
-.sp
 .LP
 Use the \fBldap_parse_result\fR(3LDAP),
 \fBldap_parse_sasl_bind_result\fR(3LDAP), and the
 \fBldap_parse_extended_result\fR(3LDAP) functions to extract required
-information from results and and to handle the returned errors. To covert a
+information from results and to handle the returned errors. To convert a
 numeric error code into a null-terminated character string message describing
 the error, use \fBldap_err2string\fR(3LDAP). The \fBldap_result2error\fR(3LDAP)
 and \fBldap_perror\fR(3LDAP) functions are deprecated. To step through the list
@@ -129,26 +121,22 @@ returns an array of an attribute's string values that matches a specified
 language subtype. To retrieve the binary data from an attribute, call the
 \fBldap_get_lang_values_len()\fR function instead.
 .SS "Uniform Resource Locators (URLS)"
-.sp
 .LP
 You can use the \fBldap_url\fR(3LDAP)functions to test a URL to verify that it
 is an LDAP URL, to parse LDAP URLs into their component pieces, to initiate
 searches directly using an LDAP URL, and to retrieve the URL associated with a
 DNS domain name or a distinguished name.
 .SS "User Friendly Naming"
-.sp
 .LP
 The \fBldap_ufn\fR(3LDAP) functions implement a user friendly naming scheme by
 means of LDAP. This scheme allows you to look up entries using fuzzy, untyped
 names like "mark smith, umich, us".
 .SS "Caching"
-.sp
 .LP
 The \fBldap_memcache\fR(3LDAP) functions provide an in-memory client side cache
 to store search requests. Caching improves performance and reduces network
 bandwidth when a client  makes repeated requests.
 .SS "Utility Functions"
-.sp
 .LP
 There are also various utility functions. You can use the
 \fBldap_sort\fR(3LDAP) functions are used to sort the entries and values
@@ -158,7 +146,6 @@ longer  "friendlier" names. Use the \fBldap_charset\fR(3LDAP) functions to
 translate to and from the T.61 character set that is used for many character
 strings in the LDAP protocol.
 .SS "Generating Filters"
-.sp
 .LP
 Make calls to \fBldap_init_getfilter\fR(3LDAP) and \fBldap_search\fR(3LDAP) to
 generate filters to be used in \fBldap_search\fR(3LDAP) and
@@ -168,7 +155,6 @@ generate filters to be used in \fBldap_search\fR(3LDAP) and
 \fIbuf\fR of length \fIbuflen\fR. \fBldap_getfilter_free\fR(3LDAP) frees memory
 that has been allocated by means of \fBldap_init_getfilter()\fR.
 .SS "BER Library"
-.sp
 .LP
 The LDAP package includes a set of lightweight Basic Encoding Rules ("BER)"
 functions. The LDAP library functions use the BER functions to encode and
@@ -177,7 +163,6 @@ LDAP. They are not normally used directly by an LDAP  application program will
 not normally use the BER functions directly. Instead, these functions provide a
 \fBprintf()\fR and \fBscanf()\fR-like interface, as well as lower-level access.
 .SH LIST OF INTERFACES
-.sp
 .ne 2
 .na
 \fB\fBldap_open\fR(3LDAP)\fR
@@ -1589,7 +1574,6 @@ Free memory allocated by LDAP API functions.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -1605,6 +1589,5 @@ Stability Level	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5)
diff --git a/usr/src/man/man3ldap/ldap_abandon.3ldap b/usr/src/man/man3ldap/ldap_abandon.3ldap
index 18242ca6a1..2a5d87bd08 100644
--- a/usr/src/man/man3ldap/ldap_abandon.3ldap
+++ b/usr/src/man/man3ldap/ldap_abandon.3ldap
@@ -4,7 +4,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 LDAP_ABANDON 3LDAP "Jan 27, 2002"
+.TH LDAP_ABANDON 3LDAP "April 9, 2016"
 .SH NAME
 ldap_abandon \- abandon an LDAP operation in progress
 .SH SYNOPSIS
@@ -18,7 +18,6 @@ cc[ \fIflag\fR... ] \fIfile\fR... -lldap[ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBldap_abandon()\fR function is used to abandon or cancel an LDAP
 operation in progress.  The \fImsgid\fR passed should be the message id of an
@@ -28,18 +27,16 @@ outstanding LDAP operation, as returned by \fBldap_search\fR(3LDAP),
 .LP
 \fBldap_abandon\fR(\|) checks to see if the result of the operation has already
 come in.  If it has, it deletes it from the queue of pending messages.  If not,
-it sends an LDAP abandon operation to the the LDAP server.
+it sends an LDAP abandon operation to the LDAP server.
 .sp
 .LP
 The caller can expect that the result of an abandoned operation will not be
 returned from a future call to \fBldap_result\fR(3LDAP).
 .SH ERRORS
-.sp
 .LP
 \fBldap_abandon()\fR returns  \fB0\fR if successful or \fB\(mi1\fRotherwise and
 setting \fIld_errno\fR appropriately. See \fBldap_error\fR(3LDAP) for details.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -54,7 +51,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBldap\fR(3LDAP), \fBldap_result\fR(3LDAP), \fBldap_error\fR(3LDAP),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man3ldap/ldap_memcache.3ldap b/usr/src/man/man3ldap/ldap_memcache.3ldap
index b493d30377..8a72c74c0e 100644
--- a/usr/src/man/man3ldap/ldap_memcache.3ldap
+++ b/usr/src/man/man3ldap/ldap_memcache.3ldap
@@ -4,7 +4,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 LDAP_MEMCACHE 3LDAP "Jan 6, 2003"
+.TH LDAP_MEMCACHE 3LDAP "April 9, 2016"
 .SH NAME
 ldap_memcache, ldap_memcache_init, ldap_memcache_set, ldap_memcache_get,
 ldap_memcache_flush, ldap_memcache_destroy, ldap_memcache_update \- LDAP client
@@ -46,7 +46,6 @@ caching functions
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Use the \fBldap_memcache\fR functions to maintain an in-memory client side
 cache to store search requests. Caching improves performance and reduces
@@ -61,7 +60,7 @@ Make a call to \fBldap_memcache_init()\fR to create the in-memory client side
 \fIcache\fR. The function passes back a pointer to an \fBLDAPMemCache\fR
 structure, which represents the \fIcache\fR. Make a call to the
 \fBldap_memcache_set()\fR function to associate this \fIcache\fR with an LDAP
-connection handle, an LDAP structure. \fIttl\fR is the the maximum  amount of
+connection handle, an LDAP structure. \fIttl\fR is the maximum amount of
 time (in seconds) that an item can be cached. If a \fIttl\fR value  of 0 is
 passed, there is no limit to the amount of time that an item  can be cached.
 \fIsize\fR is the maximum amount of memory (in bytes) that the cache will
@@ -132,7 +131,6 @@ update the \fIcache\fR at this point in time. This function is only  useful in
 a multithreaded application, since it will not return until the \fIcache\fR is
 destroyed.
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIttl\fR\fR
@@ -215,13 +213,11 @@ The search requests that you want flushed from the \fIcache\fR
 .RE
 
 .SH ERRORS
-.sp
 .LP
 The functions that have \fBint\fR return values return \fBLDAP_SUCCESS\fR if
 the operation was successful. Otherwise, they return another LDAP error code.
 See \fBldap_error\fR(3LDAP) for a list of the LDAP error codes.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -237,7 +233,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBldap_error\fR(3LDAP), \fBldap_open\fR(3LDAP), \fBldap_search\fR(3LDAP),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man3lgrp/lgrp_latency.3lgrp b/usr/src/man/man3lgrp/lgrp_latency.3lgrp
index f89a7b4ab9..c197215a31 100644
--- a/usr/src/man/man3lgrp/lgrp_latency.3lgrp
+++ b/usr/src/man/man3lgrp/lgrp_latency.3lgrp
@@ -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 LGRP_LATENCY 3LGRP "Jan 26, 2005"
+.TH LGRP_LATENCY 3LGRP "April 9, 2016"
 .SH NAME
 lgrp_latency, lgrp_latency_cookie \- get latency between two lgroups
 .SH SYNOPSIS
@@ -22,7 +22,6 @@ cc [ \fIflag\fR... ] \fIfile\fR... \fB-llgrp\fR [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBlgrp_latency_cookie()\fR function takes a cookie representing a snapshot
 of the lgroup hierarchy obtained from \fBlgrp_init\fR(3LGRP) and returns the
@@ -48,19 +47,17 @@ It does not necessarily represent the actual latency between hardware devices,
 and it might not be applicable across platforms.
 .sp
 .LP
-The \fBlgrp_latency()\fR function is similiar to the
+The \fBlgrp_latency()\fR function is similar to the
 \fBlgrp_latency_cookie()\fR function, but returns the latency between the given
 lgroups at the given instant in time. Since lgroups can be freed and
 reallocated, this function might not be able to provide a consistent answer
 across calls. For that reason, the \fBlgrp_latency_cookie()\fR function should
 be used in its place.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, the latency value is returned. Otherwise \(mi1 is
 returned and \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBlgrp_latency_cookie()\fR and \fBlgrp_latency()\fR functions will fail
 if:
@@ -85,7 +82,6 @@ any CPUs, or the \fIto\fR lgroup does not have any memory.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -103,7 +99,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlgrp_init\fR(3LGRP), \fBlgrp_parents\fR(3LGRP), \fBlgrp_children\fR(3LGRP),
 \fBliblgrp\fR(3LIB), \fBattributes\fR(5)
diff --git a/usr/src/man/man3lgrp/lgrp_view.3lgrp b/usr/src/man/man3lgrp/lgrp_view.3lgrp
index 84dc33c7b0..809c61e689 100644
--- a/usr/src/man/man3lgrp/lgrp_view.3lgrp
+++ b/usr/src/man/man3lgrp/lgrp_view.3lgrp
@@ -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 LGRP_VIEW 3LGRP "Apr 16, 2003"
+.TH LGRP_VIEW 3LGRP "April 9, 2016"
 .SH NAME
 lgrp_view \- get view of lgroup hierarchy
 .SH SYNOPSIS
@@ -16,7 +16,6 @@ cc [ \fIflag \&.\|.\|.\fR ] \fIfile\fR\&.\|.\|. \fB-llgrp\fR [ \fIlibrary \&.\|.
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBlgrp_view()\fR function takes a \fIcookie\fR representing the snapshot
 of the lgroup hierarchy obtained from \fBlgrp_init\fR(3LGRP) and returns the
@@ -28,13 +27,11 @@ resources that are available to the caller (such as those with respect to
 processor sets).  When the view is \fBLGRP_VIEW_OS\fR, the snapshot contains
 what is available to the operating system.
 .SH RETURN VALUES
-.sp
 .LP
-Upon succesful completion, \fBlgrp_view()\fR returns the view for the snapshot
+Upon successful completion, \fBlgrp_view()\fR returns the view for the snapshot
 of the lgroup hierarchy represented by the given cookie.  Otherwise, \(mi1 is
 returned and \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBlgrp_view()\fR function will fail if:
 .sp
@@ -47,7 +44,6 @@ The \fIcookie\fR is not valid.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -65,7 +61,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlgrp_cookie_stale\fR(3LGRP), \fBlgrp_fini\fR(3LGRP), \fBlgrp_init\fR(3LGRP),
 \fBliblgrp\fR(3LIB), \fBattributes\fR(5)
diff --git a/usr/src/man/man3lib/libkrb5.3lib b/usr/src/man/man3lib/libkrb5.3lib
index 375d0d2183..e5a68aa1f2 100644
--- a/usr/src/man/man3lib/libkrb5.3lib
+++ b/usr/src/man/man3lib/libkrb5.3lib
@@ -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 LIBKRB5 3LIB "Sep 2, 2009"
+.TH LIBKRB5 3LIB "April 9, 2016"
 .SH NAME
 libkrb5 \- MIT Kerberos 5 library
 .SH SYNOPSIS
@@ -15,20 +15,18 @@ libkrb5 \- MIT Kerberos 5 library
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The functions in this library are the routines that comprise the MIT Kerberos 5
 library.
 .SH INTERFACES
-.sp
 .LP
 The shared object \fBlibkrb5.so\fR provides the public interface defined below.
 .sp
 .LP
 The \fBkrb5\fR library is provided as a convenience to allow native \fBkrb5\fR
-applications to be built and to run. Compatability between Solaris releases of
+applications to be built and to run. Compatibility between Solaris releases of
 the \fBkrb5\fR interface is not guaranteed. For new applications that require
-these features, \fBlibgss\fR(3LIB) is recomended.
+these features, \fBlibgss\fR(3LIB) is recommended.
 .sp
 .LP
 For detailed documentation on the \fBkrb5\fR interface, see the MIT Kerberos 5
@@ -71,7 +69,6 @@ The \fBkrb5_string_to_key\fR and \fBkrb5_string_to_key\fR routines, listed in
 \fBkrb5.h\fR section, are part of the old cryptosystem and should not be used
 in new apps.
 .SS "com_err.h"
-.br
 .in +2
 \fBcom_err\fR
 .in -2
@@ -84,7 +81,6 @@ in new apps.
 \fBerror_message\fR
 .in -2
 .SS "krb5.h"
-.br
 .in +2
 \fBkrb5_address_compare\fR
 .in -2
@@ -945,7 +941,6 @@ in new apps.
 \fBkrb5_xfree_wrap\fR
 .in -2
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/libkrb5.so.1\fR\fR
@@ -964,7 +959,6 @@ shared object
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -982,6 +976,5 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkrb5-config\fR(1), \fBlibgss\fR(3LIB), \fBattributes\fR(5)
diff --git a/usr/src/man/man3lib/libpool.3lib b/usr/src/man/man3lib/libpool.3lib
index dda52516f5..9256db1801 100644
--- a/usr/src/man/man3lib/libpool.3lib
+++ b/usr/src/man/man3lib/libpool.3lib
@@ -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 LIBPOOL 3LIB "Dec 14, 2006"
+.TH LIBPOOL 3LIB "April 9, 2016"
 .SH NAME
 libpool \- pool configuration manipulation library
 .SH SYNOPSIS
@@ -14,10 +14,9 @@ libpool \- pool configuration manipulation library
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The functions in this library define the interface for reading and writing
-resource pools configuration files, as well as that for commiting an existing
+resource pools configuration files, as well as that for committing an existing
 configuration to becoming the running OS configuration (with respect to
 partitioning subsystems). The <\fBpool.h\fR> header provides type and function
 declarations for all library services.
@@ -70,9 +69,6 @@ used by the default pools commands, except when a configuration is initiated by
 the \fBpoolcfg\fR utility, in which case an informative message is placed in
 the \fBsystem.comment\fR property for that configuration.
 .SS "System"
-.sp
-
-.sp
 .TS
 c c c
 l l l .
@@ -195,9 +191,6 @@ objective when he is relatively satisfied with the constraints established
 using the minimum and maximum properties and would like the DRP to manipulate
 resources freely within those constraints.
 .SS "Pools"
-.sp
-
-.sp
 .TS
 c c c
 l l l .
@@ -232,9 +225,6 @@ If pool.scheduler is specified, it must be set to the name of a valid
 scheduling class for the system. See the \fB-c\fR option for \fBpriocntl\fR(1)
 for a list of valid class names.
 .SS "Processor Sets"
-.sp
-
-.sp
 .TS
 c c c
 l l l .
@@ -376,9 +366,6 @@ Only one objective of each type of operator can be set. For example, if the
 possible to set a \fB<\fR and a \fB>\fR operator together; the values will be
 validated to ensure that they do not overlap.
 .SS "Processors"
-.sp
-
-.sp
 .TS
 c c c
 l l l .
@@ -395,7 +382,7 @@ T}
 .sp
 .LP
 The \fBcpu.comment\fR, \fBcpu.pinned\fR, and \fBcpu.status\fR properties are
-writeable.
+writable.
 .sp
 .LP
 The \fBcpu.status\fR property can be set only to the following values:
@@ -431,7 +418,6 @@ Disable interrupt processing on the CPU.
 These values are defined in <\fBsys/processor.h\fR> as the \fBPS_OFFLINE\fR,
 \fBPS_ONLINE\fR, and \fBPS_NOINTR\fR macros.
 .SH INTERFACES
-.sp
 .LP
 The shared object \fBlibpool.so.1\fR provides the public interfaces defined
 below. See \fBIntro\fR(3) for additional information on shared object
@@ -480,7 +466,6 @@ l l .
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/libpool.so.1\fR\fR
@@ -499,7 +484,6 @@ shared object
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -519,7 +503,6 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBIntro\fR(3), \fBpool_component_info\fR(3POOL), \fBpool_conf_open\fR(3POOL),
 \fBpool_conf_to_elem\fR(3POOL), \fBpool_create\fR(3POOL),
@@ -528,7 +511,6 @@ MT-Level	Safe
 \fBpool_resource_create\fR(3POOL), \fBpool_value_alloc\fR(3POOL),
 \fBpool_walk_pools\fR(3POOL), \fBattributes\fR(5), \fBsmf\fR(5)
 .SH NOTES
-.sp
 .LP
 Functions in \fBlibpool\fR can be used to manipulate static configurations even
 when the pools facility is not enabled. See \fBpooladm\fR(1M) and
diff --git a/usr/src/man/man3nsl/secure_rpc.3nsl b/usr/src/man/man3nsl/secure_rpc.3nsl
index c592796334..2f699585ce 100644
--- a/usr/src/man/man3nsl/secure_rpc.3nsl
+++ b/usr/src/man/man3nsl/secure_rpc.3nsl
@@ -4,7 +4,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 SECURE_RPC 3NSL "Feb 19, 2004"
+.TH SECURE_RPC 3NSL "April 9, 2016"
 .SH NAME
 secure_rpc, authdes_getucred, authdes_seccreate, getnetname, host2netname,
 key_decryptsession, key_encryptsession, key_gendes, key_setsecret,
@@ -80,7 +80,6 @@ routines for secure remote procedure calls
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBRPC\fR library functions allow C programs to make procedure calls on
 other machines across the network.
@@ -231,7 +230,7 @@ functions \fBkey_encryptsession()\fR, \fBkey_gendes()\fR, and
 \fBkey_setsecret()\fR.
 .sp
 The \fBkey_decryptsession()\fR function takes a server netname \fIremotename\fR
-and a \fBDES\fR key \fIdeskey\fR, and decrypts the key by using the the public
+and a \fBDES\fR key \fIdeskey\fR, and decrypts the key by using the public
 key of the server and the secret key associated with the effective \fBUID\fR of
 the calling process. The \fBkey_decryptsession()\fR function is the inverse of
 \fBkey_encryptsession()\fR function.
@@ -245,7 +244,7 @@ the calling process. The \fBkey_decryptsession()\fR function is the inverse of
 .RS 26n
 This function is a keyserver interface that takes a server netname
 \fIremotename\fR and a \fBDES\fR key \fIdeskey\fR, and encrypts the key using
-the public key of the the server and the secret key associated with the
+the public key of the server and the secret key associated with the
 effective \fBUID\fR of the calling process. If the keyserver does not have a
 key registered for the UID, it falls back to using the secret key for the
 netname \fBnobody\fR unless this feature has been disabled. See
@@ -336,7 +335,6 @@ succeeds and \fB0\fR if it fails. The function is the inverse of
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -352,7 +350,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBchkey\fR(1), \fBkeylogin\fR(1), \fBkeyserv\fR(1M), \fBnewkey\fR(1M),
 \fBrpc\fR(3NSL), \fBrpc_clnt_auth\fR(3NSL), \fBattributes\fR(5)
diff --git a/usr/src/man/man3nsl/t_errno.3nsl b/usr/src/man/man3nsl/t_errno.3nsl
index f41bb2ebc2..b9bec190b0 100644
--- a/usr/src/man/man3nsl/t_errno.3nsl
+++ b/usr/src/man/man3nsl/t_errno.3nsl
@@ -7,7 +7,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 T_ERRNO 3NSL "May 7, 1998"
+.TH T_ERRNO 3NSL "April 9, 2016"
 .SH NAME
 t_errno \- XTI error return value
 .SH SYNOPSIS
@@ -17,13 +17,12 @@ t_errno \- XTI error return value
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 This error return value is part of the XTI interfaces that evolved from the TLI
 interfaces. XTI represents the future evolution of these interfaces. However,
 TLI interfaces are supported for compatibility. When using a TLI interface that
 has the same name as an XTI interfaces, a different headerfile,
-<\fBtiuser.h\fR>, must be used. Refer the the TLI COMPATIBILITY section for a
+<\fBtiuser.h\fR>, must be used. Refer to the TLI COMPATIBILITY section for a
 description of differences between the two interfaces.
 .sp
 .LP
@@ -51,7 +50,6 @@ undefined.
 The symbolic values stored in  \fBt_errno\fR by an XTI function are defined in
 the \fBERRORS\fR sections in all relevant XTI function definition pages.
 .SH TLI COMPATIBILITY
-.sp
 .LP
 \fBt_errno\fR is also used by TLI functions to return error values.
 .sp
@@ -60,7 +58,6 @@ The \fBXTI\fR and \fBTLI\fR interface definitions have common names but use
 different header files. This, and other semantic differences between the two
 interfaces are described in the subsections below.
 .SS "Interface Header"
-.sp
 .LP
 The \fBXTI\fR interfaces use the header file, <\fBxti.h\fR>. \fBTLI\fR
 interfaces should \fInot\fR use this header.  They should use the header:
@@ -69,7 +66,6 @@ interfaces should \fInot\fR use this header.  They should use the header:
 \fB#include <tiuser.h>\fR
 .in -2
 .SS "Error Description Values"
-.sp
 .LP
 The \fBt_errno\fR values that can be set by the \fBXTI\fR interface but cannot
 be set by the \fBTLI\fR interface are:
@@ -110,7 +106,6 @@ be set by the \fBTLI\fR interface are:
 \fBTPROTO\fR
 .in -2
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -126,6 +121,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5)
diff --git a/usr/src/man/man3papi/papiAttributeListAddValue.3papi b/usr/src/man/man3papi/papiAttributeListAddValue.3papi
index fad0b32f91..c34edc35ca 100644
--- a/usr/src/man/man3papi/papiAttributeListAddValue.3papi
+++ b/usr/src/man/man3papi/papiAttributeListAddValue.3papi
@@ -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 PAPIATTRIBUTELISTADDVALUE 3PAPI "Jan 17, 2007"
+.TH PAPIATTRIBUTELISTADDVALUE 3PAPI "April 9, 2016"
 .SH NAME
 papiAttributeListAddValue, papiAttributeListAddBoolean,
 papiAttributeListAddCollection, papiAttributeListAddDatetime,
@@ -168,7 +168,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lpapi\fR [ \fIlibrary\fR\&.\|
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIattrs\fR\fR
@@ -457,7 +456,6 @@ vertical (y) component of a resolution
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpapiAttributeListAdd*()\fR functions add new attributes and/or values to
 the attribute list passed in. If necessary, the attribute list passed in is
@@ -529,7 +527,6 @@ The \fBpapiAttributeListToString()\fR function converts an attribute list to a
 string representation that can be displayed to a user.  The delimiter value is
 placed between attributes in the string.
 .SH RETURN VALUES
-.sp
 .LP
 These functions return \fBPAPI_OK\fR upon successful completion and one of the
 following on failure:
@@ -621,7 +618,7 @@ main(int ac, char *av[])
         printf("Attribute list to big to dump\en");
 
 
-    /* retreive various elements */
+    /* retrieve various elements */
     integer = 12;
     (void) papiAttributeListGetInteger(list, NULL, "copies", &integer);
     printf("copies: %d\en", integer);
@@ -639,7 +636,6 @@ main(int ac, char *av[])
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -657,6 +653,5 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibpapi\fR(3LIB), \fBattributes\fR(5)
diff --git a/usr/src/man/man3papi/papiServiceCreate.3papi b/usr/src/man/man3papi/papiServiceCreate.3papi
index 65a95d83e1..0e4477f8b1 100644
--- a/usr/src/man/man3papi/papiServiceCreate.3papi
+++ b/usr/src/man/man3papi/papiServiceCreate.3papi
@@ -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 PAPISERVICECREATE 3PAPI "Jan 17, 2007"
+.TH PAPISERVICECREATE 3PAPI "April 9, 2016"
 .SH NAME
 papiServiceCreate, papiServiceDestroy, papiServiceSetUserName,
 papiServiceSetPassword, papiServiceSetEncryption, papiServiceSetAuthCB,
@@ -94,7 +94,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lpapi\fR [ \fIlibrary\fR\&.\|
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIapp_data\fR\fR
@@ -156,7 +155,7 @@ information and setting a password.
 \fB\fIs\fR\fR
 .ad
 .RS 16n
-the service context passed into the the authentication callback
+the service context passed into the authentication callback
 .RE
 
 .sp
@@ -194,7 +193,6 @@ authentication with the print service.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpapiServiceCreate()\fR function creates a service context for use in
 subsequent calls to \fBlibpapi\fR functions.  The context is returned in the
@@ -216,7 +214,6 @@ The remaining \fBpapiServiceGet*()\fR functions return the requested
 information associated with the service context.  A value of \fINULL\fR
 indicates that the requested value was not initialized or is unavailable.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBpapiServiceCreate()\fR and the
 \fBpapiServiceSet*()\fR functions return \fBPAPI_OK\fR. Otherwise, they return
@@ -292,7 +289,6 @@ main(int ac, char *av[])
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -310,6 +306,5 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibpapi\fR(3LIB), \fBattributes\fR(5)
diff --git a/usr/src/man/man3perl/Lgrp.3perl b/usr/src/man/man3perl/Lgrp.3perl
index 7f8415eca4..6064e535c3 100644
--- a/usr/src/man/man3perl/Lgrp.3perl
+++ b/usr/src/man/man3perl/Lgrp.3perl
@@ -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 LGRP 3PERL "Aug 30, 2006"
+.TH LGRP 3PERL "April 9, 2016"
 .SH NAME
 Lgrp \- Perl interface to Solaris liblgrp library
 .SH SYNOPSIS
@@ -82,7 +82,6 @@ $latency = lgrp_latency_cookie($\fIcookie\fR, $\fIfrom\fR, $\fIto\fR);
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 This module provides access to the \fBliblgrp\fR(3LIB) library and to various
 constants and functions defined in <\fBsys/lgrp_sys.h\fR>. It provides both the
@@ -99,7 +98,6 @@ Functions returning a list value return the number of elements in the list when
 called in scalar context. In the event of error, the empty list is returned in
 the array context and \fBundef\fR is returned in the scalar context.
 .SS "Constants"
-.sp
 .LP
 The constants are exported with \fB:CONSTANTS\fR or \fB:ALL\fR tags:
 .sp
@@ -202,7 +200,6 @@ The following constants are available for use in Perl programs:
 .LP
 (1) Available for versions of the \fBliblgrp\fR(3LIB) API greater than 1.
 .SS "Functions"
-.sp
 .LP
 A detailed description of each function follows. Since this module is intended
 to provide a Perl interface to the functions in \fBliblgrp\fR(3LIB), a very
@@ -264,7 +261,7 @@ resources that are available to the caller (such as those with respect to
 processor sets). When the view is \fBLGRP_VIEW_OS\fR, the snapshot contains
 what is available to the operating system.
 .sp
-Upon succesful completion, the function returns the view for the snapshot of
+Upon successful completion, the function returns the view for the snapshot of
 the lgroup hierarchy represented by the given cookie.  Otherwise, \fBundef\fR
 is returned and \fB$!\fR is set to indicate the error.
 .sp
@@ -609,7 +606,7 @@ See \fBlgrp_latency_cookie\fR(3LGRP) for more information.
 .ad
 .sp .6
 .RS 4n
-This function is similiar to the \fBlgrp_latency_cookie()\fR function, but
+This function is similar to the \fBlgrp_latency_cookie()\fR function, but
 returns the latency between the given lgroups at the given instant in time.
 Since lgroups can be freed and reallocated, this function might not be able to
 provide a consistent answer across calls. For that reason,
@@ -701,7 +698,6 @@ Otherwise it returns False.
 .RE
 
 .SS "Object methods"
-.sp
 .ne 2
 .na
 \fB\fBnew\fR([$\fIview\fR])\fR
@@ -918,7 +914,6 @@ $\fIfrom\fR lgroup to a hardware resource in the $\fIto\fR lgroup. It uses
 .RE
 
 .SS "Exports"
-.sp
 .LP
 By default nothing is exported from this module. The following tags can be used
 to selectively import constants and functions defined in this module:
@@ -979,7 +974,6 @@ to selectively import constants and functions defined in this module:
 .RE
 
 .SS "Error values"
-.sp
 .LP
 The functions in this module return \fBundef\fR or an empty list when an
 underlying library function fails. The \fB$!\fR is set to provide more
@@ -1023,7 +1017,6 @@ The specified process or thread was not found.
 .RE
 
 .SS "Difference in the API versions"
-.sp
 .LP
 The \fBliblgrp\fR(3LIB) library is versioned. The exact version that was used
 to compile a module is available through the \fBlgrp_version()\fR function.
@@ -1062,7 +1055,6 @@ version 1. The \fBlgrp_resources()\fR function is defined for version 1 but
 always returns an empty list. The \fBlgrp_latency_cookie()\fR function is an
 alias for \fBlgrp_latency()\fR for version 1.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1078,7 +1070,6 @@ Interface Stability	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlgrp_affinity_get\fR(3LGRP), \fBlgrp_affinity_set\fR(3LGRP),
 \fBlgrp_children\fR(3LGRP), \fBlgrp_cookie_stale\fR(3LGRP),
diff --git a/usr/src/man/man3picl/picl_get_frutree_parent.3picl b/usr/src/man/man3picl/picl_get_frutree_parent.3picl
index 33e9e2f08f..81cdfec3ba 100644
--- a/usr/src/man/man3picl/picl_get_frutree_parent.3picl
+++ b/usr/src/man/man3picl/picl_get_frutree_parent.3picl
@@ -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 PICL_GET_FRUTREE_PARENT 3PICL "Feb 5, 2004"
+.TH PICL_GET_FRUTREE_PARENT 3PICL "April 9, 2016"
 .SH NAME
 picl_get_frutree_parent \- get frutree parent node for a given device node
 .SH SYNOPSIS
@@ -17,21 +17,18 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lpicl\fR [ \fIlibrary\fR\&.\|
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The devices under the \fB/platform\fR subtree of the PICLTREE are linked to
 their FRU containers represented in the \fB/frutree\fR using PICL reference
 properties. The \fBpicl_get_frutree_parent()\fR function returns the handle of
 the node in the \fB/frutree\fR subtree that is the FRU parent or container of
-the the device specified by the node handle, \fIdevh\fR. The handle is returned
+the device specified by the node handle, \fIdevh\fR. The handle is returned
 in the \fIfrutreeh\fR argument.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, 0 is returned. Otherwise a non-negative integer is
 returned to indicate an error.
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBPICL_FAILURE\fR\fR
@@ -68,7 +65,6 @@ Stale handle
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -86,7 +82,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpicl_get_propinfo\fR(3PICL), \fBpicl_get_propval\fR(3PICL),
 \fBpicl_get_propval_by_name\fR(3PICL), \fBpicl_get_prop_by_name\fR(3PICL),
diff --git a/usr/src/man/man3picltree/ptree_get_frutree_parent.3picltree b/usr/src/man/man3picltree/ptree_get_frutree_parent.3picltree
index 582b043f24..9300c5b3c4 100644
--- a/usr/src/man/man3picltree/ptree_get_frutree_parent.3picltree
+++ b/usr/src/man/man3picltree/ptree_get_frutree_parent.3picltree
@@ -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 PTREE_GET_FRUTREE_PARENT 3PICLTREE "Feb 5, 2004"
+.TH PTREE_GET_FRUTREE_PARENT 3PICLTREE "April 9, 2016"
 .SH NAME
 ptree_get_frutree_parent \- get frutree parent node for a given device node
 .SH SYNOPSIS
@@ -17,21 +17,18 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lpicltree\fR [ \fIlibrary\fR\
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The devices under the \fB/platform\fR subtree of the PICLTREE are linked to
 their FRU containers represented in the \fB/frutree\fR using PICL reference
 properties. The \fBptree_get_frutree_parent()\fR function returns the handle of
 the node in the \fB/frutree\fR subtree that is the FRU parent or container of
-the the device specified by the node handle, \fIdevh\fR. The handle is returned
+the device specified by the node handle, \fIdevh\fR. The handle is returned
 in the \fIfrutreeh\fR argument.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, 0 is returned. Otherwise a non-negative integer is
 returned to indicate an error.
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBPICL_FAILURE\fR\fR
@@ -68,7 +65,6 @@ Stale handle
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -86,7 +82,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBptree_get_propinfo\fR(3PICLTREE), \fBptree_get_propval\fR(3PICLTREE),
 \fBptree_get_propval_by_name\fR(3PICLTREE),
diff --git a/usr/src/man/man3picltree/ptree_get_node_by_path.3picltree b/usr/src/man/man3picltree/ptree_get_node_by_path.3picltree
index a603fe2e22..fecacb579c 100644
--- a/usr/src/man/man3picltree/ptree_get_node_by_path.3picltree
+++ b/usr/src/man/man3picltree/ptree_get_node_by_path.3picltree
@@ -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 PTREE_GET_NODE_BY_PATH 3PICLTREE "Aug 1, 2000"
+.TH PTREE_GET_NODE_BY_PATH 3PICLTREE "April 9, 2016"
 .SH NAME
 ptree_get_node_by_path \- get handle of node specified by PICL tree path
 .SH SYNOPSIS
@@ -17,7 +17,6 @@ ptree_get_node_by_path \- get handle of node specified by PICL tree path
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBptree_get_node_by_path()\fR function copies the handle of the node in
 the PICL tree specified by the path given in \fIptreepath\fR into the location
@@ -48,7 +47,7 @@ the form of one or more pairs of property names and values such as
 .sp
 .LP
 where '@' is a shorthand notation to refer to the device address, which is
-followed by the device addres value address. The address value is matched with
+followed by the device address value address. The address value is matched with
 the value of the property "bus-addr" if it exists. If no "bus-addr" property
 exists, then it is matched with the value of the property "UnitAddress". Use
 the '?' notation to limit explicitly the comparison to "bus-addr" or
@@ -70,7 +69,6 @@ All valid paths must start at the root node denoted by '/'.
 If no prefix is specified for the path, then the prefix defaults to the "name"
 property.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fB0\fR is returned. On failure, a non-negative
 integer is returned to indicate an error.
@@ -79,7 +77,6 @@ integer is returned to indicate an error.
 \fBPICL_NOTNODE\fR is returned if there is no node corresponding to the
 specified path.
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBPICL_INVALIDARG\fR\fR
@@ -107,7 +104,6 @@ General system failure
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -125,6 +121,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBptree_get_propval_by_name\fR(3PICLTREE), \fBattributes\fR(5)
diff --git a/usr/src/man/man3pool/pool_associate.3pool b/usr/src/man/man3pool/pool_associate.3pool
index 458469779b..c98600fbbc 100644
--- a/usr/src/man/man3pool/pool_associate.3pool
+++ b/usr/src/man/man3pool/pool_associate.3pool
@@ -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 POOL_ASSOCIATE 3POOL "Jul 18, 2005"
+.TH POOL_ASSOCIATE 3POOL "April 9, 2016"
 .SH NAME
 pool_associate, pool_create, pool_destroy, pool_dissociate, pool_info,
 pool_query_pool_resources \- resource pool manipulation functions
@@ -46,7 +46,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lpool\fR [ \fIlibrary\fR\&.\|
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 These functions provide mechanisms for constructing and modifying pools entries
 within a target pools configuration.  The \fIconf\fR argument for each function
@@ -74,7 +73,7 @@ default resource of the same type.
 .sp
 .LP
 The \fBpool_info()\fR function returns a string describing the given pool. The
-string is allocated with \fBmalloc\fR(3C). The caller is reponsible for freeing
+string is allocated with \fBmalloc\fR(3C). The caller is responsible for freeing
 the returned string. If the \fIflags\fR option is non-zero, the string returned
 also describes the associated resources of the pool.
 .sp
@@ -84,7 +83,6 @@ of resources currently associated with the pool that match the given list of
 properties. The return value must be freed by the caller. The \fInelem\fR
 argument is set to be the length of the array returned.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBpool_create()\fR returns a new initialized pool.
 Otherwise it returns \fINULL\fR and \fBpool_error\fR(3POOL) returns the
@@ -105,7 +103,6 @@ Upon successful completion, \fBpool_query_pool_resources()\fR returns a
 null-terminated array of resources. Otherwise it returns \fINULL\fR and
 \fBpool_error()\fR returns the pool-specific error value.
 .SH ERRORS
-.sp
 .LP
 The \fBpool_create()\fR function will fail if:
 .sp
@@ -275,13 +272,11 @@ A system error has occurred. Check the system error code for more details.
 .RE
 
 .SH USAGE
-.sp
 .LP
 Pool names are unique across pools in a given configuration file. It is an
 error to attempt to create a pool with a name that is currently used by another
 pool within the same configuration.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -301,6 +296,5 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibpool\fR(3LIB), \fBpool_error\fR(3POOL), \fBattributes\fR(5)
diff --git a/usr/src/man/man3pool/pool_component_info.3pool b/usr/src/man/man3pool/pool_component_info.3pool
index 53e53f0497..12b90c4b07 100644
--- a/usr/src/man/man3pool/pool_component_info.3pool
+++ b/usr/src/man/man3pool/pool_component_info.3pool
@@ -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 POOL_COMPONENT_INFO 3POOL "Sep 23, 2003"
+.TH POOL_COMPONENT_INFO 3POOL "April 9, 2016"
 .SH NAME
 pool_component_info, pool_get_owning_resource \- resource pool component
 functions
@@ -24,7 +24,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lpool\fR [ \fIlibrary\fR\&.\|
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Certain resources, such as processor sets, are composed of resource components.
 Informational and ownership attributes of resource components are made
@@ -35,14 +34,13 @@ function refers to the target configuration to which the operation applies.
 .LP
 The \fBpool_component_info()\fR function returns a string describing
 \fIcomponent\fR. The string is allocated with \fBmalloc\fR(3C). The caller is
-reponsible for freeing the returned string. The \fIflags\fR argument is
+responsible for freeing the returned string. The \fIflags\fR argument is
 ignored.
 .sp
 .LP
 The \fBpool_get_owning_resource()\fR function returns the resource currently
 containing \fIcomponent\fR.  Every component is contained by a resource.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBpool_component_info()\fR returns a string.
 Otherwise it returns \fINULL\fR and \fBpool_error\fR(3POOL) returns the
@@ -53,7 +51,6 @@ Upon successful completion, \fBpool_get_owning_resource()\fR returns the owning
 resource. Otherwise it returns \fINULL\fR and \fBpool_error()\fR returns the
 pool-specific error value.
 .SH ERRORS
-.sp
 .LP
 The \fBpool_component_info()\fR function will fail if:
 .sp
@@ -97,7 +94,6 @@ The supplied configuration's status is not \fBPOF_VALID\fR.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -117,6 +113,5 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibpool\fR(3LIB), \fBpool_error\fR(3POOL), \fBattributes\fR(5)
diff --git a/usr/src/man/man3pool/pool_resource_create.3pool b/usr/src/man/man3pool/pool_resource_create.3pool
index 62813a02d5..f62e5103b1 100644
--- a/usr/src/man/man3pool/pool_resource_create.3pool
+++ b/usr/src/man/man3pool/pool_resource_create.3pool
@@ -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 POOL_RESOURCE_CREATE 3POOL "Sep 23, 2003"
+.TH POOL_RESOURCE_CREATE 3POOL "April 9, 2016"
 .SH NAME
 pool_resource_create, pool_resource_destroy, pool_resource_info,
 pool_query_resource_components, pool_resource_transfer, pool_resource_xtransfer
@@ -52,7 +52,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lpool\fR [ \fIlibrary\fR\&.\|
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpool_resource_create()\fR function creates and returns a new resource of
 the given \fIname\fR and \fItype\fR in the provided configuration. If there is
@@ -65,7 +64,7 @@ from its configuration file.
 .LP
 The \fBpool_resource_info()\fR function returns a string describing the given
 \fIresource\fR. The string is allocated with \fBmalloc\fR(3C). The caller is
-reponsible for freeing the returned string. If the \fIflags\fR argument is
+responsible for freeing the returned string. If the \fIflags\fR argument is
 non-zero, the string returned also describes the components (if any) contained
 in the resource.
 .sp
@@ -92,7 +91,6 @@ list of \fBpool_component_t\fR.
 The \fIconf\fR argument for each function refers to the target configuration to
 which the operation applies.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBpool_resource_create()\fR returns a new
 \fBpool_resource_t\fR with default properties initialized. Otherwise,
@@ -121,7 +119,6 @@ pool-specific error value.
 \fBpool_resource_xtransfer()\fR return 0. Otherwise -1 is returned and
 \fBpool_error()\fR returns the pool-specific error value.
 .SH ERRORS
-.sp
 .LP
 The \fBpool_resource_create()\fR function will fail if:
 .sp
@@ -314,7 +311,6 @@ if ((resource = pool_resource_create(conf, "pset",
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -334,6 +330,5 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibpool\fR(3LIB), \fBpool_error\fR(3POOL), \fBattributes\fR(5)
diff --git a/usr/src/man/man3resolv/resolver.3resolv b/usr/src/man/man3resolv/resolver.3resolv
index a391775de0..f54bda17d1 100644
--- a/usr/src/man/man3resolv/resolver.3resolv
+++ b/usr/src/man/man3resolv/resolver.3resolv
@@ -1,7 +1,7 @@
 '\" te
 .\"  Portions Copyright 1989 AT&T Portions Copyright (c) 1985, 1995 Regents of the University of California.
 .\" Copyright (C) 2006, Sun Microsystems, Inc. All Rights Reserved
-.TH RESOLVER 3RESOLV "Dec 26, 2006"
+.TH RESOLVER 3RESOLV "April 9, 2016"
 .SH NAME
 resolver, res_ninit, fp_resstat, res_hostalias, res_nquery, res_nsearch,
 res_nquerydomain, res_nmkquery, res_nsend, res_nclose, res_nsendsigned,
@@ -163,7 +163,6 @@ Deprecated Interfaces
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 These routines are used for making, sending, and interpreting query and reply
 messages with Internet domain name servers.
@@ -180,7 +179,7 @@ The \fBres_ndestroy()\fR function should be called to free memory allocated by
 .LP
 The functions \fBres_init()\fR, \fBres_query()\fR, \fBres_search()\fR,
 \fBres_mkquery()\fR, \fBres_send()\fR, and \fBherror()\fR are deprecated. They
-are supplied for backwards compatability. They use global configuration and
+are supplied for backwards compatibility. They use global configuration and
 state information that is kept in the structure \fB_res\fR rather than state
 information referenced through \fIstatp\fR.
 .sp
@@ -327,7 +326,6 @@ the header would be updated.
 .RE
 
 .SS "\fBres_ninit()\fR, \fBres_init()\fR"
-.sp
 .LP
 The \fBres_ninit()\fR and \fBres_init()\fR routines read the configuration
 file, if any is present, to get the default domain name, search list and the
@@ -347,7 +345,6 @@ are inherited from the configuration file's \fBoptions\fR command. See
 \fBRES_OPTIONS\fR environment variable. Initialization normally occurs on the
 first call to one of the other resolver routines.
 .SS "\fBres_nquery()\fR, \fBres_query()\fR"
-.sp
 .LP
 The \fBres_nquery()\fR and \fBres_query()\fR functions provide interfaces to
 the server query mechanism. They construct a query, send it to the local
@@ -367,7 +364,6 @@ by the previous query. \fIanswer\fR must be large enough to receive a maximum
 \fBUDP\fR response from the server or parts of the \fIanswer\fR will be
 silently discarded. The default maximum \fBUDP\fR response size is 512 bytes.
 .SS "\fBres_nsearch()\fR, \fBres_search()\fR"
-.sp
 .LP
 The \fBres_nsearch()\fR and \fBres_search()\fR routines make a query and await
 a response, just like like \fBres_nquery()\fR and \fBres_query()\fR. In
@@ -385,13 +381,11 @@ by the previous query. \fIanswer\fR must be large enough to receive a maximum
 \fBUDP\fR response from the server or parts of the \fIanswer\fR will be
 silently discarded. The default maximum \fBUDP\fR response size is 512 bytes.
 .SS "\fBres_nquerydomain()\fR"
-.sp
 .LP
 The \fBres_nquerydomain()\fR function calls \fBres_query()\fR on the
 concatenation of \fIname\fR and \fIdomain\fR, removing a trailing dot from
 \fIname\fR if \fIdomain\fR is \fINULL\fR.
 .SS "\fBres_nmkquery()\fR, \fBres_mkquery()\fR"
-.sp
 .LP
 These routines are used by \fBres_nquery()\fR and \fBres_query()\fR. The
 \fBres_nmkquery()\fR and \fBres_mkquery()\fR functions construct a standard
@@ -401,7 +395,6 @@ the query, or -1 if the query is larger than \fIbuflen\fR. The query type
 <\fBarpa/nameser.h\fR>. The domain name for the query is given by \fIdname\fR.
 \fInewrr\fR is currently unused but is intended for making update messages.
 .SS "\fBres_nsend()\fR, \fBres_send()\fR, \fBres_nsendsigned()\fR"
-.sp
 .LP
 The \fBres_nsend()\fR, \fBres_send()\fR, and \fBres_nsendsigned()\fR routines
 send a pre-formatted query that returns an \fIanswer\fR. The routine calls
@@ -421,30 +414,25 @@ by the previous query. \fIanswer\fR must be large enough to receive a maximum
 \fBUDP\fR response from the server or parts of the \fIanswer\fR will be
 silently discarded. The default maximum \fBUDP\fR response size is 512 bytes.
 .SS "\fBfp_resstat()\fR"
-.sp
 .LP
 The function \fBfp_resstat()\fR prints out the active flag bits in
 \fIstatp\fR->\fBoptions\fR preceded by the text "\fB;; res options:\fR" on
 \fIfile\fR.
 .SS "\fBres_hostalias()\fR"
-.sp
 .LP
 The function \fBres_hostalias()\fR looks up \fIname\fR in the file referred to
 by the \fBHOSTALIASES\fR environment variable and returns the fully qualified
 host name. If \fIname\fR is not found or an error occurs, \fBNULL\fR is
 returned. \fBres_hostalias()\fR stores the result in \fIbuf\fR.
 .SS "\fBres_nclose()\fR"
-.sp
 .LP
 The \fBres_nclose()\fR function closes any open files referenced through
 \fIstatp\fR.
 .SS "\fBres_ndestroy()\fR"
-.sp
 .LP
 The \fBres_ndestroy()\fR function calls \fBres_nclose()\fR, then frees any
 memory allocated by \fBres_ninit()\fR referenced through \fIstatp\fR.
 .SS "\fBdn_comp()\fR"
-.sp
 .LP
 The \fBdn_comp()\fR function compresses the domain name \fIexp_dn\fR and stores
 it in \fIcomp_dn\fR. The \fBdn_comp()\fR function returns the size of the
@@ -463,7 +451,6 @@ labels inserted into the message by \fBdn_comp()\fR as the name is compressed.
 If \fIdnptrs\fR is \fINULL\fR, names are not compressed. If \fIlastdnptr\fR is
 \fINULL\fR, \fBdn_comp()\fR does not update the list of labels.
 .SS "\fBdn_expand()\fR"
-.sp
 .LP
 The \fBdn_expand()\fR function expands the compressed domain name \fIcomp_dn\fR
 to a full domain name. The compressed name is contained in a query or reply
@@ -472,7 +459,6 @@ uncompressed name is placed in the buffer indicated by \fIexp_dn\fR, which is
 of size \fIlength\fR. The \fBdn_expand()\fR function returns the size of the
 compressed name, or \fB\(mi1\fR if there was an error.
 .SS "\fBhstrerror()\fR, \fBherror()\fR"
-.sp
 .LP
 The variables \fIstatp->res_h_errno\fR and \fI_res.res_h_errno\fR and external
 variable \fIh_errno\fR are set whenever an error occurs during a resolver
@@ -500,12 +486,10 @@ message corresponding to the value of \fIh_errno\fR.
 The \fBhstrerror()\fR function returns a string, which is the message text that
 corresponds to the value of the \fIerr\fR parameter.
 .SS "\fBres_setservers()\fR, \fBres_getservers()\fR"
-.sp
 .LP
 The functions \fBres_getservers()\fR and \fBres_setservers()\fR are used to get
 and set the list of servers to be queried.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/resolv.conf\fR\fR
@@ -515,7 +499,6 @@ resolver configuration file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -534,7 +517,6 @@ T}
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdomainname\fR(1M), \fBgethostbyname\fR(3NSL), \fBlibresolv\fR(3LIB),
 \fBresolv.conf\fR(4), \fBattributes\fR(5)
@@ -563,7 +545,6 @@ November 1987.
 Vixie, Paul, Dunlap, Kevin J., Karels, Michael J. \fIName Server Operations
 Guide for BIND\fR. Internet Software Consortium, 1996.
 .SH NOTES
-.sp
 .LP
 When the caller supplies a work buffer, for example the \fIanswer\fR buffer
 argument to \fBres_nsend()\fR or \fBres_send()\fR, the buffer should be aligned
diff --git a/usr/src/man/man3rsm/rsm_intr_signal_post.3rsm b/usr/src/man/man3rsm/rsm_intr_signal_post.3rsm
index 703295d49c..09eed7d6dc 100644
--- a/usr/src/man/man3rsm/rsm_intr_signal_post.3rsm
+++ b/usr/src/man/man3rsm/rsm_intr_signal_post.3rsm
@@ -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 RSM_INTR_SIGNAL_POST 3RSM "Nov 7, 2002"
+.TH RSM_INTR_SIGNAL_POST 3RSM "April 9, 2016"
 .SH NAME
 rsm_intr_signal_post, rsm_intr_signal_wait \- signal or wait for an event
 .SH SYNOPSIS
@@ -21,16 +21,15 @@ cc [ \fIflag\fR... ] \fIfile\fR... -lrsm [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The  \fBrsm_intr_signal_post()\fR and  \fBrsm_intr_signal_wait()\fR functions
 are event functions that allow synchronization between importer processes and
-exporter processes.  A process may block to wait for an event occurance by
+exporter processes.  A process may block to wait for an event occurrence by
 calling \fBrsm_intr_signal_wait()\fR. A process can signal a waiting process
 when an event occurs by calling \fBrsm_intr_signal_post()\fR.
 .sp
 .LP
-The \fBrsm_intr_signal_post()\fR function signals an event occurance. Either an
+The \fBrsm_intr_signal_post()\fR function signals an event occurrence. Either an
 import segment handle (\fBrsm_memseg_import_handle_t\fR) or an export segment
 handle (\fBrsm_memseg_export_handle_t\fR) may be type cast to a void pointer
 for the \fImemseg\fR argument. If \fImemseg\fR refers to an import handle, the
@@ -41,19 +40,17 @@ an event is already pending for the target segment.
 .sp
 .LP
 The \fBrsm_intr_signal_wait()\fR function allows a process to block and wait
-for an event occurance. Either an import segment handle
+for an event occurrence. Either an import segment handle
 (\fBrsm_memseg_import_handle_t\fR) or an export segment handle
 (\fBrsm_memseg_export_handle_t\fR) may be type cast to a void pointer for the
 \fImemseg\fR argument. The process blocks for up to \fItimeout\fR milliseconds
 for an event to occur; if the timeout value is -1, the process blocks until an
 event occurs or until interrupted.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, these functions return 0.  Otherwise, an error
 value is returned to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBrsm_intr_signal_post()\fR and  \fBrsm_intr_signal_wait()\fR functions
 can return the following error:
@@ -111,7 +108,6 @@ Timer expired.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -129,6 +125,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBrsm_memseg_get_pollfd\fR(3RSM), \fBattributes\fR(5)
diff --git a/usr/src/man/man3rsm/rsm_intr_signal_wait_pollfd.3rsm b/usr/src/man/man3rsm/rsm_intr_signal_wait_pollfd.3rsm
index e911a5691d..1b734958e8 100644
--- a/usr/src/man/man3rsm/rsm_intr_signal_wait_pollfd.3rsm
+++ b/usr/src/man/man3rsm/rsm_intr_signal_wait_pollfd.3rsm
@@ -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 RSM_INTR_SIGNAL_WAIT_POLLFD 3RSM "Dec 1, 2002"
+.TH RSM_INTR_SIGNAL_WAIT_POLLFD 3RSM "April 9, 2016"
 .SH NAME
 rsm_intr_signal_wait_pollfd \- wait for events on a list of file descriptors
 .SH SYNOPSIS
@@ -17,7 +17,6 @@ cc [ \fIflag\fR... ] \fIfile\fR\&.\|.\|. \fB-lrsm\fR [ \fIlibrary \&.\|.\|.\fR ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBrsm_intr_signal_wait_pollfd()\fR function is similar to
 \fBrsm_intr_signal_wait\fR(3RSM), except that it  allows an application to
@@ -48,7 +47,6 @@ that the segment has not been destroyed.
 For file descriptors other than RSMAPI segments, the behavior of
 \fBrsm_intr_signal_wait_pollfd()\fR is similar to \fBpoll()\fR.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBrsm_intr_signal_wait_pollfd()\fR returns 0 and
 the \fBrevents\fR member of the \fBpollfd\fR struct corresponding to an RSMAPI
@@ -59,7 +57,6 @@ that segment was received. Otherwise, an error value is returned.
 For file descriptors other than RSMAPI segments, the \fBrevents\fR member of
 the \fBpollfd\fR struct is identical to that returned by \fBpoll\fR(2).
 .SH ERRORS
-.sp
 .LP
 The \fBrsm_intr_signal_wait_pollfd()\fR function can return the following
 errors:
@@ -70,7 +67,7 @@ errors:
 .ad
 .sp .6
 .RS 4n
-Timeout has occured.
+Timeout has occurred.
 .RE
 
 .sp
@@ -124,7 +121,6 @@ Insufficient resources.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -142,7 +138,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpoll\fR(2), \fBrsm_intr_signal_wait\fR(3RSM),
 \fBrsm_memseg_get_pollfd\fR(3RSM), \fBrsm_memseg_release_pollfd\fR(3RSM),
diff --git a/usr/src/man/man3rsm/rsm_memseg_import_open_barrier.3rsm b/usr/src/man/man3rsm/rsm_memseg_import_open_barrier.3rsm
index c3a37d6304..39fea8c9c9 100644
--- a/usr/src/man/man3rsm/rsm_memseg_import_open_barrier.3rsm
+++ b/usr/src/man/man3rsm/rsm_memseg_import_open_barrier.3rsm
@@ -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 RSM_MEMSEG_IMPORT_OPEN_BARRIER 3RSM "Jun 8, 2001"
+.TH RSM_MEMSEG_IMPORT_OPEN_BARRIER 3RSM "April 9, 2016"
 .SH NAME
 rsm_memseg_import_open_barrier, rsm_memseg_import_order_barrier,
 rsm_memseg_import_close_barrier \- remote memory access error detection
@@ -28,7 +28,6 @@ cc [ \fIflag\fR... ] \fIfile\fR... -lrsm [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The  \fBrsm_memseg_import_open_barrier()\fR and
 \fBrsm_memseg_import_close_barrier()\fR functions provide a means of remote
@@ -37,7 +36,7 @@ memory access error detection when the barrier mode is set to
 span-of-time interval for error detection. A successful close barrier
 guarantees that remote memory access covered between the open barrier and close
 barrier have completed successfully. Any individual failures which may have
-occured between the open barrier and close barrier occur without any
+occurred between the open barrier and close barrier occur without any
 notification and the failure is not reported until the close barrier.
 .sp
 .LP
@@ -47,12 +46,10 @@ the order barrier are all completed before the operations after the order
 barrier. Effectively, with the order barrier call, all writes within one
 barrier scope are ordered with respect to those in another barrier scope.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, these functions return 0. Otherwise, an error value
 is returned to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBrsm_memseg_import_open_barrier()\fR,
 \fBrsm_memseg_import_order_barrier()\fR, and
@@ -121,7 +118,6 @@ Connection aborted.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -139,7 +135,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBrsm_memseg_import_init_barrier\fR(3RSM),
 \fBrsm_memseg_import_set_mode\fR(3RSM), \fBattributes\fR(5)
diff --git a/usr/src/man/man3sasl/sasl_auxprop.3sasl b/usr/src/man/man3sasl/sasl_auxprop.3sasl
index f3af6b1c46..b0b13b3cf3 100644
--- a/usr/src/man/man3sasl/sasl_auxprop.3sasl
+++ b/usr/src/man/man3sasl/sasl_auxprop.3sasl
@@ -5,11 +5,11 @@
 .\" 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 SASL_AUXPROP 3SASL "Oct 14, 2003"
+.TH SASL_AUXPROP 3SASL "April 9, 2016"
 .SH NAME
 sasl_auxprop, prop_new, prop_dup, prop_request, prop_get, prop_getnames,
 prop_clear, prop_erase, prop_dispose, prop_format, prop_set, prop_setvals \-
-SASL auxilliary properties
+SASL auxiliary properties
 .SH SYNOPSIS
 .LP
 .nf
@@ -74,43 +74,37 @@ SASL auxilliary properties
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
-The SASL auxilliary properties are used to obtain properties from external
-sources during the authentication process. For example, a mechanizm might need
+The SASL auxiliary properties are used to obtain properties from external
+sources during the authentication process. For example, a mechanism might need
 to query an LDAP server to obtain the authentication secret. The application
 probably needs other information from the LDAP server as well, such as the home
-directory of the UID. The auxilliary property interface allows the two to
+directory of the UID. The auxiliary property interface allows the two to
 cooperate and results in only a single query against the property sources.
 .sp
 .LP
 Property lookups take place directly after user canonicalization occurs.
 Therefore, all request should be registered with the context before user
-canonicalization occurs. Requests can calso be registered by using the
-\fBsasl_auxprop_request\fR(3SASL) function. Most of the auxilliary property
+canonicalization occurs. Requests can also be registered by using the
+\fBsasl_auxprop_request\fR(3SASL) function. Most of the auxiliary property
 functions require a property context that can be obtained by calling
 \fBsasl_auxprop_getctx\fR(3SASL).
 .SS "\fBprop_new()\fR"
-.sp
 .LP
 The \fBprop_new()\fR function creates a new property context. It is unlikely
 that application developers will use this call.
 .SS "\fBprop_dup()\fR"
-.sp
 .LP
 The \fBprop_dup()\fR function duplicates a given property context.
 .SS "\fBprop_request()\fR"
-.sp
 .LP
 The \fBprop_request()\fR function adds properties to the request list of a
 given context.
 .SS "\fBprop_get()\fR"
-.sp
 .LP
 The \fBprop_get()\fR function returns a null-terminated array of \fBstruct\fR
 \fBpropval\fR from the given context.
 .SS "\fBprop_getnames()\fR"
-.sp
 .LP
 The \fBprop_getnames()\fR function fills in an array of \fBstruct\fR
 \fBpropval\fR based on a list of property names. The \fBvals\fR array is at
@@ -123,39 +117,32 @@ requested, then its associated values entry will be set to \fINULL\fR.
 The \fBprop_getnames()\fR function returns the number of matching properties
 that were found or a SASL error code.
 .SS "\fBprop_clear()\fR"
-.sp
 .LP
 The \fBprop_clear()\fR function clears \fIvalues\fR and \fIrequests\fR from a
 property context. If the value of \fIrequests\fR is \fB1\fR, then
 \fIrequests\fR is cleared. Otherwise, the value of \fIrequests\fR is \fB0\fR.
 .SS "\fBprop_erase()\fR"
-.sp
 .LP
 The \fBprop_erase()\fR function securely erases the value of a property.
 \fIname\fR is the name of the property to erase.
 .SS "\fBprop_dispose()\fR"
-.sp
 .LP
 The \fBprop_dispose()\fR function disposes of a property context and nullifies
 the pointer.
 .SS "\fBprop_format()\fR"
-.sp
 .LP
 The \fBprop_format()\fR function formats the requested property names into a
 string. The \fBprop_format()\fR function is not intended to be used by the
 application. The function is used only by \fBauxprop\fR plug-ins.
 .SS "\fBprop_set()\fR"
-.sp
 .LP
 The \fBprop_set()\fR functions adds a property value to the context. The
 \fBprop_set()\fR function is used only by \fBauxprop\fR plug-ins.
 .SS "\fBprop_setvals()\fR"
-.sp
 .LP
 The \fBprop_setvals()\fR function adds multiple values to a single property.
 The \fBprop_setvals()\fR function is used only by \fBauxprop\fR plug-ins.
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIconn\fR\fR
@@ -260,8 +247,8 @@ The separator to use for the string.
 \fB\fIseplen\fR\fR
 .ad
 .RS 12n
-The length of the separator. The the values is less than 0, then \fBstrlen\fR
-will be used as \fIsep\fR.
+The length of the separator. If the value is less than 0, then \fBstrlen\fR
+will be used to determine the length of \fIsep\fR instead.
 .RE
 
 .sp
@@ -301,14 +288,12 @@ A null-terminated array of values to be added to the property.
 .RE
 
 .SH ERRORS
-.sp
 .LP
 The \fBsasl_auxprop()\fR functions that return an \fBint\fR will return a SASL
 error code. See \fBsasl_errors\fR(3SASL). Those \fBsasl_auxprop()\fR functions
 that return a pointer will return a valid pointer upon success and return
 \fINULL\fR upon failure.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -326,7 +311,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsasl_auxprop_getctx\fR(3SASL), \fBsasl_auxprop_request\fR(3SASL),
 \fBsasl_errors\fR(3SASL), \fBattributes\fR(5)
diff --git a/usr/src/man/man3sec/acl_get.3sec b/usr/src/man/man3sec/acl_get.3sec
index 065a0eec5d..4d6bb38bab 100644
--- a/usr/src/man/man3sec/acl_get.3sec
+++ b/usr/src/man/man3sec/acl_get.3sec
@@ -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 ACL_GET 3SEC "Oct 6, 2005"
+.TH ACL_GET 3SEC "April 9, 2016"
 .SH NAME
 acl_get, facl_get, acl_set, facl_set \- get or set a file's Access Control List
 (ACL)
@@ -32,7 +32,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lsec\fR [ \fIlibrary\fR\&.\|.
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBacl_get()\fR and \fBfacl_get()\fR functions retrieve an Access Control
 List (ACL) of a file whose name is given by \fIpath\fR or referenced by the
@@ -53,7 +52,6 @@ target file's style of ACL. Currently this is only possible when translating
 from a POSIX-draft ACL such as on UFS to a file system that supports NFSv4 ACL
 semantics such as ZFS or NFSv4.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBacl_get()\fR and \fBfacl_get()\fR return 0 and
 \fIaclp\fR is non-\fINULL\fR. The \fIaclp\fR argument can be \fINULL\fR after
@@ -65,7 +63,6 @@ indicate the error.
 Upon successful completion, \fBacl_set()\fR and \fBfacl_set()\fR return 0.
 Otherwise, -1 is returned and \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 These functions will fail if:
 .sp
@@ -83,7 +80,7 @@ The caller does not have access to a component of \fIpath\fR.
 \fB\fBEIO\fR\fR
 .ad
 .RS 11n
-A disk I/O error has occured while retrieving the ACL.
+A disk I/O error has occurred while retrieving the ACL.
 .RE
 
 .sp
@@ -114,7 +111,6 @@ The ACL supplied could not be translated to an NFSv4 ACL.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -132,6 +128,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBchmod\fR(1), \fBacl\fR(2), \fBacl\fR(5), \fBattributes\fR(5)
diff --git a/usr/src/man/man3sip/sip_enable_trans_logging.3sip b/usr/src/man/man3sip/sip_enable_trans_logging.3sip
index 72b49d9e8a..86ed42c657 100644
--- a/usr/src/man/man3sip/sip_enable_trans_logging.3sip
+++ b/usr/src/man/man3sip/sip_enable_trans_logging.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_ENABLE_TRANS_LOGGING 3SIP "Jan 11, 2008"
+.TH SIP_ENABLE_TRANS_LOGGING 3SIP "April 9, 2016"
 .SH NAME
 sip_enable_trans_logging, sip_enable_dialog_logging,
 sip_disable_dialog_logging, sip_disable_trans_logging \- transaction and dialog
@@ -33,7 +33,6 @@ logging operations
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsip_enable_trans_logging()\fR and \fBsip_enable_dialog_logging()\fR
 functions enable transaction and dialog logging respectively. The \fIlogfile\fR
@@ -60,7 +59,6 @@ close the files. It is the responsibility of the application to close them.
 The log contains the state of the transaction or dialog at the time the message
 was processed.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBsip_enable_trans_logging()\fR and
 \fBsip_enable_dialog_logging()\fR return 0. They return \fBEINVAL\fR if
@@ -80,10 +78,10 @@ FILE    *logfile;
 logfile = fopen("/tmp/ApplicationA", "a+");
 sip_enable_dialog_logging(logfile, SIP_DETAIL_LOGGING);
 
-/* Application sends INVITE, recieves 180 and 200 response and dialog is
+/* Application sends INVITE, receives 180 and 200 response and dialog is
         created. */
 /* Application sends ACK request */
-/* Application sends BYE and recieves 200 response */
+/* Application sends BYE and receives 200 response */
 
 /* Application disables logging */
 sip_disable_dialog_logging();
@@ -141,7 +139,6 @@ Dialog State            : SIP_DLG_CONFIRMED
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -159,6 +156,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsip_stack_init\fR(3SIP), \fBattributes\fR(5)
diff --git a/usr/src/man/man3socket/send.3socket b/usr/src/man/man3socket/send.3socket
index 2d66baa5ce..2e7d1a51b5 100644
--- a/usr/src/man/man3socket/send.3socket
+++ b/usr/src/man/man3socket/send.3socket
@@ -4,7 +4,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 SEND 3SOCKET "Dec 03, 2014"
+.TH SEND 3SOCKET "April 9, 2016"
 .SH NAME
 send, sendto, sendmsg \- send a message from a socket
 .SH SYNOPSIS
@@ -178,7 +178,7 @@ retried later.
 \fB\fBECONNREFUSED\fR\fR
 .ad
 .RS 16n
-The requested connection was refused by the peer. For conected IPv4 and IPv6
+The requested connection was refused by the peer. For connected IPv4 and IPv6
 datagram sockets, this indicates that the system received an \fBICMP
 Destination Port Unreachable\fR message from the peer in response to some prior
 transmission.
diff --git a/usr/src/man/man3socket/sockaddr.3socket b/usr/src/man/man3socket/sockaddr.3socket
index 5f9dcc7f67..cd578e9bcd 100644
--- a/usr/src/man/man3socket/sockaddr.3socket
+++ b/usr/src/man/man3socket/sockaddr.3socket
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2015, Joyent, Inc.
 .\"
-.Dd May 18, 2015
+.Dd April 9, 2016
 .Dt SOCKADDR 3SOCKET
 .Os
 .Sh NAME
@@ -507,7 +507,7 @@ The following example shows how one would open a socket and prepare it
 to bind to the local IPv6 address ::1 port on port 12345. This program
 should be compiled with the C compiler
 .Sy cc
-and linked aginst the libraries libsocket and libnsl. If this example
+and linked against the libraries libsocket and libnsl. If this example
 was named ip6.c, then the full compiler line would be
 .Ic cc ip6.c -lsocket -lnsl .
 .Bd -literal
diff --git a/usr/src/man/man3tecla/gl_get_line.3tecla b/usr/src/man/man3tecla/gl_get_line.3tecla
index e6430def13..9058882b5f 100644
--- a/usr/src/man/man3tecla/gl_get_line.3tecla
+++ b/usr/src/man/man3tecla/gl_get_line.3tecla
@@ -25,7 +25,7 @@
 .\" or other dealings in this Software without prior written authorization
 .\" of the copyright holder.
 .\" Portions Copyright (c) 2007, Sun Microsystems, Inc. All Rights Reserved.
-.TH GL_GET_LINE 3TECLA "Sep 10, 2013"
+.TH GL_GET_LINE 3TECLA "April 9, 2016"
 .SH NAME
 gl_get_line, new_GetLine, del_GetLine, gl_customize_completion,
 gl_change_terminal, gl_configure_getline, gl_load_history, gl_save_history,
@@ -267,10 +267,9 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-ltecla\fR [ \fIlibrary\fR\&.\
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBgl_get_line()\fR function is part of the \fBlibtecla\fR(3LIB) library.
-If the user is typing at a terminal, each call prompts them for an line of
+If the user is typing at a terminal, each call prompts them for a line of
 input, then provides interactive editing facilities, similar to those of the
 UNIX \fBtcsh\fR shell. In addition to simple command-line editing, it supports
 recall of previously entered command lines, TAB completion of file names, and
@@ -278,7 +277,6 @@ in-line wild-card expansion of filenames. Documentation of both the user-level
 command-line editing features and all user configuration options can be found
 on the \fBtecla\fR(5) manual page.
 .SS "An Example"
-.sp
 .LP
 The following shows a complete example of how to use the \fBgl_get_line()\fR
 function to get input from the user:
@@ -324,7 +322,6 @@ safety precaution. If the program subsequently attempts to pass \fIgl\fR to
 \fBgl_get_line()\fR, said function will complain, and return an error, instead
 of attempting to use the deleted resource object.
 .SS "The Functions Used In The Example"
-.sp
 .LP
 The \fBnew_GetLine()\fR function creates the resources used by the
 \fBgl_get_line()\fR function and returns an opaque pointer to the object that
@@ -378,7 +375,6 @@ store in the internal buffer. In the latter case you should call
 makes \fBgl_get_line()\fR similar to \fBfgets\fR(3C). When \fBstdin\fR is not
 connected to a terminal, \fBgl_get_line()\fR simply calls \fBfgets()\fR.
 .SS "The Return Status Of \fBgl_get_line()\fR"
-.sp
 .LP
 The \fBgl_get_line()\fR function has two possible return values: a pointer to
 the completed input line, or \fINULL\fR. Additional information about what
@@ -479,7 +475,6 @@ terminator, will be written within the first \fIn\fR elements of this buffer,
 and the return value will be a pointer to the first element of this buffer. If
 the message will not fit in the provided buffer, it will be truncated to fit.
 .SS "Optional Prompt Formatting"
-.sp
 .LP
 Whereas by default the prompt string that you specify is displayed literally
 without any special interpretation of the characters within it, the
@@ -637,7 +632,6 @@ style.
 .RE
 
 .SS "Alternate Configuration Sources"
-.sp
 .LP
 By default users have the option of configuring the behavior of
 \fBgl_get_line()\fR with a configuration file called \fB\&.teclarc\fR in their
@@ -737,7 +731,6 @@ The \fIaction\fR argument must either be a string containing the name of the
 action to bind the key sequence to, or it must be \fINULL\fR or \fB""\fR to
 unbind the key sequence.
 .SS "Customized Word Completion"
-.sp
 .LP
 If in your application you would like to have TAB completion complete other
 things in addition to or instead of filenames, you can arrange this by
@@ -781,7 +774,6 @@ input line that is currently being edited, reinstate normal terminal I/O, and
 notify \fBgl_get_line()\fR that the input line will need to be redrawn when the
 callback returns.
 .SS "Adding Completion Actions"
-.sp
 .LP
 In the previous section the ability to customize the behavior of the only
 default completion action, complete-word, was described. In this section the
@@ -819,7 +811,6 @@ As discussed for \fBgl_customize_completion()\fR, if your callback function
 needs to write anything to the terminal, it must call \fBgl_normal_io()\fR
 before doing so.
 .SS "Defining Custom Actions"
-.sp
 .LP
 Although the built-in key-binding actions are sufficient for the needs of most
 applications, occasionally a specialized application may need to define one or
@@ -946,7 +937,6 @@ allows them to re-bind the action to an alternate key-sequence. In order for
 this to work, it is necessary to call \fBgl_register_action()\fR between
 calling \fBnew_GetLine()\fR and the first call to \fBgl_get_line()\fR.
 .SS "History Files"
-.sp
 .LP
 To save the contents of the history buffer before quitting your application and
 subsequently restore them when you next start the application, the
@@ -980,7 +970,6 @@ Both fuctions return non-zero on error, after writing an error message to
 \fBstderr\fR. Note that \fBgl_load_history()\fR does not consider the
 non-existence of a file to be an error.
 .SS "Multiple History Lists"
-.sp
 .LP
 If your application uses a single \fBGetLine\fR object for entering many
 different types of input lines, you might want \fBgl_get_line()\fR to
@@ -1004,7 +993,6 @@ current history identifier is recorded with it, and when it is asked to recall
 a historical input line, it only recalls lines that are marked with the current
 identifier.
 .SS "Displaying History"
-.sp
 .LP
 The history list can be displayed by calling \fBgl_show_history()\fR. This
 function displays the current contents of the history list to the \fBstdio\fR
@@ -1083,7 +1071,6 @@ Thus a format string like "%D %T %H0" would output something like:
 .LP
 Note the inclusion of an explicit newline character in the format string.
 .SS "Looking Up History"
-.sp
 .LP
 The \fBgl_lookup_history()\fR function allows the calling application to look
 up lines in the history list.
@@ -1105,7 +1092,6 @@ history buffer, so it must not be modified by the caller, and will be recycled
 on the next call to any function that takes \fIgl\fR as its argument. Therefore
 you should make a private copy of this string if you need to keep it.
 .SS "Manual History Archival"
-.sp
 .LP
 By default, whenever a line is entered by the user, it is automatically
 appended to the history list, just before \fBgl_get_line()\fR returns the line
@@ -1161,7 +1147,6 @@ A textual description of the error can optionally be obtained by calling
 remains in a valid state to receive new history lines, so there is little harm
 in simply ignoring the return status of \fBgl_append_history()\fR.
 .SS "Miscellaneous History Configuration"
-.sp
 .LP
 If you wish to change the size of the history buffer that was originally
 specified in the call to \fBnew_GetLine()\fR, you can do so with the
@@ -1177,7 +1162,7 @@ can be stored in the history buffer, depends on the lengths of the individual
 lines. For example, a 1000 byte buffer could equally store 10 lines of average
 length 100 bytes, or 20 lines of average length 50 bytes. Although the buffer
 is never expanded when new lines are added, a list of pointers into the buffer
-does get expanded when needed to accomodate the number of lines currently
+does get expanded when needed to accommodate the number of lines currently
 stored in the buffer. To place an upper limit on the number of lines in the
 buffer, and thus a ceiling on the amount of memory used in this list, you can
 call the \fBgl_limit_history()\fR function.
@@ -1207,7 +1192,6 @@ setting it to 1 turns it back on. When history is turned off, no new lines will
 be added to the history list, and history lookup key-bindings will act as
 though there is nothing in the history buffer.
 .SS "Querying History Information"
-.sp
 .LP
 The configured state of the history list can be queried with the
 \fBgl_history_state()\fR function. On return, the status information is
@@ -1229,7 +1213,6 @@ buffer and the amount of the buffer that is currently occupied.
 On return, the size information is recorded in the variable pointed to by the
 \fIsize\fR argument.
 .SS "Changing Terminals"
-.sp
 .LP
 The \fBnew_GetLine()\fR constructor function assumes that input is to be read
 from \fBstdin\fR and output written to \fBstdout\fR. The following function
@@ -1256,7 +1239,6 @@ Note that if you want to pass file descriptors to \fBgl_change_terminal()\fR,
 you can do this by creating \fBstdio\fR stream wrappers using the POSIX
 \fBfdopen\fR(3C) function.
 .SS "External Event Handling"
-.sp
 .LP
 By default, \fBgl_get_line()\fR does not return until either a complete input
 line has been entered by the user, or an error occurs. In programs that need to
@@ -1398,7 +1380,6 @@ descriptor and event, simply call \fBgl_watch_fd()\fR with the same \fIfd\fR
 and \fIevent\fR arguments, but with a \fIcallback\fR argument of 0. The
 \fIdata\fR argument is ignored in this case.
 .SS "Setting An Inactivity Timeout"
-.sp
 .LP
 The \fBgl_inactivity_timeout()\fR function can be used to set or cancel an
 inactivity timeout. Inactivity in this case refers both to keyboard input, and
@@ -1425,7 +1406,7 @@ prototype timeout callback functions.
 .sp
 .LP
 On returning, the application's callback is expected to return one of the
-following enumerators to tell \fBgl_get_line()\fR how to procede after the
+following enumerators to tell \fBgl_get_line()\fR how to proceed after the
 timeout has been handled by the callback.
 .sp
 .ne 2
@@ -1493,7 +1474,6 @@ example, by calling \fBsysconf\fR(\fB_SC_CLK_TCK\fR)).
 To turn off timeouts, simply call \fBgl_inactivity_timeout()\fR with a
 \fIcallback\fR argument of 0. The \fIdata\fR argument is ignored in this case.
 .SS "Signal Handling Defaults"
-.sp
 .LP
 By default, the \fBgl_get_line()\fR function intercepts a number of signals.
 This is particularly important for signals that would by default terminate the
@@ -1590,7 +1570,7 @@ signal that was received during the most recent call to \fBgl_get_line()\fR, or
 .LP
 On systems that support it, when a \fBSIGWINCH\fR (window change) signal is
 received, \fBgl_get_line()\fR queries the terminal to find out its new size,
-redraws the current input line to accomodate the new size, then returns to
+redraws the current input line to accommodate the new size, then returns to
 waiting for keyboard input from the user. Unlike other signals, this signal is
 not resent to the application.
 .sp
@@ -1732,7 +1712,6 @@ practice, job-control shells usually reset the terminal settings when a process
 relinquishes the controlling terminal, so this is only a problem with older
 shells.
 .SS "Customized Signal Handling"
-.sp
 .LP
 The previous section listed the signals that \fBgl_get_line()\fR traps by
 default, and described how it responds to them. This section describes how to
@@ -1934,9 +1913,8 @@ can also, however, be used with the \fBGL_RETURN\fR option, in case you want to
 have a way to distinguish between an input line that was entered using the
 return key, and one that was entered by the receipt of a signal.
 .SS "Reliable Signal Handling"
-.sp
 .LP
-Signal handling is suprisingly hard to do reliably without race conditions. In
+Signal handling is surprisingly hard to do reliably without race conditions. In
 \fBgl_get_line()\fR a lot of care has been taken to allow applications to
 perform reliable signal handling around \fBgl_get_line()\fR. This section
 explains how to make use of this.
@@ -2149,7 +2127,6 @@ What the above steps do in essence is to take asynchronously delivered signals
 and handle them synchronously, one at a time, at a point in the code where
 \fBgl_get_line()\fR has complete control over its environment.
 .SS "The Terminal Size"
-.sp
 .LP
 On most systems the combination of the \fBTIOCGWINSZ\fR ioctl and the
 \fBSIGWINCH\fR signal is used to maintain an accurate idea of the terminal
@@ -2182,7 +2159,7 @@ dimensions of the terminal, and must not be less than 1. On systems that do
 support ioctl(\fBTIOCGWINSZ\fR), this function first calls
 ioctl(\fBTIOCSWINSZ\fR) to tell the terminal driver about the change in size.
 In non-blocking server-I/O mode, if a line is currently being input, the input
-line is then redrawn to accomodate the changed size. Finally the new values are
+line is then redrawn to accommodate the changed size. Finally the new values are
 recorded in \fIgl\fR for future use by \fBgl_get_line()\fR.
 .sp
 .LP
@@ -2201,7 +2178,6 @@ The \fIdef_ncolumn\fR and \fIdef_nline\fR arguments specify the default number
 of terminal columns and lines to use if the terminal size cannot be determined
 by ioctl(\fBTIOCGWINSZ\fR) or environment variables.
 .SS "Hiding What You Type"
-.sp
 .LP
 When entering sensitive information, such as passwords, it is best not to have
 the text that you are entering echoed on the terminal. Furthermore, such text
@@ -2229,7 +2205,6 @@ When echoing is turned off, note that although tab completion will invisibly
 complete your prefix as far as possible, ambiguous completions will not be
 displayed.
 .SS "Single Character Queries"
-.sp
 .LP
 Using \fBgl_get_line()\fR to query the user for a single character reply, is
 inconvenient for the user, since they must hit the enter or return key before
@@ -2278,7 +2253,6 @@ line is discarded, and erased from the terminal, before the new prompt is
 displayed. The next call to \fBgl_get_line()\fR will thus start editing a new
 line.
 .SS "Reading Raw Characters"
-.sp
 .LP
 Whereas the \fBgl_query_char()\fR function visibly prompts the user for a
 character, and displays what they typed, the \fBgl_read_char()\fR function
@@ -2301,14 +2275,12 @@ Beware that certain keyboard keys, such as function keys, and cursor keys,
 usually generate at least three characters each, so a single call to
 \fBgl_read_char()\fR will not be enough to identify such keystrokes.
 .SS "Clearing The Terminal"
-.sp
 .LP
 The calling program can clear the terminal by calling
 \fBgl_erase_terminal()\fR. In non-blocking server-I/O mode, this function also
 arranges for the current input line to be redrawn from scratch when
 \fBgl_get_line()\fR is next called.
 .SS "Displaying Text Dynamically"
-.sp
 .LP
 Between calls to \fBgl_get_line()\fR, the \fBgl_display_text()\fR function
 provides a convenient way to display paragraphs of text, left-justified and
@@ -2352,7 +2324,6 @@ to force a new line to be started.
 .LP
 On error, \fBgl_display_text()\fR returns -1.
 .SS "Callback Function Facilities"
-.sp
 .LP
 Unless otherwise stated, callback functions such as tab completion callbacks
 and event callbacks should not call any functions in this module. The following
@@ -2367,7 +2338,6 @@ to \fBgl_get_line()\fR that are operating on the same input line, the current
 input line will be re-drawn with the new prompt on the following call to
 \fBgl_get_line()\fR.
 .SS "International Character Sets"
-.sp
 .LP
 Since \fBlibtecla\fR(3LIB) version 1.4.0, \fBgl_get_line()\fR has been 8-bit
 clean. This means that all 8-bit characters that are printable in the user's
@@ -2402,7 +2372,6 @@ locale -a
 at the shell prompt. Further documentation on how the user can make use of this
 to enter international characters can be found in the \fBtecla\fR(5) man page.
 .SS "Thread Safety"
-.sp
 .LP
 Unfortunately neither \fBterminfo\fR nor \fBtermcap\fR were designed to be
 reentrant, so you cannot safely use the functions of the getline module in
@@ -2413,7 +2382,6 @@ directories, it is safe to use this module from a single thread of a
 multi-threaded program, provided that your other threads do not use any
 \fBtermcap\fR or \fBterminfo\fR functions.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -2431,7 +2399,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcpl_complete_word\fR(3TECLA), \fBef_expand_file\fR(3TECLA),
 \fBgl_io_mode\fR(3TECLA), \fBlibtecla\fR(3LIB), \fBpca_lookup_file\fR(3TECLA),
diff --git a/usr/src/man/man3xcurses/libcurses.3xcurses b/usr/src/man/man3xcurses/libcurses.3xcurses
index 133325b5b5..ebf790313c 100644
--- a/usr/src/man/man3xcurses/libcurses.3xcurses
+++ b/usr/src/man/man3xcurses/libcurses.3xcurses
@@ -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 LIBCURSES 3XCURSES "May 20, 2003"
+.TH LIBCURSES 3XCURSES "April 9, 2016"
 .SH NAME
 libcurses \- X/Open Curses library
 .SH SYNOPSIS
@@ -21,13 +21,11 @@ c89 [ \fIflag\fR... ] \fIfile\fR... \fB-lcurses\fR [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Functions in this library provide a terminal-independent method of updating
 character screens with reasonable optimization, conforming to X/Open Curses,
 Issue 4, Version 2.
 .SH INTERFACES
-.sp
 .LP
 The shared object \fBlibcurses.so.2\fR provides the public interfaces defined
 below. See \fBIntro\fR(3) for additional information on shared object
@@ -232,7 +230,6 @@ l l .
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/xpg4/lib/libcurses.so.1\fR\fR
@@ -273,15 +270,13 @@ shared object
 .RE
 
 .SH NOTES
-.sp
 .LP
 The \fBlibcurses.so.1\fR listed above is an earlier shared object that provides
 the previous version of the X/Open Curses library (Issue 4). There is no binary
-compatiblity between \fBlibcurses.so.1\fR and \fBlibcurses.so.2\fR. This file
-is provided for backwards compatiblity and will be removed in a future Solaris
-release. There is no plan to fix any of its defects.
+compatibility between \fBlibcurses.so.1\fR and \fBlibcurses.so.2\fR. This file
+is provided for backwards compatibility and will be removed in a future release
+of the operating system. There is no plan to fix any of its defects.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -299,7 +294,6 @@ MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBIntro\fR(3), \fBcurses\fR(3XCURSES), \fBlibcurses\fR(3LIB),
 \fBlibcurses\fR(3LIBUCB), \fBattributes\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man3xnet/recvfrom.3xnet b/usr/src/man/man3xnet/recvfrom.3xnet
index 1e03959d4d..004498385e 100644
--- a/usr/src/man/man3xnet/recvfrom.3xnet
+++ b/usr/src/man/man3xnet/recvfrom.3xnet
@@ -7,7 +7,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 RECVFROM 3XNET "Jun 10, 2002"
+.TH RECVFROM 3XNET "April 9, 2016"
 .SH NAME
 recvfrom \- receive a message from a socket
 .SH SYNOPSIS
@@ -150,7 +150,7 @@ If the actual length of the address is greater than the length of the supplied
 .sp
 .LP
 If the \fIaddress\fR argument is not a null pointer and the protocol does not
-provide the source address of messages, the the value stored in the object
+provide the source address of messages, then the value stored in the object
 pointed to by \fIaddress\fR is unspecified.
 .sp
 .LP
diff --git a/usr/src/man/man4/NISLDAPmapping.4 b/usr/src/man/man4/NISLDAPmapping.4
index 2c5888e830..4ff72e3826 100644
--- a/usr/src/man/man4/NISLDAPmapping.4
+++ b/usr/src/man/man4/NISLDAPmapping.4
@@ -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 NISLDAPMAPPING 4 "Mar 29, 2006"
+.TH NISLDAPMAPPING 4 "April 9, 2016"
 .SH NAME
 NISLDAPmapping \- mapping file used by the NIS server components
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ NISLDAPmapping \- mapping file used by the NIS server components
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBNISLDAPmapping\fR file specifies the mapping between NIS map entries and
 equivalent Directory Information Tree (DIT) entries. The syntax of this file is
@@ -44,7 +43,7 @@ values) takes precedence.
 .LP
 A continuation is indicated by a '\e' (backslash) in the last position,
 immediately before the newline of a line. Characters are escaped, that is,
-exempted from special interpretation, when preceeded by a backslash character.
+exempted from special interpretation, when preceded by a backslash character.
 .sp
 .LP
 The '#' (hash) character starts a comment. White space is either ASCII space or
@@ -52,7 +51,6 @@ a horizontal tab. In general, lines consist of optional white space, an
 attribute name, at least one white space character, and an attribute value.
 .SH EXTENDED DESCRIPTION
 .SS "File Syntax"
-.sp
 .LP
 Repeated fields, with separator characters, are described by the following
 syntax:
@@ -88,7 +86,6 @@ entry[":"...]
 .RE
 
 .SS "Attributes"
-.sp
 .LP
 Attributes generally apply to one more more NIS maps. Map names can be
 specified either on their own,that is in \fBpasswd.byname\fR, in which case
@@ -479,7 +476,7 @@ fields.
 \fB\fBrf_comment\fR\fR
 .ad
 .RS 18n
-Everything following the first occurance of a symbol. \fBrf_comment\fR is
+Everything following the first occurrence of a symbol. \fBrf_comment\fR is
 defined by \fBnisLDAPcommentChar\fR.
 .RE
 
@@ -745,7 +742,6 @@ field name are ignored when information is mapped into the DIT.
 .RE
 
 .SS "Field and Attribute Conversion Syntax"
-.sp
 .LP
 The general format of a \fBfieldattrspec\fR is:
 .sp
@@ -967,7 +963,7 @@ performed without checking if read and write are enabled for the LDAP container
 or NIS map.
 .sp
 .LP
-The ommision of the \fBnamespec\fR in an \fBrhs\fR is only allowed if the
+The omission of the \fBnamespec\fR in an \fBrhs\fR is only allowed if the
 \fBlhs\fR is one or more attributes. The effect is to delete the specified
 attribute(s). In all other situations, an omitted \fBnamespec\fR means that the
 rule is ignored.
@@ -1015,7 +1011,6 @@ If there is an error when evaluating a certain \fBfieldattrspec\fR, including
 retrieval or assignment of entry or field values, the extent to which the other
 \fBfieldattrspec\fR rules are evaluated is unspecified.
 .SS "Wildcards"
-.sp
 .LP
 Where wildcard support is available, it is of the following limited form:
 .sp
@@ -1050,7 +1045,6 @@ Matches any character in the range x to y, inclusive
 Combinations such as \fB[a-cA-C0123]\fR are also allowed, which would match any
 one of a, b, c, A, B, C, 0, 1, 2, or 3.
 .SS "Substring Extraction"
-.sp
 .in +2
 .nf
 substringextract = "(" namespec "," matchspec ")"
@@ -1109,7 +1103,6 @@ way to specify that special case is:
 .in -2
 
 .SS "Values"
-.sp
 .in +2
 .nf
 lval            = "(" formatspec "," namespec *("," namespec) ")"
@@ -1281,7 +1274,6 @@ Remove value of \fBmyName\fR from value \fBmyAliases\fR
 This results in the field values \fBmyName\fR is set to \fBfoo\fR, and
 \fBmyAliases\fR is set to \fBfoo1 foo2\fR.
 .SS "Assignments"
-.sp
 .LP
 The assignment syntax, also found at Field and Attribute Conversion Syntax, is
 as follows:
@@ -1477,7 +1469,6 @@ instance of \fBmgrprfc822mailmember\fR:
 .in -2
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/yp/NISLDAPmapping\fR\fR
@@ -1487,7 +1478,6 @@ Mapping file used by the NIS server components
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1503,7 +1493,6 @@ Interface Stability 	Obsolete
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBinityp2l\fR(1M), \fBmakedbm\fR(1M), \fBypserv\fR(1M),
 \fBber_printf\fR(3LDAP), \fBsprintf\fR(3C), \fBsscanf\fR(3C),
diff --git a/usr/src/man/man4/fdi.4 b/usr/src/man/man4/fdi.4
index a3f7feabaf..60cc582ebd 100644
--- a/usr/src/man/man4/fdi.4
+++ b/usr/src/man/man4/fdi.4
@@ -4,7 +4,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 FDI 4 "Sep 5, 2006"
+.TH FDI 4 "April 9, 2016"
 .SH NAME
 fdi \- HAL device information file format
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ fdi \- HAL device information file format
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The hardware abstraction layer facility, described in \fBhal\fR(5), uses an
 \fBXML\fR-based file format to merge arbitrary properties onto device objects.
@@ -309,7 +308,7 @@ following syntax:
 
 .sp
 .LP
-Device Information files are stored in the following standard hierachy with the
+Device Information files are stored in the following standard hierarchy with the
 following default top level directories \fBinformation\fR, \fBpolicy\fR and
 \fBpreprobe\fR:
 .sp
@@ -429,7 +428,6 @@ Device information for specific devices.
 .LP
 All device information files are matched for every \fBhal\fR device object.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -445,7 +443,6 @@ Interface Stability	Volatile
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBhald\fR(1M), \fBattributes\fR(5), \fBhal\fR(5), \fBlocale\fR(5),
 \fBsmf\fR(5)
diff --git a/usr/src/man/man4/hosts_access.4 b/usr/src/man/man4/hosts_access.4
index 9df0d16182..7452c14b07 100644
--- a/usr/src/man/man4/hosts_access.4
+++ b/usr/src/man/man4/hosts_access.4
@@ -3,7 +3,7 @@
 .\" Modified for Solaris to to add the Solaris stability classification,
 .\" and to add a note about source availability.
 .\"
-.TH HOSTS_ACCESS 4 "Sep 15, 2011"
+.TH HOSTS_ACCESS 4 "April 9, 2016"
 .SH NAME
 hosts_access \- format of host access control files
 .SH DESCRIPTION
@@ -17,7 +17,7 @@ An extended version of the access control language is described in the
 \fIhosts_options\fR(4) document. The extensions are turned on at
 program build time by building with -DPROCESS_OPTIONS.
 .PP
-In the following text, \fIdaemon\fR is the the process name of a
+In the following text, \fIdaemon\fR is the process name of a
 network daemon process, and \fIclient\fR is the name and/or address of
 a host requesting service. Network daemon process names are specified
 in the inetd configuration file.
diff --git a/usr/src/man/man4/inetd.conf.4 b/usr/src/man/man4/inetd.conf.4
index 123129afb5..1b272d6b28 100644
--- a/usr/src/man/man4/inetd.conf.4
+++ b/usr/src/man/man4/inetd.conf.4
@@ -1,7 +1,7 @@
 '\" te
 .\"  Copyright 1989 AT&T Copyright (c) 1985 Regents of the University of California. All rights reserved. The Berkeley software License Agreement specifies the terms and conditions for redistribution.
 .\" Copyright (C) 2004, Sun Microsystems, Inc. All Rights Reserved
-.TH INETD.CONF 4 "Dec 17, 2004"
+.TH INETD.CONF 4 "April 9, 2016"
 .SH NAME
 inetd.conf \- Internet servers database
 .SH SYNOPSIS
@@ -16,7 +16,6 @@ inetd.conf \- Internet servers database
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 In the current release of the Solaris operating system, the \fBinetd.conf\fR
 file is no longer directly used to configure \fBinetd\fR. The Solaris services
@@ -161,7 +160,7 @@ the server that is invoked by \fBinetd\fR will take over the listening socket
 associated with the service, and whether once launched, \fBinetd\fR will
 \fBwait\fR for that server to exit, if ever, before it resumes listening for
 new service requests. The \fIwait-status\fR for datagram servers must be set to
-\fBwait\fR, as they are always invoked with the orginal datagram socket that
+\fBwait\fR, as they are always invoked with the original datagram socket that
 will participate in delivering the service bound to the specified service. They
 do not have separate "listening" and "accepting" sockets. Accordingly, do not
 configure \fBUDP\fR services as \fBnowait\fR. This causes a race condition by
@@ -208,7 +207,6 @@ for services whose \fIwait-status\fR value is \fBnowait\fR.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/netconfig\fR\fR
@@ -236,12 +234,10 @@ Internet network services
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBrlogin\fR(1), \fBrsh\fR(1), \fBin.tftpd\fR(1M), \fBinetadm\fR(1M),
 \fBinetconv\fR(1M), \fBinetd\fR(1M), \fBservices\fR(4), \fBsmf\fR(5)
 .SH NOTES
-.sp
 .LP
 \fB/etc/inet/inetd.conf\fR is the official SVR4 name of the \fBinetd.conf\fR
 file. The symbolic link \fB/etc/inetd.conf\fR exists for \fBBSD\fR
diff --git a/usr/src/man/man4/ippool.4 b/usr/src/man/man4/ippool.4
index 419515db8e..d70b5cad9a 100644
--- a/usr/src/man/man4/ippool.4
+++ b/usr/src/man/man4/ippool.4
@@ -4,7 +4,7 @@
 .\" environment has been installed anywhere other than the default, modify the
 .\" given path to access the file at the installed location.
 .\" Portions Copyright (c) 2015, Joyent, Inc.
-.TH IPPOOL 4 "Mar 18, 2015"
+.TH IPPOOL 4 "April 9, 2016"
 .SH NAME
 ippool, ippool.conf \- IP Pool file format
 .SH DESCRIPTION
@@ -100,7 +100,7 @@ configuration entries.
 When a pool is defined in the configruation file, it must have an associated
 role.  At present the only supported role is
 .B ipf.
-Future development will see futher expansion of their use by other sections
+Future development will see further expansion of their use by other sections
 of IPFilter code.
 .SH EXAMPLES
 The following examples show how the pool configuration file is used with
diff --git a/usr/src/man/man4/krb5.conf.4 b/usr/src/man/man4/krb5.conf.4
index 63ead95eb2..6959901737 100644
--- a/usr/src/man/man4/krb5.conf.4
+++ b/usr/src/man/man4/krb5.conf.4
@@ -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 KRB5.CONF 4 "Oct 29, 2015"
+.TH KRB5.CONF 4 "April 9, 2016"
 .SH NAME
 krb5.conf \- Kerberos configuration file
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ krb5.conf \- Kerberos configuration file
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBkrb5.conf\fR file contains Kerberos configuration information, including
 the locations of \fBKDC\fRs and administration daemons for the Kerberos realms
@@ -142,7 +141,6 @@ For a Key Distribution Center (\fBKDC\fR), can contain the location of the
 .RE
 
 .SS "The \fB[libdefaults]\fR Section"
-.sp
 .LP
 The \fB[libdefaults]\fR section can contain any of the following relations:
 .sp
@@ -409,7 +407,6 @@ to make it a network-wide setting for all realms.
 .RE
 
 .SS "The \fB[appdefaults]\fR Section"
-.sp
 .LP
 This section contains subsections for Kerberos V5 applications, where
 \fIrelation-subsection\fR is the name of an application. Each subsection
@@ -592,7 +589,6 @@ In the following example, \fBkinit\fR gets forwardable tickets by default and
 The application defaults specified here are overridden by those specified in
 the \fB[realms]\fR section.
 .SS "The \fB[realms]\fR Section"
-.sp
 .LP
 This section contains subsections for Kerberos realms, where
 \fIrelation-subsection\fR is the name of a realm. Each subsection contains
@@ -873,7 +869,6 @@ parameters. Most often, you need to specify them only when using a
 non-Solaris-based Kerberos server. Otherwise, the change request is sent over
 \fBRPCSEC_GSS\fR to the Solaris Kerberos administration server.
 .SS "The \fB[domain_realm]\fR Section"
-.sp
 .LP
 This section provides a translation from a domain name or hostname to a
 Kerberos realm name. The \fIrelation\fR can be a host name, or a domain name,
@@ -907,7 +902,6 @@ default into the \fBFUBAR.ORG\fR realm. The entries for the hosts \fBmit.edu\fR
 and \fBfubar.org\fR. Without these entries, these hosts would be mapped into
 the Kerberos realms \fBEDU\fR and \fBORG\fR, respectively.
 .SS "The \fB[logging]\fR Section"
-.sp
 .LP
 This section indicates how Kerberos programs are to perform logging. There are
 two types of relations for this section: relations to specify how to log and a
@@ -1117,7 +1111,6 @@ with a specified time interval of a day.
 .sp
 
 .SS "The \fB[capaths]\fR Section"
-.sp
 .LP
 In order to perform direct (non-hierarchical) cross-realm authentication, a
 database is needed to construct the authentication paths between the realms.
@@ -1222,7 +1215,6 @@ In the above examples, the ordering is not important, except when the same
 relation is used more than once. The client uses this to determine the path.
 (It is not important to the server, since the transited field is not sorted.)
 .SS "PKINIT-specific Options"
-.sp
 .LP
 The following are \fBpkinit-specific\fR options. These values can be specified
 in \fB[libdefaults]\fR as global defaults, or within a realm-specific
@@ -1443,7 +1435,7 @@ it has an acceptable EKU. The use of this option is not recommended.
 .ad
 .sp .6
 .RS 4n
-The presense of this option indicates that the client is willing to accept a
+The presence of this option indicates that the client is willing to accept a
 KDC certificate with a \fBdNSName\fR SAN (Subject Alternative Name) rather than
 requiring the \fBid-pkinit-san\fR as defined in RFC4556. This option can be
 specified multiple times. Its value should contain the acceptable hostname for
@@ -1536,7 +1528,6 @@ pkinit_cert_match = <EKU>msScLogin,clientAuth<KU>digitalSignature
 .RE
 
 .SS "PKINIT URI Types"
-.sp
 .ne 2
 .na
 \fB\fBFILE:\fR\fIfile-name[,key-file-name]\fR\fR
@@ -1655,7 +1646,6 @@ been set to \fBFILE:/tmp/my_proxy.pem\fR.
 .RE
 
 .SS "The \fB[dbmodules]\fR Section"
-.sp
 .LP
 This section consists of relations that provide configuration information for
 plug-in modules. In particular, the relations describe the configuration for
@@ -1840,7 +1830,6 @@ a Kerberos configuration file when the KDC is using the LDAP KDB plug-in.
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/krb5/kdc.log\fR\fR
@@ -1851,7 +1840,6 @@ a Kerberos configuration file when the KDC is using the LDAP KDB plug-in.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1871,13 +1859,11 @@ Interface Stability	See below.
 All of the keywords are Committed, except for the \fBPKINIT\fR keywords, which
 are Volatile.
 .SH SEE ALSO
-.sp
 .LP
 \fBkinit\fR(1), \fBrcp\fR(1), \fBrdist\fR(1), \fBrlogin\fR(1), \fBrsh\fR(1),
 \fBtelnet\fR(1), \fBsyslog\fR(3C), \fBattributes\fR(5), \fBkerberos\fR(5),
 \fBregex\fR(5)
 .SH NOTES
-.sp
 .LP
 If the \fBkrb5.conf\fR file is not formatted properly, the \fBtelnet\fR command
 fails. However, the \fBdtlogin\fR and \fBlogin\fR commands still succeed, even
diff --git a/usr/src/man/man4/ncad_addr.4 b/usr/src/man/man4/ncad_addr.4
index 2b8cc73c05..198a6e87ff 100644
--- a/usr/src/man/man4/ncad_addr.4
+++ b/usr/src/man/man4/ncad_addr.4
@@ -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 NCAD_ADDR 4 "Feb 18, 2003"
+.TH NCAD_ADDR 4 "April 9, 2016"
 .SH NAME
 ncad_addr \- name of the Solaris Network Cache and Accelerator (NCA) socket
 utility library
@@ -14,7 +14,6 @@ utility library
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBncad_addr.so\fR is the Solaris Network Cache and Accelerator (\fBNCA\fR)
 socket utility library. Use this library with a web server to avoid support for
@@ -33,7 +32,7 @@ Interpose the \fBncad_addr\fR interfaces before the interfaces in
 .sp
 .LP
 Using Bourne shell syntax as an example, set \fBLD_PRELOAD\fR as shown below to
-interpose the \fBncad_addr\fR socket utility libary:
+interpose the \fBncad_addr\fR socket utility library:
 
 .sp
 .in +2
@@ -43,7 +42,6 @@ LD_PRELOAD=/usr/lib/ncad_addr.so /usr/bin/httpd
 .in -2
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/ncad_addr.so\fR\fR
@@ -53,7 +51,6 @@ LD_PRELOAD=/usr/lib/ncad_addr.so /usr/bin/httpd
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5)  for descriptions of the following attributes:
 .sp
@@ -69,12 +66,10 @@ Interface Stability	Unstable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBnca\fR(1), \fBncab2clf\fR(1), \fBncakmod\fR(1), \fBsocket\fR(3SOCKET),
 \fBnca.if\fR(4),  \fBncakmod.conf\fR(4), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 Only applications that use the \fBNCA\fR feature, for example, web servers,
 should interpose this library.
diff --git a/usr/src/man/man4/printers.conf.4 b/usr/src/man/man4/printers.conf.4
index b83b032fd2..ed91e8ca6f 100644
--- a/usr/src/man/man4/printers.conf.4
+++ b/usr/src/man/man4/printers.conf.4
@@ -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 PRINTERS.CONF 4 "Jun 2, 2006"
+.TH PRINTERS.CONF 4 "April 9, 2016"
 .SH NAME
 printers.conf \- system printing configuration database
 .SH SYNOPSIS
@@ -31,7 +31,6 @@ printers.conf \- system printing configuration database
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBprinters.conf\fR file is the system printing configuration database.
 System administrators use \fBprinters.conf\fR to describe destinations for the
@@ -46,7 +45,6 @@ checks to see if the NIS+ table (\fBprinters.org_dir\fR) exists and if it does
 not it goes ahead and creates it in the correct format. See \fBlpset\fR(1M) for
 more information.
 .SS "Entries"
-.sp
 .LP
 Each entry in \fBprinters.conf\fR describes one destination. Entries are one
 line consisting of any number of fields separated by colons (`\fB:\fR') and
@@ -76,13 +74,11 @@ NEWLINE. Use the \fBlpset\fR command to create or modify \fBprinters.conf\fR.
 See \fBlpset\fR(1M). Do \fBnot\fR make changes in \fBprinters.conf\fR by using
 an editor.
 .SS "Specifying Configuration Options"
-.sp
 .LP
 \fIkey\fR\fB=\fR\fIvalue\fR pairs are configuration options defined by the
 system administrator. \fIkey\fR and \fIvalue\fR can be of arbitrary length.
 Separate \fIkey\fR and \fIvalue\fR by the equal (`\fB='\fR) character.
 .SS "Client/Server Configuration Options"
-.sp
 .LP
 The following client/server configuration options (represented as
 \fIkey\fR\fB=\fR\fIvalue\fR pairs) are supported:
@@ -139,12 +135,12 @@ and format of the endpoint is determined by the remote print service.
 .ad
 .sp .6
 .RS 4n
-This URI form is used for print queues that are remotely accessable by way of
+This URI form is used for print queues that are remotely accessible by way of
 the BSD Print Protocol. Though limited in capability, this protocol is widely
-used between client and server. It provides maximium interoperability with
+used between client and server. It provides maximum interoperability with
 remote print services. When used to communicate with print services on a
 Solaris print server, the optional \fB#Solaris\fR component of the URI
-indicates that Solaris protcol extensions can be used during print job
+indicates that Solaris protocol extensions can be used during print job
 submission.
 .RE
 
@@ -168,7 +164,7 @@ no protocol extensions are generated. \fIserver\fR is the name of the host
 containing the queue for \fIdestination\fR. \fIdestination\fR is the atomic
 name by which the server knows the destination.  If the configuration file
 contents are to be shared with legacy systems (Solaris 2.6 - Solaris 10), this
-key/value pair should be provided for backward compatability.
+key/value pair should be provided for backward compatibility.
 .RE
 
 .sp
@@ -198,7 +194,6 @@ See \fBlpget\fR(1M), \fBlpstat\fR(1), and \fBcancel\fR(1).
 .RE
 
 .SS "LP Server Options"
-.sp
 .LP
 The following \fBLP\fR configuration options (represented as
 \fIkey\fR\fB=\fR\fIvalue\fR pairs) are supported:
@@ -216,12 +211,11 @@ print requests submitted from a different host. \fBuser-equivalence\fR is set
 to \fBfalse\fR by default. \fBfalse\fR means that usernames are not considered
 equivalent, and does not permit users cancel a print request submitted from a
 different host. If \fBuser-equivalence\fR is set to \fBfalse\fR, print requests
-can only be cancelled by the users on the host on whichs the print prequest was
+can only be cancelled by the users on the host on which the print request was
 generated or by the superuser on the print server.
 .RE
 
 .SS "Print Queue Name Resolution"
-.sp
 .LP
 Applications needing to resolve print queue names (destinations) to the
 associated print service and communications endpoint make use of a specific
@@ -230,7 +224,6 @@ unto themselves and require no further resolution.  Names in atomic form are
 resolved based on the \fBprinters\fR database entry in the /etc/nsswitch.conf
 file. See nsswitch.conf(4)
 .SS "Locating the Personal Default Destination"
-.sp
 .LP
 The default destination is located differently depending on the command.
 .sp
@@ -291,7 +284,6 @@ destination in the following order:
 \fB_default\fR destination in \fB/etc/printers.conf\fR.
 .RE
 .SS "Locating the Interest List for lpstat, lpget, and cancel"
-.sp
 .LP
 The \fBlpget\fR, \fBlpstat\fR, and \fBcancel\fR commands locate the interest
 list in the following order:
@@ -325,7 +317,7 @@ and \fBcancel\fR commands to \fBprinter1\fR, \fBprinter2\fR and \fBprinter3\fR:
 \fBExample 2 \fRSetting the Server Name
 .sp
 .LP
-The following entry sets the server name to \fBserver\fR and and printer name
+The following entry sets the server name to \fBserver\fR and printer name
 to \fBps_printer\fR for destinations \fBprinter1\fR and \fBps\fR. It does not
 generate BSD protocol extensions.
 
@@ -400,7 +392,6 @@ The following example uses IPP as the URI:
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/printers.conf\fR\fR
@@ -446,7 +437,6 @@ LDAP version of \fB/etc/printers.conf\fR
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -462,7 +452,6 @@ Stability Level	Stable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcancel\fR(1), \fBenable\fR(1), \fBenable\fR(1), \fBlp\fR(1), \fBlpq\fR(1B),
 \fBlpr\fR(1B), \fBlprm\fR(1B), \fBlpstat\fR(1), \fBaccept\fR(1M),
diff --git a/usr/src/man/man4/protocols.4 b/usr/src/man/man4/protocols.4
index 967a9b77fd..199da6e0e0 100644
--- a/usr/src/man/man4/protocols.4
+++ b/usr/src/man/man4/protocols.4
@@ -4,7 +4,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 PROTOCOLS 4 "Jun 13, 2002"
+.TH PROTOCOLS 4 "April 9, 2016"
 .SH NAME
 protocols \- protocol name database
 .SH SYNOPSIS
@@ -19,13 +19,12 @@ protocols \- protocol name database
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBprotocols\fR file  is a local source of information regarding the known
 protocols used in the \fBDARPA\fR Internet. The protocols file can be used in
 conjunction with or instead of other protocols sources, including the \fBNIS\fR
-maps ``protcols.byname'' and "protocols.bynumber" and the \fBNIS+\fR table
-``protocols''. Programs use the \fBgetprotobyname\fR(3SOCKET) routine to access
+maps "protocols.byname" and "protocols.bynumber" and the \fBNIS+\fR table
+"protocols". Programs use the \fBgetprotobyname\fR(3SOCKET) routine to access
 this information.
 .sp
 .LP
@@ -83,7 +82,6 @@ ipv6-opts   60  IPv6-Opts   # Destination Options for IPv6
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/nsswitch.conf\fR\fR
@@ -93,11 +91,9 @@ configuration file for name-service switch
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBgetprotobyname\fR(3SOCKET), \fBnsswitch.conf\fR(4)
 .SH NOTES
-.sp
 .LP
 \fB/etc/inet/protocols\fR is the official SVR4 name of the \fBprotocols\fR
 file.  The symbolic link \fB/etc/protocols\fR exists for \fBBSD\fR
diff --git a/usr/src/man/man4/terminfo.4 b/usr/src/man/man4/terminfo.4
index d585eed8d6..d1d5577d62 100644
--- a/usr/src/man/man4/terminfo.4
+++ b/usr/src/man/man4/terminfo.4
@@ -4,7 +4,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 TERMINFO 4 "Jul 9, 1996"
+.TH TERMINFO 4 "April 9, 2016"
 .SH NAME
 terminfo \- terminal and printer capability database
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ terminfo \- terminal and printer capability database
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBterminfo\fR database describes the capabilities of devices such as
 terminals and printers. Devices are described in \fBterminfo\fR source files by
@@ -110,7 +109,6 @@ The \fBterminfo\fR reference manual page is organized in two sections:
 \fBPART 2: PRINTER CAPABILITIES\fR
 .RE
 .SS "PART 1: DEVICE CAPABILITIES"
-.sp
 .LP
 Capabilities in \fBterminfo\fR are of three types:  Boolean capabilities (which
 show that a device has or does not have a particular feature), numeric
@@ -141,7 +139,6 @@ exception of those used for input. Input capabilities, listed under the
 \fBkey_\fR. The \fB#i\fR symbol in the description field of the following
 tables refers to the \fIi\fRth parameter.
 .SS "Booleans"
-.sp
 .in +2
 .nf
 ________________________________________________________________
@@ -215,7 +212,6 @@ xon_xoff                  xon    xo       Terminal uses xon/xoff
 .sp
 
 .SS "Numbers"
-.sp
 .in +2
 .nf
 ________________________________________________________________
@@ -280,7 +276,6 @@ width_status_line     wsl     ws       Number of columns in status line
 .sp
 
 .SS "Strings"
-.sp
 .in +2
 .nf
 ________________________________________________________________
@@ -448,7 +443,6 @@ insert_padding             ip     ip       Insert pad after
 .sp
 
 .SS "key_Strings"
-.sp
 .LP
 The ``\fBkey_\fR'' strings are sent by specific keys. The ``\fBkey_\fR''
 descriptions include the macro, defined in \fB<curses.h>\fR, for the code
@@ -627,7 +621,7 @@ key_left                kcub1   kl       KEY_LEFT, sent by
 key_ll                  kll     kH       KEY_LL, sent by home-down key
 key_mark                kmrk    %2       KEY_MARK, sent by
 key_message             kmsg    %3       KEY_MESSAGE, sent by message key
-key_mouse               kmous   Km       0631, Mouse event has occured
+key_mouse               kmous   Km       0631, Mouse event has occurred
 key_move                kmov    %4       KEY_MOVE, sent by move key
 key_next                knxt    %5       KEY_NEXT, sent by next-object
                                          key
@@ -911,7 +905,6 @@ zero_motion             zerom   Zx       No motion for the
 .sp
 
 .SS "Sample Entry"
-.sp
 .LP
 The following entry, which describes the AT&T 610 terminal, is among the more
 complex entries in the \fBterminfo\fR file as of this writing.
@@ -953,7 +946,6 @@ complex entries in the \fBterminfo\fR file as of this writing.
 .in -2
 
 .SS "Types of Capabilities in the Sample Entry"
-.sp
 .LP
 The sample entry shows the formats for the three types of \fBterminfo\fR
 capabilities listed:  Boolean, numeric, and string. All capabilities specified
@@ -1016,7 +1008,6 @@ period before the capability name. For example, see the second \fBind\fR in the
 example above. Note that capabilities are defined in a left-to-right order and,
 therefore, a prior definition will override a later definition.
 .SS "Preparing Descriptions"
-.sp
 .LP
 The most effective way to prepare a device description is by imitating the
 description of a similar device in \fBterminfo\fR and building up a description
@@ -1033,7 +1024,6 @@ from the middle of the screen, and then press the \fBu\fR key several times
 quickly. If the display is corrupted, more padding is usually needed. A similar
 test can be used for insert-character.
 .SS "Section 1-1: Basic Capabilities"
-.sp
 .LP
 The number of columns on each line for the device is given by the \fBcols\fR
 numeric capability. If the device has a screen, then the number of lines on the
@@ -1123,7 +1113,6 @@ adm3 | lsi adm3,
 .sp
 
 .SS "Section 1-2: Parameterized Strings"
-.sp
 .LP
 Cursor addressing and other strings requiring parameters are described by a
 parameterized string capability, with \fBprintf\fR-like escapes
@@ -1359,7 +1348,6 @@ space (32), adds them (pushing the sum on the stack in place of the two
 previous values), and outputs that value as a character. Then the same is done
 for the second parameter. More complex arithmetic is possible using the stack.
 .SS "Section 1-3: Cursor Motions"
-.sp
 .LP
 If the terminal has a fast way to home the cursor (to very upper left corner of
 screen) then this can be given as \fBhome\fR; similarly a fast way of getting
@@ -1394,7 +1382,6 @@ command character to be the one used by \fBterminfo\fR. If the \fBsmcup\fR
 sequence will not restore the screen after an \fBrmcup\fR sequence is output
 (to the state prior to outputting \fBrmcup\fR), specify \fBnrrmc\fR.
 .SS "Section 1-4: Area Clears"
-.sp
 .LP
 If the terminal can clear from the current position to the end of the line,
 leaving the cursor where it is, this should be given as \fBel\fR. If the
@@ -1405,7 +1392,6 @@ then this should be given as \fBed\fR. \fBed\fR is only defined from the first
 column of a line. (Thus, it can be simulated by a request to delete a large
 number of lines, if a true \fBed\fR is not available.)
 .SS "Section 1-5: Insert/Delete Line"
-.sp
 .LP
 If the terminal can open a new blank line before the line where the cursor is,
 this should be given as \fBil1\fR; this is done only from the first position of
@@ -1452,7 +1438,6 @@ be given. These indicate that deleting a line or scrolling a full screen may
 bring non-blank lines up from below or that scrolling back with \fBri\fR may
 bring down non-blank lines.
 .SS "Section 1-6: Insert/Delete Character"
-.sp
 .LP
 There are two basic kinds of intelligent terminals with respect to
 insert/delete character operations which can be described using \fBterminfo.\fR
@@ -1515,7 +1500,6 @@ terminal needs to be placed in for \fBdch1\fR to work).
 A command to erase \fIn\fR characters (equivalent to outputting \fIn\fR blanks
 without moving the cursor) can be given as \fBech\fR with one parameter.
 .SS "Section 1-7: Highlighting, Underlining, and Visible Bells"
-.sp
 .LP
 Your device may have one or more kinds of display attributes that allow you to
 highlight selected characters when they appear on the screen. The following
@@ -1661,7 +1645,6 @@ Putting this all together into the \fBsgr\fR sequence gives:
 .LP
 Remember that \fBsgr\fR and \fBsgr0\fR must always be specified.
 .SS "Section 1-8: Keypad"
-.sp
 .LP
 If the device has a keypad that transmits sequences when the keys are pressed,
 this information can also be specified. Note that it is not possible to handle
@@ -1704,7 +1687,6 @@ and off, give them in \fBsmln\fR and \fBrmln\fR. \fBsmln\fR is normally output
 after one or more \fBpln\fR sequences to make sure that the change becomes
 visible.
 .SS "Section 1-9: Tabs and Initialization"
-.sp
 .LP
 If the device has hardware tabs, the command to advance to the next tab stop
 can be given as \fBht\fR (usually control I). A ``backtab'' command that moves
@@ -1761,7 +1743,6 @@ Any margin can be cleared with \fBmgc\fR. (For instructions on how to specify
 commands to set and clear margins, see "Margins" below under "PRINTER
 CAPABILITIES".)
 .SS "Section 1-10: Delays"
-.sp
 .LP
 Certain capabilities control padding in the \fBtty\fR driver. These are
 primarily needed by hard-copy terminals, and are used by \fBtput\fR \fBinit\fR
@@ -1771,7 +1752,6 @@ appropriate delay bits to be set in the tty driver. If \fBpb\fR (padding baud
 rate) is given, these values can be ignored at baud rates below the value of
 \fBpb\fR.
 .SS "Section 1-11: Status Lines"
-.sp
 .LP
 If the terminal has an extra ``status line'' that is not normally used by
 software, this fact can be indicated. If the status line is viewed as an extra
@@ -1796,7 +1776,6 @@ line is a different width (possibly because the terminal does not allow an
 entire line to be loaded) the width, in columns, can be indicated with the
 numeric parameter \fBwsl\fR.
 .SS "Section 1-12: Line Graphics"
-.sp
 .LP
 If the device has a line drawing alternate character set, the mapping of glyph
 to character would be given in \fBacsc\fR. The definition of this string is
@@ -1868,7 +1847,6 @@ Now write down the characters left to right, as in
 In addition, \fBterminfo\fR allows you to define multiple character sets. See
 Section 2-5 for details.
 .SS "Section 1-13: Color Manipulation"
-.sp
 .LP
 Let us define two methods of color manipulation:  the Tektronix method and the
 HP method. The Tektronix method uses a set of N predefined colors (usually 8)
@@ -1960,7 +1938,6 @@ cannot coexist with colors. For example, if the terminal uses colors to
 simulate reverse video (bit number 2 and decimal value 4) and bold (bit number
 5 and decimal value 32), the resulting value for \fBncv\fR will be 36 (4 + 32).
 .SS "Section 1-14: Miscellaneous"
-.sp
 .LP
 If the terminal requires other than a null (zero) character as a pad, then this
 can be given as \fBpad\fR. Only the first character of the \fBpad\fR string is
@@ -2032,7 +2009,6 @@ screen when the printer is on, specify \fBmc5i\fR (silent printer). All text,
 including \fBmc4\fR, is transparently passed to the printer while an \fBmc5p\fR
 is in effect.
 .SS "Section 1-15: Special Cases"
-.sp
 .LP
 The working model used by \fBterminfo\fR fits most terminals reasonably well.
 However, some terminals do not completely match that model, requiring special
@@ -2068,7 +2044,6 @@ Those Beehive Superbee terminals which do not transmit the escape or
 control\(miC characters, should specify \fBxsb\fR, indicating that the f1 key
 is to be used for escape and the f2 key for control C.
 .SS "Section 1-16: Similar Terminals"
-.sp
 .LP
 If there are two very similar terminals, one can be defined as being just like
 the other with certain exceptions. The string capability \fBuse\fR can be given
@@ -2092,14 +2067,12 @@ defines an AT&T4424 terminal that does not have the \fBrev\fR, \fBsgr\fR, and
 different modes for a terminal, or for different user preferences. More than
 one \fBuse\fR capability may be given.
 .SS "PART 2: PRINTER CAPABILITIES"
-.sp
 .LP
 The \fBterminfo\fR database allows you to define capabilities of printers as
 well as terminals. To find out what capabilities are available for printers as
 well as for terminals, see the two lists under "DEVICE CAPABILITIES" that list
 capabilities by variable and by capability name.
 .SS "Section 2-1: Rounding Values"
-.sp
 .LP
 Because parameterized string capabilities work only with integer values, we
 recommend that \fBterminfo\fR designers create strings that expect numeric
@@ -2107,7 +2080,6 @@ values that have been rounded. Application designers should note this and
 should always round values to the nearest integer before using them with a
 parameterized string capability.
 .SS "Section 2-2: Printer Resolution"
-.sp
 .LP
 A printer's resolution is defined to be the smallest spacing of characters it
 can achieve. In general printers have independent resolution horizontally and
@@ -2150,7 +2122,6 @@ capability would give the width of a page in columns. In ``micro mode,'' many
 printers the micro mode may be concomitant with normal mode, so that all the
 capabilities work at the same time.
 .SS "Section 2-3: Specifying Printer Resolution"
-.sp
 .LP
 The printing resolution of a printer is given in several ways. Each specifies
 the resolution as the number of smallest steps per distance:
@@ -2318,7 +2289,6 @@ $V sub italic cpi$, $V sub italic lpi$, $V sub italic chr$, and $V sub italic
 cvr$ are the arguments used with \fBcpi\fR, \fBlpi\fR, \fBchr\fR, and
 \fBcvr\fR, respectively. The prime marks (\|'\|) indicate the old values.
 .SS "Section 2-4: Capabilities that Cause Movement"
-.sp
 .LP
 In the following descriptions, ``movement'' refers to the motion of the
 ``current position.'' With video terminals this would be the cursor; with some
@@ -2483,7 +2453,6 @@ Miscellaneous Motion Strings
 .sp
 
 .SS "Margins"
-.sp
 .LP
 \fBterminfo\fR provides two strings for setting margins on terminals:  one for
 the left and one for the right margin. Printers, however, have two additional
@@ -2547,7 +2516,6 @@ the bottom line of the page.
 .LP
 All margins can be cleared with \fBmgc\fR.
 .SS "Shadows, Italics, Wide Characters"
-.sp
 .LP
 Five new sets of strings describe the capabilities printers have of enhancing
 printed text.
@@ -2626,7 +2594,6 @@ affecting shadow, italicized, widened, superscript, or subscript printing.
 Conversely, if \fBmsgr\fR is not set, a program should end these modes before
 attempting any motion.
 .SS "Section 2-5: Alternate Character Sets"
-.sp
 .LP
 In addition to allowing you to define line graphics (described in Section
 1-12), \fBterminfo\fR lets you define alternate character sets. The following
@@ -2713,7 +2680,6 @@ are not available, the strings should not be defined. For printers that have
 manually changed print-wheels or font cartridges, the boolean \fBdaisy\fR is
 set.
 .SS "Section 2-6: Dot-Matrix Graphics"
-.sp
 .LP
 Dot-matrix printers typically have the capability of reproducing
 ``raster-graphics'' images. Three new numeric capabilities and three new string
@@ -2803,7 +2769,6 @@ the decimal values are further offset by the value 63. The \fBporder\fR string
 for these printers would be \fB,,6,5,4,3,2,1;63\fR, or alternately
 \fBo,o,6,5,4,3,2,1;63\fR.
 .SS "Section 2-7: Effect of Changing Printing Resolution"
-.sp
 .LP
 If the control sequences to change the character pitch or the line pitch are
 used, the pin or dot spacing may change:
@@ -2864,7 +2829,6 @@ in steps per inch, before using \fBlpi\fR and after using \fBlpi\fR,
 respectively. Thus, the changes in the dots per inch for dot-matrix graphics
 follow the changes in steps per inch for printer resolution.
 .SS "Section 2-8: Print Quality"
-.sp
 .LP
 Many dot-matrix printers can alter the dot spacing of printed text to produce
 near ``letter quality'' printing or ``draft quality'' printing. Usually it is
@@ -2889,7 +2853,6 @@ The capabilities are listed in decreasing levels of quality. If a printer
 doesn't have all three levels, one or two of the strings should be left blank
 as appropriate.
 .SS "Section 2-9: Printing Rate and Buffer Size"
-.sp
 .LP
 Because there is no standard protocol that can be used to keep a program
 synchronized with a printer, and because modern printers can buffer data before
@@ -2945,7 +2908,6 @@ already been printed, it should shrink the estimate. The application will thus
 err in favor of the user, who wants, above all, to see all the output in its
 correct place.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/share/lib/terminfo/?/*\fR\fR
@@ -2977,13 +2939,11 @@ terminal (escape sequences that set margins and tabs)
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBls\fR(1), \fBpg\fR(1), \fBstty\fR(1), \fBtput\fR(1), \fBtty\fR(1),
 \fBvi\fR(1), \fBinfocmp\fR(1M), \fBtic\fR(1M), \fBprintf\fR(3C),
 \fBcurses\fR(3CURSES), \fBcurses\fR(3XCURSES)
 .SH NOTES
-.sp
 .LP
 The most effective way to prepare a terminal description is by imitating the
 description of a similar terminal in \fBterminfo\fR and to build up a
diff --git a/usr/src/man/man4/utmpx.4 b/usr/src/man/man4/utmpx.4
index f676ed6c3f..7bcd3c6ad9 100644
--- a/usr/src/man/man4/utmpx.4
+++ b/usr/src/man/man4/utmpx.4
@@ -4,7 +4,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 UTMPX 4 "Mar 6, 2008"
+.TH UTMPX 4 "April 9, 2016"
 .SH NAME
 utmpx, wtmpx \- utmpx and wtmpx database entry formats
 .SH SYNOPSIS
@@ -16,7 +16,6 @@ utmpx, wtmpx \- utmpx and wtmpx database entry formats
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fButmpx\fR and \fBwtmpx\fR files are extended database files that have
 superseded the obsolete \fButmp\fR and \fBwtmp\fR database files.
@@ -27,20 +26,18 @@ commands such as \fBwho\fR(1), \fBwrite\fR(1), and \fBlogin\fR(1). The
 \fBwtmpx\fR database contains the history of user access and accounting
 information for the  \fButmpx\fR database.
 .SH USAGE
-.sp
 .LP
 Applications should not access these databases directly, but should use the
 functions described on the \fBgetutxent\fR(3C) manual page to interact with the
 \fButmpx\fR and \fBwtmpx\fR databases to ensure that they are maintained
 consistently.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/var/adm/utmpx\fR\fR
 .ad
 .RS 18n
-user access and adminstration information
+user access and administration information
 .RE
 
 .sp
@@ -49,10 +46,9 @@ user access and adminstration information
 \fB\fB/var/adm/wtmpx\fR\fR
 .ad
 .RS 18n
-history of user access and adminstrative information
+history of user access and administrative information
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBgetutxent\fR(3C), \fBwait\fR(3C), \fBwait.h\fR(3HEAD)
diff --git a/usr/src/man/man4/volume-request.4 b/usr/src/man/man4/volume-request.4
index 8f7464051e..bb8f53c7f0 100644
--- a/usr/src/man/man4/volume-request.4
+++ b/usr/src/man/man4/volume-request.4
@@ -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 VOLUME-REQUEST 4 "Apr 27, 2005"
+.TH VOLUME-REQUEST 4 "April 9, 2016"
 .SH NAME
 volume-request, volume-defaults \- Solaris Volume Manager configuration
 information for top down volume creation with metassist
@@ -24,7 +24,6 @@ information for top down volume creation with metassist
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 A volume request file, XML-based and compliant with the
 \fBvolume-request.dtd\fR Document Type Definition, describes the
@@ -55,7 +54,6 @@ definition in the volume-request.dtd file, located at
 \fB/usr/share/lib/xml/dtd/volume-request.dtd\fR. You create a volume request
 file, and provide it as input to metassist to create volumes from the top down.
 .SS "Defining Volume Request"
-.sp
 .LP
 The top level element \fB<volume-request>\fR surrounds the volume request data.
 This element has no attributes. A volume request requires at least one
@@ -83,14 +81,12 @@ Optionally, the volume-request can include one or more \fB<concat>\fR,
 \fB<stripe>\fR, \fB<mirror>\fR, \fB<volume>\fR elements to specify volumes to
 create.
 .SS "Defining Disk Set"
-.sp
 .LP
 Within the \fB<volume-request>\fR element, a \fB<diskset>\fR element must
 exist. The \fB<diskset>\fR element, with the name attribute, specifies the name
 of the disk set to be used. If this disk set does not exist, it is created.
 This element and the name attribute are required.
 .SS "Defining Availability"
-.sp
 .LP
 Within the \fB<volume-request>\fR element and within other elements, you can
 specify available or unavailable components (disks, or disks on a specific
@@ -111,7 +107,7 @@ specifying \fBc3t2d\fR0 as available would look like:
 .sp
 .LP
 The \fB<available>\fR element also makes any unnamed components unavailable.
-Specifying all controllers exept \fBc1\fR unavailable would look like:
+Specifying all controllers except \fBc1\fR unavailable would look like:
 .sp
 .in +2
 .nf
@@ -132,7 +128,7 @@ Specifying all disks on controller 2 as unavailable would look like:
 .sp
 .LP
 The \fB<unavailable>\fR element can also be used to further restrict the list
-of available components. For example, specifying all controllers exept \fBc1\fR
+of available components. For example, specifying all controllers except \fBc1\fR
 unavailable, and making all devices associated with c1t2 unavailable as well
 would look like this:
 .sp
@@ -158,7 +154,6 @@ example, an unmounted slice that is reserved for different uses) must be
 explicitly specified as unavailable, or the \fBmetassist\fR command can include
 them in the configuration.
 .SS "Defining Hot Spare Pool"
-.sp
 .LP
 The next element within the <volume-request> element, after the \fB<diskset>\fR
 and, optionally, \fB<available>\fR and \fB<unavailable>\fR elements, is the
@@ -190,7 +185,6 @@ SLICE\fR). Depending on the requirements placed on the hot spare pool by other
 parts of the volume request, additional slices can be added to the hot spare
 pool.
 .SS "Defining Slice"
-.sp
 .LP
 The \fB<slice>\fR element is used to define slices to include or exclude within
 other elements. It requires only a name attribute to specify the ctd name of
@@ -205,7 +199,6 @@ of the element. Sample slice elements might look like:
 .in -2
 
 .SS "Defining Stripe"
-.sp
 .LP
 The \fB<stripe>\fR element defines stripes (interlaced RAID 0 volumes) to be
 used in a volume. It can contain either slice elements (to explicitly determine
@@ -244,14 +237,12 @@ hot spare pool should be associated with this component. This attribute is
 specified as a boolean value, as \fBusehsp="TRUE"\fR. If the component is not a
 submirror, this attribute is ignored.
 .SS "Defining Concat"
-.sp
 .LP
 The \fB<concat>\fR element defines concats (non-interlaced RAID 0 volumes) to
 be used in a configuration. It is specified in the same way as a \fB<stripe>\fR
 element, except that the \fBmincomp\fR, \fBmaxcomp\fR, and interlace attributes
 are not valid.
 .SS "Defining Mirror"
-.sp
 .LP
 The \fB<mirror>\fR element defines mirrors (RAID 1 volumes) to be used in a
 volume configuration. It can contain combinations of \fB<concat>\fR and
@@ -293,7 +284,6 @@ attribute is specified in the configuration of the \fB<stripe>\fR or
 \fB<concat>\fR element used as a submirror, it overrides the value of
 \fBusehsp\fR attributes for the mirror as a whole.
 .SS "Defining Volume by Quality of Service"
-.sp
 .LP
 The \fB<volume>\fR element defines volumes (high-level) by the quality of
 service they should provide. (The \fB<volume>\fR element offers the same
@@ -333,7 +323,6 @@ The \fB<volume>\fR element takes an optional datapaths attribute to determine
 if multiple data paths should be required to access the volume. The datapaths
 attribute should be set to a numeric value.
 .SS "Defining Default Values Globally"
-.sp
 .LP
 Global defaults can be set in \fB/etc/default/metassist.xml\fR. This
 volume-defaults file can contain most of the same elements as a volume-request
@@ -429,7 +418,6 @@ set name, and specifically itemizes characteristics of components to create.
 .in -2
 
 .SH BOUNDARY VALUES
-.sp
 .in +2
 .nf
 Attribute       Minimum         Maximum
@@ -444,7 +432,6 @@ redundancy      0               4
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/share/lib/xml/dtd/volume-request.dtd\fR\fR
@@ -475,7 +462,6 @@ redundancy      0               4
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBmetassist\fR(1M), \fBmetaclear\fR(1M), \fBmetadb\fR(1M),
 \fBmetadetach\fR(1M), \fBmetahs\fR(1M), \fBmetainit\fR(1M),
diff --git a/usr/src/man/man5/ieee802.3.5 b/usr/src/man/man5/ieee802.3.5
index 126248f37b..4f6cb9a953 100644
--- a/usr/src/man/man5/ieee802.3.5
+++ b/usr/src/man/man5/ieee802.3.5
@@ -371,7 +371,7 @@ appropriate
 property in
 .Xr dladm 1M .
 .Lp
-Auto-negotation may also be disabled, by setting the
+Auto-negotiation may also be disabled, by setting the
 .Sy adv_autoneg_cap
 property to 0.  In this case, the highest enabled link mode (using the above
 list) is
diff --git a/usr/src/man/man5/locale.5 b/usr/src/man/man5/locale.5
index e490238741..639c6aab67 100644
--- a/usr/src/man/man5/locale.5
+++ b/usr/src/man/man5/locale.5
@@ -8,12 +8,11 @@
 .\" 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 LOCALE 5 "Dec 1, 2003"
+.TH LOCALE 5 "April 9, 2016"
 .SH NAME
 locale \- subset of a user's environment that depends on language and cultural
 conventions
 .SH DESCRIPTION
-.sp
 .LP
 A \fBlocale\fR is the definition of the subset of a user's environment that
 depends on language and cultural conventions. It is made up from one or more
@@ -105,7 +104,6 @@ the value of the corresponding environment variable is used. If the environment
 variable is unset or is set to the empty string, the  \fBsetlocale()\fR
 function sets the appropriate environment.
 .SS "Locale Definition"
-.sp
 .LP
 Locales can be described with the file format accepted by the \fBlocaledef\fR
 utility.
@@ -308,7 +306,6 @@ decimal or hexadecimal constants. Symbolic names not present in the charmap
 file can be specified and will be ignored, as specified under item 1 above.
 .RE
 .SS "LC_CTYPE"
-.sp
 .LP
 The  \fBLC_CTYPE\fR category defines character classification, case conversion
 and other character attributes. In addition, a series of characters can be
@@ -687,7 +684,6 @@ the mapping will be the reverse mapping of the one specified for \fBtoupper\fR.
 .RE
 
 .SS "LC_COLLATE"
-.sp
 .LP
 The  \fBLC_COLLATE\fR category provides a collation sequence definition for
 numerous utilities (such as \fBsort\fR(1), \fBuniq\fR(1), and so forth),
@@ -802,7 +798,6 @@ Specify the end of the collation-order statements.
 .RE
 
 .SS "collating-element \fIkeyword\fR"
-.sp
 .LP
 In addition to the collating elements in the character set, the
 \fBcollating-element\fR keyword is used to define multi-character collating
@@ -838,7 +833,6 @@ Example:
 \fBcollating-element\fR <\fBll\fR> from "\fBll\fR"
 .in -2
 .SS "collating-symbol \fIkeyword\fR"
-.sp
 .LP
 This keyword will be used to define symbols for use in collation sequence
 statements; that is, between the \fBorder_start\fR and the \fBorder_end\fR
@@ -878,7 +872,6 @@ associated with a relative position in the character order sequence. While such
 a symbolic name does not represent any collating element, it can be used as a
 weight.
 .SS "order_start \fIkeyword\fR"
-.sp
 .LP
 The \fBorder_start\fR keyword must precede collation order entries and also
 defines the number of weights for this collation sequence definition and other
@@ -959,7 +952,6 @@ order_start	forward;backward
 .LP
 If no operands are specified, a single \fBforward\fR operand is assumed.
 .SS "Collation Order"
-.sp
 .LP
 The \fBorder_start\fR keyword is followed by collating identifier entries. The
 syntax for the collating element entries is:
@@ -1004,7 +996,7 @@ specified the highest coded character set value in the current coded character
 set. An ellipsis is treated as invalid if the preceding or following lines do
 not specify characters in the current coded character set. The use of the
 ellipsis symbol ties the definition to a specific coded character set and may
-preclude the definition from being portable beween implementations.
+preclude the definition from being portable between implementations.
 .sp
 .LP
 The symbol \fBUNDEFINED\fR is interpreted as including all coded character set
@@ -1159,11 +1151,9 @@ collating symbol <\fBch\fR> and belongs to the same primary equivalence class
 as the multi-character collating element <\fBCh\fR>.
 .RE
 .SS "order_end \fIkeyword\fR"
-.sp
 .LP
 The collating order entries must be terminated with an \fBorder_end\fR keyword.
 .SS "LC_MONETARY"
-.sp
 .LP
 The  \fBLC_MONETARY\fR category defines the rules and symbols that are used to
 format monetary numeric information. This information is available through the
@@ -1671,7 +1661,6 @@ END LC_MONETARY
 The entry \fBn/a\fR indicates that the value is not available in the POSIX
 locale.
 .SS "LC_NUMERIC"
-.sp
 .LP
 The  \fBLC_NUMERIC\fR category defines the rules and symbols that will be used
 to format non-monetary numeric information. This information is available
@@ -1771,7 +1760,6 @@ _
 The entry \fBn/a\fR indicates that the value is not available in the POSIX
 locale.
 .SS "LC_TIME"
-.sp
 .LP
 The  \fBLC_TIME\fR category defines the interpretation of the field descriptors
 supported by  \fBdate\fR(1) and affects the behavior of the \fBstrftime\fR(3C),
@@ -2039,7 +2027,6 @@ field descriptor will be used instead of the value.
 .RE
 
 .SS "LC_TIME \fIC-language\fR Access"
-.sp
 .LP
 The following information can be accessed. These correspond to constants
 defined in <\fBlanginfo.h\fR> and used as arguments to the
@@ -2302,7 +2289,6 @@ _
 .TE
 
 .SS "LC_TIME \fIGeneral\fR Information"
-.sp
 .LP
 Although certain of the field descriptors in the POSIX locale (such as the name
 of the month) are shown with initial capital letters, this need not be the case
@@ -2341,7 +2327,6 @@ in 1776" while 7/14/1789 would come out as "The 14 day of July in 1789" The
 above example is for illustrative purposes only. The \fB%O\fR modifier is
 primarily intended to provide for Kanji or Hindi digits in \fBdate\fR formats.
 .SS "LC_MESSAGES"
-.sp
 .LP
 The  \fBLC_MESSAGES\fR category defines the format and values for affirmative
 and negative responses.
@@ -2435,7 +2420,6 @@ l | l | l .
 In an application conforming to the SUSv3 standard, the information on
 \fByesstr\fR and \fBnostr\fR is not available.
 .SH SEE ALSO
-.sp
 .LP
 \fBdate\fR(1), \fBlocale\fR(1), \fBlocaledef\fR(1), \fBsort\fR(1), \fBtr\fR(1),
 \fBuniq\fR(1), \fBlocaleconv\fR(3C), \fBnl_langinfo\fR(3C),
diff --git a/usr/src/man/man5/mandoc_roff.5 b/usr/src/man/man5/mandoc_roff.5
index bef11f27cf..55be0155aa 100644
--- a/usr/src/man/man5/mandoc_roff.5
+++ b/usr/src/man/man5/mandoc_roff.5
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 17 2015 $
+.Dd $Mdocdate: April 9 2016 $
 .Dt MANDOC_ROFF 5
 .Os
 .Sh NAME
@@ -1579,7 +1579,7 @@ Set tab stops.
 Takes an arbitrary number of arguments.
 Currently unsupported.
 .Ss \&tc
-Change tab repetion character.
+Change tab repetition character.
 Currently unsupported.
 .Ss \&TE
 End a table context.
@@ -2088,7 +2088,7 @@ loops are not.
 .Pp
 The special semantics of the
 .Cm nS
-number register is an idiosyncracy of
+number register is an idiosyncrasy of
 .Ox
 manuals and not supported by other
 .Xr mdoc 5
diff --git a/usr/src/man/man5/pam_authtok_get.5 b/usr/src/man/man5/pam_authtok_get.5
index b2eb247ba8..580186b52d 100644
--- a/usr/src/man/man5/pam_authtok_get.5
+++ b/usr/src/man/man5/pam_authtok_get.5
@@ -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 PAM_AUTHTOK_GET 5 "Dec 14, 2004"
+.TH PAM_AUTHTOK_GET 5 "April 9, 2016"
 .SH NAME
 pam_authtok_get \- authentication and password management module
 .SH SYNOPSIS
@@ -13,14 +13,12 @@ pam_authtok_get \- authentication and password management module
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpam_authtok_get\fR service module provides password prompting
-funtionality to the PAM stack. It implements \fBpam_sm_authenticate()\fR and
+functionality to the PAM stack. It implements \fBpam_sm_authenticate()\fR and
 \fBpam_sm_chauthtok()\fR, providing functionality to both the Authentication
 Stack and the Password Management Stack.
 .SS "Authentication Service"
-.sp
 .LP
 The implementation of \fBpam_sm_authenticate\fR(3PAM) prompts the user name if
 not set and then tries to get the authentication token from the pam handle. If
@@ -29,7 +27,6 @@ the \fBPAM\fR item \fBPAM_AUTHTOK\fR. This module is meant to be the first
 module on an authentication stack where users are to authenticate using a
 keyboard.
 .SS "Password Management Service"
-.sp
 .LP
 Due to the nature of the PAM Password Management stack traversal mechanism, the
 \fBpam_sm_chauthtok\fR(3PAM) function is called twice. Once with the
@@ -65,7 +62,6 @@ The following option can be passed to the module:
 .RE
 
 .SH ERRORS
-.sp
 .LP
 The authentication service returns the following error codes:
 .sp
@@ -108,7 +104,6 @@ Authentication token manipulation error
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -126,7 +121,6 @@ MT Level	MT-Safe with exceptions
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpam\fR(3PAM), \fBpam_authenticate\fR(3PAM), \fBsyslog\fR(3C),
 \fBlibpam\fR(3LIB), \fBpam.conf\fR(4), \fBattributes\fR(5),
@@ -134,7 +128,6 @@ MT Level	MT-Safe with exceptions
 \fBpam_dhkeys\fR(5), \fBpam_passwd_auth\fR(5), \fBpam_unix_account\fR(5),
 \fBpam_unix_auth\fR(5), \fBpam_unix_session\fR(5)
 .SH NOTES
-.sp
 .LP
 The interfaces in \fBlibpam\fR(3LIB) are MT-Safe only if each thread within the
 multi-threaded application uses its own PAM handle.
diff --git a/usr/src/man/man5/pam_list.5 b/usr/src/man/man5/pam_list.5
index 202031466e..47c3b6d934 100644
--- a/usr/src/man/man5/pam_list.5
+++ b/usr/src/man/man5/pam_list.5
@@ -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 PAM_LIST 5 "Mar 26, 2009"
+.TH PAM_LIST 5 "April 9, 2016"
 .SH NAME
 pam_list \- PAM account management module for UNIX
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ pam_list \- PAM account management module for UNIX
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpam_list\fR module implements \fBpam_sm_acct_mgmt\fR(3PAM), which
 provides  functionality to the PAM account management stack.  The module
@@ -21,7 +20,7 @@ provides functions to validate  that  the  user's account  is  valid on this
 host based on a list of users and/or netgroups in the given file. The users and
 netgroups are separated by newline character. Netgroups are specified with
 character '@' as prefix before name of netgroup in the list. The maximum line
-lenght is 1023 characters.
+length is 1023 characters.
 .sp
 .LP
 The username is the value of \fBPAM_USER\fR. The host is the value of
@@ -129,7 +128,6 @@ The user and hostname must be in the same netgroup.
 .RE
 
 .SH ERRORS
-.sp
 .LP
 The following error values are returned:
 .sp
@@ -247,7 +245,6 @@ remoteloginname
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -269,7 +266,6 @@ MT-Level	MT-Safe with exceptions
 The interfaces in \fBlibpam\fR(3LIB) are MT-Safe only if each thread within the
 multithreaded application uses its own PAM handle.
 .SH SEE ALSO
-.sp
 .LP
 \fBpam\fR(3PAM), \fBpam_authenticate\fR(3PAM), \fBpam_sm_acct_mgmt\fR(3PAM),
 \fBsyslog\fR(3C), \fBlibpam\fR(3LIB), \fBnsswitch.conf\fR(4),
diff --git a/usr/src/man/man5/privileges.5 b/usr/src/man/man5/privileges.5
index 2ca9ca6fd2..f7f332c613 100644
--- a/usr/src/man/man5/privileges.5
+++ b/usr/src/man/man5/privileges.5
@@ -4,7 +4,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 PRIVILEGES 5 "Mar 24, 2016"
+.TH PRIVILEGES 5 "April 9, 2016"
 .SH NAME
 privileges \- process privilege model
 .SH DESCRIPTION
@@ -415,7 +415,7 @@ Extensions.
 .ad
 .sp .6
 .RS 4n
-Allow a proces to set \fBSO_MAC_IMPLICIT\fR option by using
+Allow a process to set \fBSO_MAC_IMPLICIT\fR option by using
 \fBsetsockopt\fR(3SOCKET).  This allows a privileged process to transmit
 implicitly-labeled packets to a peer.
 .sp
@@ -1260,7 +1260,7 @@ with I=basic.
 .sp
 .LP
 For most privileges, absence of the privilege simply results in a failure. In
-some instances, the absense of a privilege can cause system calls to behave
+some instances, the absence of a privilege can cause system calls to behave
 differently. In other instances, the removal of a privilege can force a set-uid
 application to seriously malfunction. Privileges of this type are considered
 "unsafe". When a process is lacking any of the unsafe privileges from its limit
diff --git a/usr/src/man/man5/resource_controls.5 b/usr/src/man/man5/resource_controls.5
index f815cc6907..47e1521f41 100644
--- a/usr/src/man/man5/resource_controls.5
+++ b/usr/src/man/man5/resource_controls.5
@@ -4,7 +4,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 RESOURCE_CONTROLS 5 "Jul 19, 2013"
+.TH RESOURCE_CONTROLS 5 "April 9, 2016"
 .SH NAME
 resource_controls \- resource controls available through projects and zones
 .SH DESCRIPTION
@@ -821,7 +821,7 @@ No action is taken on resource requests for an amount that is greater than the
 threshold. This action is useful for monitoring resource usage without
 affecting the progress of applications. You can also enable a global message
 that displays when the resource control is exceeded, while, at the same time,
-the process exceeding the threshhold is not affected.
+the process exceeding the threshold is not affected.
 .RE
 
 .sp
diff --git a/usr/src/man/man5/tecla.5 b/usr/src/man/man5/tecla.5
index 61edb3c856..e9f7092a7c 100644
--- a/usr/src/man/man5/tecla.5
+++ b/usr/src/man/man5/tecla.5
@@ -24,11 +24,10 @@
 .\" or other dealings in this Software without prior written authorization
 .\" of the copyright holder.
 .\" Portions Copyright (c) 2005, Sun Microsystems, Inc. All Rights Reserved.
-.TH TECLA 5 "Sep 10, 2013"
+.TH TECLA 5 "April 9, 2016"
 .SH NAME
 tecla, teclarc \- User interface provided by the tecla library.
 .SH DESCRIPTION
-.sp
 .LP
 This man page describes the command-line editing features that are available to
 users of programs that read keyboard input via the tecla library. Users of the
@@ -44,7 +43,6 @@ default, tab completion is provided. If the application hasn't reconfigured
 this to complete other types of symbols, then tab completion completes file
 names.
 .SS "Key Sequence Notation"
-.sp
 .LP
 In the rest of this man page, and also in all tecla configuration files, key
 sequences are expressed as follows.
@@ -117,7 +115,6 @@ This is just a normal 'A' key.
 .RE
 
 .SS "The Tecla Configuration File"
-.sp
 .LP
 By default, tecla looks for a file called \fB\&.teclarc\fR in your home
 directory (ie. \fB~/.teclarc\fR). If it finds this file, it reads it,
@@ -251,7 +248,6 @@ If you create a \fB~/.teclarc\fR configuration file, but it appears to have no
 effect on the program, check the documentation of the program to see if the
 author chose a different name for this file.
 .SS "Filename and Tilde Completion"
-.sp
 .LP
 With the default key bindings, pressing the TAB key (aka. \fB^I\fR) results in
 tecla attempting to complete the incomplete file name that precedes the cursor.
@@ -273,7 +269,6 @@ The completion binding is implemented using the \fBcpl_complete_word()\fR
 function, which is also available separately to users of this library. See the
 \fBcpl_complete_word\fR(3TECLA) man page for more details.
 .SS "Filename Expansion"
-.sp
 .LP
 With the default key bindings, pressing \fB^X*\fR causes tecla to expand the
 file name that precedes the cursor, replacing \fB~/\fR and \fB~user/\fR
@@ -286,7 +281,6 @@ space-separated list of the files which match the wild cards.
 The expansion binding is implemented using the \fBef_expand_file()\fR function.
 See the \fBef_expand_file\fR(3TECLA) man page for more details.
 .SS "Recalling Previously Typed Lines"
-.sp
 .LP
 Every time that a new line is entered by the user, it is appended to a list of
 historical input lines maintained within the \fBGetLine\fR resource object. You
@@ -362,7 +356,6 @@ hitting it once more would recall the "ls ~/tecla/" line. The pattern syntax is
 the same as that described for file name expansion, in the
 \fBef_expand_file\fR(3TECLA).
 .SS "History Files"
-.sp
 .LP
 Authors of programs that use the tecla library have the option of saving
 historical command-lines in a file before exiting, and subsequently reading
@@ -371,7 +364,6 @@ standard name for this file, since it makes sense for each application to use
 its own history file, so that commands from different applications don't get
 mixed up.
 .SS "International Character Sets"
-.sp
 .LP
 Since \fBlibtecla\fR version 1.4.0, tecla has been 8-bit clean. This means that
 all 8-bit characters that are printable in the user's current locale are now
@@ -403,7 +395,6 @@ locale -a
 .LP
 at the shell prompt.
 .SS "Meta Keys and Locales"
-.sp
 .LP
 Beware that in most locales other than the default C locale, META characters
 become printable, and they are then no longer considered to match \fBM-c\fR
@@ -440,7 +431,6 @@ when you press the left mouse button and the CONTROL key within an xterm
 window. In CDE, dtterms can be similarly coerced to generate escape pairs in
 place of meta characters, by setting the \fBDtterm*KshMode\fR resource to True.
 .SS "Entering International Characters"
-.sp
 .LP
 If you don't have a keyboard that generates all of the international characters
 that you need, there is usually a compose key that will allow you to enter
@@ -462,7 +452,6 @@ xmodmap -e 'keycode 115 = Multi_key'
 .LP
 Type this key followed by a " character to enter an 'I' with a umlaut over it.
 .SS "The Available Key Binding Functions"
-.sp
 .LP
 The following is a list of the editing functions provided by the tecla library.
 The names in the leftmost column of the list can be used in configuration files
@@ -1138,7 +1127,7 @@ parenthesis, or next close parenthesis.
 .ad
 .RS 30n
 Delete the characters from the cursor up to and including the following
-occurence of the next character typed.
+occurrence of the next character typed.
 .RE
 
 .sp
@@ -1148,7 +1137,7 @@ occurence of the next character typed.
 .ad
 .RS 30n
 Delete the characters from the cursor up to and including the preceding
-occurence of the next character typed.
+occurrence of the next character typed.
 .RE
 
 .sp
@@ -1158,7 +1147,7 @@ occurence of the next character typed.
 .ad
 .RS 30n
 Delete the characters from the cursor up to, but not including, the following
-occurence of the next character typed.
+occurrence of the next character typed.
 .RE
 
 .sp
@@ -1168,7 +1157,7 @@ occurence of the next character typed.
 .ad
 .RS 30n
 Delete the characters from the cursor up to, but not including, the preceding
-occurence of the next character typed.
+occurrence of the next character typed.
 .RE
 
 .sp
@@ -1215,7 +1204,7 @@ parenthesis, or next close parenthesis, into the cut buffer.
 \fBforward-copy-find\fR
 .ad
 .RS 30n
-Copy the characters from the cursor up to and including the following occurence
+Copy the characters from the cursor up to and including the following occurrence
 of the next character typed, into the cut buffer.
 .RE
 
@@ -1225,7 +1214,7 @@ of the next character typed, into the cut buffer.
 \fBbackward-copy-find\fR
 .ad
 .RS 30n
-Copy the characters from the cursor up to and including the preceding occurence
+Copy the characters from the cursor up to and including the preceding occurrence
 of the next character typed, into the cut buffer.
 .RE
 
@@ -1236,7 +1225,7 @@ of the next character typed, into the cut buffer.
 .ad
 .RS 30n
 Copy the characters from the cursor up to, but not including, the following
-occurence of the next character typed, into the cut buffer.
+occurrence of the next character typed, into the cut buffer.
 .RE
 
 .sp
@@ -1246,7 +1235,7 @@ occurence of the next character typed, into the cut buffer.
 .ad
 .RS 30n
 Copy the characters from the cursor up to, but not including, the preceding
-occurence of the next character typed, into the cut buffer.
+occurrence of the next character typed, into the cut buffer.
 .RE
 
 .sp
@@ -1435,7 +1424,7 @@ parenthesis, or next close parenthesis, then enter \fBvi\fR insert mode.
 .ad
 .RS 30n
 From \fBvi\fR command mode, delete the characters from the cursor up to and
-including the following occurence of the next character typed, then enter
+including the following occurrence of the next character typed, then enter
 insert mode.
 .RE
 
@@ -1446,7 +1435,7 @@ insert mode.
 .ad
 .RS 30n
 From vi command mode, delete the characters from the cursor up to and including
-the preceding occurence of the next character typed, then enter insert mode.
+the preceding occurrence of the next character typed, then enter insert mode.
 .RE
 
 .sp
@@ -1456,7 +1445,7 @@ the preceding occurence of the next character typed, then enter insert mode.
 .ad
 .RS 30n
 From \fBvi\fR command mode, delete the characters from the cursor up to, but
-not including, the following occurence of the next character typed, then enter
+not including, the following occurrence of the next character typed, then enter
 insert mode.
 .RE
 
@@ -1467,7 +1456,7 @@ insert mode.
 .ad
 .RS 30n
 From \fBvi\fR command mode, delete the characters from the cursor up to, but
-not including, the preceding occurence of the next character typed, then enter
+not including, the preceding occurrence of the next character typed, then enter
 insert mode.
 .RE
 
@@ -1509,7 +1498,6 @@ In \fBvi\fR command mode, repeat the last command that modified the line.
 .RE
 
 .SS "Default Key Bindings In \fBemacs\fR Mode"
-.sp
 .LP
 The following default key bindings, which can be overriden by the tecla
 configuration file, are designed to mimic most of the bindings of the unix
@@ -1580,7 +1568,7 @@ literal-next
 
 .sp
 .LP
-The cursor keys are refered to by name, as follows. This is necessary because
+The cursor keys are referred to by name, as follows. This is necessary because
 different types of terminals generate different key sequences when their cursor
 keys are pressed.
 .sp
@@ -2015,7 +2003,6 @@ Note that \fB^I\fR is what the TAB key generates, and that \fB^@\fR can be
 generated not only by pressing the CONTROL key and the @ key simultaneously,
 but also by pressing the CONTROL key and the space bar at the same time.
 .SS "Default Key Bindings in \fBvi\fR Mode"
-.sp
 .LP
 The following default key bindings are designed to mimic the \fBvi\fR style of
 editing as closely as possible. This means that very few editing functions are
@@ -2150,7 +2137,7 @@ when you type the letter i, for example, the tecla library actually looks up
 the binding for \fBM-i\fR.
 .sp
 .LP
-The cursor keys are refered to by name, as follows. This is necessary because
+The cursor keys are referred to by name, as follows. This is necessary because
 different types of terminals generate different key sequences when their cursor
 keys are pressed.
 .sp
@@ -3563,7 +3550,6 @@ digit-argument (see below)
 .LP
 Note that \fB^I\fR is what the TAB key generates.
 .SS "Entering Repeat Counts"
-.sp
 .LP
 Many of the key binding functions described previously, take an optional count,
 typed in before the target key sequence. This is interpreted as a repeat count
@@ -3627,7 +3613,6 @@ doesn't end in a numeric digit, a new repeat count is started with a value of
 zero, and can be completed by typing in the number, after letting go of the key
 which triggered the digit-argument action.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/libtecla.so\fR\fR
@@ -3655,7 +3640,6 @@ The personal tecla customization file
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -3671,7 +3655,6 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBvi\fR(1), \fBcpl_complete_word\fR(3TECLA), \fBef_expand_file\fR(3TECLA),
 \fBgl_get_line\fR(3TECLA), \fBgl_io_mode\fR(3TECLA), \fBlibtecla\fR(3LIB),
diff --git a/usr/src/man/man7d/cpuid.7d b/usr/src/man/man7d/cpuid.7d
index b14cc64742..f24f73ed40 100644
--- a/usr/src/man/man7d/cpuid.7d
+++ b/usr/src/man/man7d/cpuid.7d
@@ -4,7 +4,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 CPUID 7D "Jun 04, 2015"
+.TH CPUID 7D "April 9, 2016"
 .SH NAME
 cpuid \- CPU identification driver
 .SH SYNOPSIS
@@ -37,7 +37,7 @@ special privileges are required to use the device.
 The device is useful to enable low-level configuration information to be
 extracted from the CPU without having to write any assembler code to invoke the
 \fBcpuid\fR instruction directly. It also allows the kernel to attempt to
-correct any erroneous data returned by the instruction (prompted by occassional
+correct any erroneous data returned by the instruction (prompted by occasional
 errors in the information exported by various processor implementations over
 the years).
 .LP
diff --git a/usr/src/man/man7d/ibd.7d b/usr/src/man/man7d/ibd.7d
index 8ba14f7d63..90350ac5c9 100644
--- a/usr/src/man/man7d/ibd.7d
+++ b/usr/src/man/man7d/ibd.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 IBD 7D "Jul 20, 2007"
+.TH IBD 7D "April 9, 2016"
 .SH NAME
 ibd \- Infiniband IPoIB device driver
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ ibd \- Infiniband IPoIB device driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBibd\fR driver implements the IETF IP over Infiniband protocol and
 provides IPoIB service for all IBA ports present in the system.
@@ -47,9 +46,8 @@ address 255.255.255.255 (also defined as broadcast-GID in IETF documents) must
 be created prior to initializing the device. IBA properties (including mtu,
 qkey and sl) of this group is used by the driver to create any other IBA
 multicast group as instructed by higher level (IP) software. The driver probes
-for the existance of this broadcast-GID during \fBattach\fR(9E).
+for the existence of this broadcast-GID during \fBattach\fR(9E).
 .SH APPLICATION PROGRAMMING INTERFACE (DLPI)
-.sp
 .LP
 The values returned by the driver in the DL_INFO_ACK primitive in response to
 your DL_INFO_REQ are:
@@ -102,7 +100,6 @@ applications receive the IP/ARP datagram along with the IETF defined 4 byte
 header.
 .RE
 .SH WARNING
-.sp
 .LP
 This section describes warning messages that might be generated by the driver.
 Please note that while the format of these messages may be modified in future
@@ -193,13 +190,11 @@ should be checked that IBA cabling is intact, an SM is running on the fabric,
 and the broadcast-GID with appropriate properties has been created in the IBA
 partition.
 .SH CONFIGURATION
-.sp
 .LP
 The IPoIB service comes preconfigured on all HCA ports in the system. To turn
 the service off, or back on after turning it off, refer to documentation in
 \fBcfgadm_ib(1M)\fR.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/ibd*\fR\fR
@@ -245,13 +240,11 @@ configuration file to start IPoIB service
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcfgadm\fR(1M), \fBcfgadm_ib(1M)\fR, \fBifconfig\fR(1M), \fBsyslogd\fR(1M),
 \fBgld\fR(7D), \fBib\fR(7D), \fBkstat\fR(7D), \fBstreamio\fR(7I),
 \fBdlpi\fR(7P), \fBattributes\fR(5), \fBattach\fR(9E)
 .SH NOTES
-.sp
 .LP
 IBD is a GLD-based driver and provides the statistics described by
 \fBgld\fR(7D). Note that valid received packets not accepted by any stream
diff --git a/usr/src/man/man7d/poll.7d b/usr/src/man/man7d/poll.7d
index e3d9e074aa..450da9ec5b 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 "Sep 10, 2013"
+.TH POLL 7D "April 9, 2016"
 .SH NAME
 poll \- driver for fast poll on many file descriptors
 .SH SYNOPSIS
@@ -109,7 +109,7 @@ successfully or \fB-1\fR when write fails.
 .sp
 .LP
 The \fBDP_POLL\fR ioctl is used to retrieve returned \fBpoll\fR \fBevents\fR
-occured on the  polled file descriptors in the monitored set represented by
+occurred on the  polled file descriptors in the monitored set represented by
 \fIfd\fR. \fIarg\fR \fIis\fR \fIa\fR pointer to the devpoll structures which
 are defined as follows:
 .sp
diff --git a/usr/src/man/man7d/sgen.7d b/usr/src/man/man7d/sgen.7d
index 4578497f6b..dc2c9078f1 100644
--- a/usr/src/man/man7d/sgen.7d
+++ b/usr/src/man/man7d/sgen.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 SGEN 7D "Mar 29, 2008"
+.TH SGEN 7D "April 9, 2016"
 .SH NAME
 sgen \- Generic SCSI device driver
 .SH SYNOPSIS
@@ -18,14 +18,12 @@ sgen \- Generic SCSI device driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsgen\fR driver exports the \fBuscsi\fR(7I) interfaces to user processes.
 The \fBsgen\fR driver can be configured to bind to \fBSCSI\fR devices for which
 no system driver is available. Examples of such devices include \fBSCSI\fR
 scanners and \fBSCSI\fR processor devices.
 .SH SECURITY
-.sp
 .LP
 Typically, drivers which export the \fBuscsi\fR(7I) interface unconditionally
 require that the user present superuser credentials. The \fBsgen\fR driver does
@@ -49,11 +47,10 @@ device may create other   problems. It may be possible for a user to instruct a
 target device to gather data from another target device on the same bus. It may
 also be possible for malicious users to install new firmware onto a device to
 which they are granted access. In environments where security is a concern but
-user access to devices controlled by the \fBsgen\fR driver is nontheless
+user access to devices controlled by the \fBsgen\fR driver is nonetheless
 desired, it is recommended that the devices be separated onto a dedicated
 \fBSCSI\fR bus to mitigate the risk of data corruption and security violations.
 .SH CONFIGURATION
-.sp
 .LP
 The \fBsgen\fR driver is configurable via the \fBsgen.conf\fR file. In addition
 to standard \fBSCSI\fR device configuration directives (see \fBscsi\fR(4)),
@@ -103,7 +100,6 @@ larger systems with many \fBSCSI\fR controllers, carefully edit the
 \fBsgen.conf\fR file so that \fBsgen\fR binds only where needed. Refer to
 \fBdriver.conf\fR(4) for further details.
 .SH PROPERTIES
-.sp
 .ne 2
 .na
 \fB\fBinquiry-config-list\fR\fR
@@ -294,10 +290,9 @@ contents of each CDB passed to the driver.
 .sp
 .LP
 In ascending order, each level includes the diagnostics that the previous level
-reports. See the IOCTLS section for more infomation on the \fBSGEN_IOC_DIAG\fR
+reports. See the IOCTLS section for more information on the \fBSGEN_IOC_DIAG\fR
 ioctl.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fBsgen.conf\fR\fR
@@ -326,7 +321,6 @@ for naming disks. For example, \fB/dev/dsk/c0t0d0s0\fR and
 .RE
 
 .SH IOCTLS
-.sp
 .LP
 The \fBsgen\fR driver exports the \fBuscsi\fR(7I) interface for each device it
 manages. This allows a user process to talk directly to a \fBSCSI\fR device for
@@ -354,7 +348,6 @@ meaning as in the \fBsgen-diag\fR property discussed in PROPERTIES above.
 .RE
 
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBEBUSY\fR\fR
@@ -384,7 +377,6 @@ Indicates that the device does  not  support the  requested ioctl function.
 .RE
 
 .SH EXAMPLES
-.sp
 .LP
 Here is an example of how \fBsgen\fR can be configured to bind to scanner
 devices on the system:
@@ -411,7 +403,6 @@ For large systems where boot times are a concern, it is recommended that the
 \fBparent=""\fR property be used to specify which \fBSCSI\fR bus \fBsgen\fR
 should examine.
 .SH SEE ALSO
-.sp
 .LP
 \fBdriver.conf\fR(4), \fBscsi\fR(4), \fBsd\fR(7D), \fBst\fR(7D),
 \fBuscsi\fR(7I)
diff --git a/usr/src/man/man7d/st.7d b/usr/src/man/man7d/st.7d
index e1d5ae3c53..2e1ab1ca38 100644
--- a/usr/src/man/man7d/st.7d
+++ b/usr/src/man/man7d/st.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 ST 7D "Oct 22, 2008"
+.TH ST 7D "April 9, 2016"
 .SH NAME
 st \- driver for SCSI tape devices
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ st \- driver for SCSI tape devices
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBst\fR device driver provides a standard interface to various \fBSCSI\fR
 tape devices. See \fBmtio\fR(7I) for details.
@@ -88,13 +87,11 @@ open, as per the POSIX standard (see \fBstandards\fR(5)). However, if a command
 not found in the above list is used, a  reservation will occur to provide
 reserve/release functionality before the command is issued.
 .SS "Persistent Errors and Asynchronous Tape Operation"
-.sp
 .LP
 The \fBst\fR driver now supports persistent errors (see \fBmtio\fR(7I) and
 asynchronous tape operations (see \fBmtio\fR(7I), \fBaioread\fR(3C), and
 \fBaiowrite\fR(3C)).
 .SS "Read Operation"
-.sp
 .LP
 If the driver is opened for reading in a different format than the tape is
 written in, the driver overrides the user-selected format. For example, if a
@@ -109,12 +106,10 @@ message to inform you of an overridden format selection. Some devices
 automatically perform this function and do not require driver support (1/2"
 reel tape drive, for example).
 .SS "Write Operation"
-.sp
 .LP
 Writing from the beginning of tape is performed in the user-specified format.
 The original tape format is used for appending onto previously written tapes.
 .SS "Tape Configuration"
-.sp
 .LP
 The \fBst\fR driver has a built-in configuration table for most Sun-supported
 tape drives. For those tape drives that are not in the table, the \fBst\fR
@@ -479,7 +474,7 @@ release on close. If an attempt to use a ioctl of \fBMTRESERVE\fR or
 .RS 4n
 The \fBST_READ_IGNORE_ILI\fR flag is applicable only to variable block devices
 which support the SILI bit option. The \fBST_READ_IGNORE_ILI\fR flag indicates
-that SILI (supress incorrect length indicator) bit will be set during reads.
+that SILI (suppress incorrect length indicator) bit will be set during reads.
 When this flag is set, short reads (requested read size is less than the record
 size on the tape) will be successful and the number of bytes transferred will
 be equal to the record size on the tape. The tape will be positioned at the
@@ -626,7 +621,6 @@ before issuing the unload.
 \fB<erase time-out>\fR Time in seconds to preform a full (BOT to EOT) erase of
 longest medium with worst case error recovery.
 .SS "Device Statistics Support"
-.sp
 .LP
 Each device maintains I/O statistics both for the device and for each partition
 allocated on that device. For each device/partition, the driver accumulates
@@ -640,7 +634,6 @@ Each device also has error statistics associated with it. These must include
 counters for hard errors, soft errors and transport errors. Other data may be
 implemented as required.
 .SH IOCTLS
-.sp
 .LP
 The behavior of \fBSCSI\fR tape positioning ioctls is the same across all
 devices which support them. (Refer to \fBmtio\fR(7I).) However, not all devices
@@ -671,7 +664,6 @@ Note that the error status is reset by the \fBMTIOCGET\fR get status ioctl call
 or by the next read, write, or other ioctl operation. If no error has occurred
 (sense key is \fB0\fR), the current file and record position is returned.
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBEACCES\fR\fR
@@ -805,7 +797,6 @@ name="st" class="scsi"
 .in -2
 
 .SS "Large Record Sizes"
-.sp
 .LP
 To support applications such as seismic programs that require large record
 sizes, the flag \fBST_NO_RECSIZE_LIMIT\fR must be set in drive option in the
@@ -831,7 +822,6 @@ platforms.
 .LP
 (Refer to the \fBWARNINGS\fR section for more information.)
 .SS "EOT Handling"
-.sp
 .LP
 The Emulex drives have only a physical end of tape (PEOT); thus it is not
 possible to write past EOT. All other drives have a logical end of tape
@@ -854,7 +844,6 @@ Reading past \fBEOT\fR is transparent to the user. Reading is stopped only by
 reading EOF's. For 1/2" reel devices, it is possible to read off the end of the
 reel if one reads past the two file marks which mark the end of recorded media.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/st.conf\fR\fR
@@ -959,14 +948,12 @@ l l .
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBmt\fR(1), \fBmodload\fR(1M), \fBmodunload\fR(1M), \fBopen\fR(2),
 \fBread\fR(2), \fBwrite\fR(2), \fBaioread\fR(3C), \fBaiowrite\fR(3C),
 \fBkstat\fR(3KSTAT), \fBdriver.conf\fR(4), \fBscsi\fR(4), \fBstandards\fR(5),
 \fBesp\fR(7D), \fBisp\fR(7D), \fBmtio\fR(7I), \fBioctl\fR(9E)
 .SH DIAGNOSTICS
-.sp
 .LP
 The \fBst\fR driver diagnostics may be printed to the console or messages file.
 .sp
@@ -1381,7 +1368,6 @@ These diagnostics are only seen with tape drives with the
 ST_RETRY_ON_RECOVERED_DEFERRED_ERROR bit set. See \fBstdef.h\fR for explanation
 of the specific usage of this setting.
 .SH WARNINGS
-.sp
 .LP
 Effective with Solaris 2.4, the \fBST_NO_RECSIZE_LIMIT\fR flag is set for the
 built-in config entries of the Archive \fBDAT\fR and Exabyte drivers by
@@ -1399,7 +1385,6 @@ reading of tapes written prior to Solaris 2.4 with large block sizes.
 .LP
 (Refer to \fBmtio\fR(7I) for a description of maximum record sizes.)
 .SH BUGS
-.sp
 .LP
 Tape devices that do not return a \fBBUSY\fR status during tape loading prevent
 user commands from being held until the device is ready. The user must delay
diff --git a/usr/src/man/man7d/su.7d b/usr/src/man/man7d/su.7d
index eb04fe961b..8c13961dea 100644
--- a/usr/src/man/man7d/su.7d
+++ b/usr/src/man/man7d/su.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 SU 7D "Jun 18, 2004"
+.TH SU 7D "April 9, 2016"
 .SH NAME
 su \- asynchronous serial port driver
 .SH SYNOPSIS
@@ -22,11 +22,10 @@ open("/dev/cua\fI[a-z]\fR", _\fImode\fR);
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsu\fR module is a loadable STREAMS driver that provides basic support
 for standard \fBUARTS\fR that use Intel-8250, National
-Semiconductor-16450/16550 hardware and Southbridge 1535D (16550 compatable)
+Semiconductor-16450/16550 hardware and Southbridge 1535D (16550 compatible)
 Super I/O hardware. The module also provides keyboard and mouse I/O support for
 Sun machines using those same Intel, National Semiconductor and Southbridge
 chipsets. The \fBsu\fR driver provides basic asynchronous communication support
@@ -62,7 +61,6 @@ device number. By accessing character-special devices with names of the form
 Detect\fR signal being asserted, either through hardware or an equivalent
 software mechanism. These devices are commonly known as \fI_dial-out_\fR lines.
 .SH APPLICATION PROGRAMMING INTERFACE
-.sp
 .LP
 Once a \fB/dev/cua\fR\fI_n_\fR line is opened, the corresponding tty, or ttyd
 line cannot be opened until the \fB/dev/cua\fR\fI_n_\fR line is closed. A
@@ -77,7 +75,6 @@ renamed from \fB/dev/tty00\fR) and used for dial-in (by enabling the line for
 login in \fB/etc/inittab\fR) or dial-out (by \fBtip\fR(1) or \fBuucp\fR(1C)) as
 \fB/dev/cua0\fR when no one is logged in on the line.
 .SH IOCTLS
-.sp
 .LP
 The standard set of \fBtermio\fR \fBioctl()\fR calls are supported by \fBsu\fR.
 .sp
@@ -122,7 +119,6 @@ carriage return, tilde and control-B (CR ~ CTRL-B), but may be changed by the
 driver. For more information on breaking (entering the debugger or monitor),
 see \fBkbd\fR(1) and \fBkb\fR(7M).
 .SH ERRORS
-.sp
 .LP
 An \fBopen()\fR will fail under the following conditions:
 .sp
@@ -156,7 +152,6 @@ The unit has been marked as exclusive-use by another process with a
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/cua/[a-z]\fR\fR
@@ -184,7 +179,6 @@ binary compatibility package device names
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -200,14 +194,12 @@ Architecture	 SPARC
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBstrconf\fR(1), \fBkbd\fR(1), \fBtip\fR(1),\fBuucp\fR(1C),
 \fBautopush\fR(1M), \fBkstat\fR(1M), \fBpppd\fR(1M), \fBioctl\fR(2),
 \fBopen\fR(2), \fBtermios\fR(3C), \fBdacf.conf\fR(4), \fBattributes\fR(5),
 \fBkb\fR(7M), \fBldterm\fR(7M), \fBttcompat\fR(7M), \fBtermio\fR(7I)
 .SH DIAGNOSTICS
-.sp
 .LP
 The \fBsu\fR driver keeps track of various warning and error conditions using
 \fBkstat\fR counters. The output of the \fBkstat su\fR command provides
diff --git a/usr/src/man/man7d/ugen.7d b/usr/src/man/man7d/ugen.7d
index a9a5b11305..d870b946bc 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 "Sep 10, 2013"
+.TH UGEN 7D "April 9, 2016"
 .SH NAME
 ugen \- USB generic driver
 .SH SYNOPSIS
@@ -18,13 +18,12 @@ ugen \- USB generic driver
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBugen\fR is a generic USBA (Solaris USB Architecture) compliant client
 character driver that presents USB devices to applications through a standard
 \fBopen\fR(2), \fBclose\fR(2), \fBread\fR(2), \fBwrite\fR(2),
 \fBaioread\fR(3C), \fBaiowrite\fR(3C) Unix interface. Uninterpreted raw data
-are transfered to and from the device via file descriptors created for each USB
+are transferred to and from the device via file descriptors created for each USB
 endpoint. Status is obtained by reading file descriptors created for endpoint
 and full device status.
 .sp
@@ -34,7 +33,6 @@ transfers. \fBlibusb\fR(3LIB) uses \fBugen\fR to access devices that do not
 contain drivers (such as digital cameras and PDAs). Refer to
 \fB/usr/sfw/share/doc/libusb/libusb.txt\fR for details.
 .SH BINDING
-.sp
 .LP
 In general, no explicit binding of the \fBugen\fR driver is necessary because
 \fBusb_mid\fR(7D) is the default driver for devices without a class or vendor
@@ -162,7 +160,6 @@ ugen driver device-bindings.
 Any pre-existing ugen driver device-bindings are preserved across operating
 system upgrades.
 .SH LOGICAL DEVICE NAME FORMAT
-.sp
 .LP
 For each device or child device it manages, \fBugen\fR creates one logical
 device name for device-wide status and one logical device name for endpoint 0.
@@ -305,7 +302,6 @@ alternate interface. A configuration change is prohibited when any non-zero
 endpoint device nodes are open. An alternate interface switch is prohibited if
 any endpoint in the same interface is open.
 .SH HOT-PLUGGING
-.sp
 .LP
 A device may be hot-removed at any time. Following hot-removal, the device
 status changes to USB_DEV_STAT_DISCONNECTED, the status of open endpoints
@@ -314,7 +310,6 @@ transfer requests fail. Endpoints are reactivated by first reinserting the
 device and then closing and reopening all endpoints that were open when the
 device was disconnected.
 .SH CPR (CHECKPOINT/RESUME)
-.sp
 .LP
 CPR (Checkpoint/Resume) may be initiated at any time and is treated similarly
 to a hot-removal. Upon successful suspend and resume, all subsequent transfer
@@ -323,19 +318,17 @@ should close and reopen all endpoints to reinstate them. All endpoint and
 device status on Resume (before close and reopen) is USB_LC_STAT_SUSPENDED. A
 system suspend will fail while \fBugen\fR is performing a transfer.
 .SH DEVICE POWER MANAGEMENT
-.sp
 .LP
 Devices which support remote wakeup can be power managed when they have no open
 logical device nodes. When an application opens the first logical device node
 of a device, that application should assume that a reinitialization of device
 state is required.
 .SH DEVICE STATUS MANAGEMENT
-.sp
 .LP
 Applications can monitor device status changes by reading the device status
 from the device status logical name. When opened without O_NONBLOCK and
-O_NDELAY, all reads from that file descriptor (with the exception of the the
-intial read that follows the open) block until a device status change occurs.
+O_NDELAY, all reads from that file descriptor (with the exception of the
+initial read that follows the open) block until a device status change occurs.
 Calls to read will always return immediately if opened with \fBO_NONBLOCK\fR or
 \fBO_NDELAY\fR. Nonblocking calls to read which have no data to return, return
 no error and zero bytes read.
@@ -425,7 +418,6 @@ device status logical names.  Poll indicates when reading a logical name would
 return data. See \fBpoll\fR(2) for details. Calls to read may be done whether
 or not they follow calls to poll.
 .SH ENDPOINT STATUS MANAGEMENT
-.sp
 .LP
 Each data endpoint has a corresponding status logical name. Use the status
 logical name to retrieve the state of the data endpoint, including detail on
@@ -459,7 +451,7 @@ if (ep1_stat_fd < 0) {
 
 data_xfered = write(ep1_data_fd, request, sizeof (request));
 
-/* An error occured during the data transfer. */
+/* An error occurred during the data transfer. */
 if (data_xfered != sizeof (request)) {
 
         /* Read status file descriptor for details on failure. */
@@ -482,7 +474,6 @@ if (data_xfered != sizeof (request)) {
 .in -2
 
 .SH CONTROL TRANSFERS
-.sp
 .LP
 The control endpoint is typically used to set up the device and to query device
 status or configuration.
@@ -760,7 +751,6 @@ configuration.  For sake of brevity, uninteresting parts are omitted.
 .in -2
 
 .SH INTERRUPT-IN TRANSFERS
-.sp
 .LP
 Applications requiring data from an interrupt-IN endpoint should open the
 corresponding logical device name and use \fBread\fR(2), \fBaioread\fR(3C) and
@@ -899,7 +889,6 @@ without O_NONBLOCK  or  O_NDELAY).  Set the new element's event field to POLLIN
 like the other elements. Note that only interrupt-IN endpoints and the device
 status endpoint can be monitored using \fBpoll\fR(2).
 .SH INTERRUPT-OUT TRANSFERS
-.sp
 .LP
 Applications requiring output on an interrupt-OUT endpoint can open the
 corresponding  logical  device name and perform regular UNIX I/O  system calls
@@ -932,7 +921,6 @@ Data can be written to an interrupt-OUT endpoint as follows:
 .in -2
 
 .SH BULK TRANSFERS
-.sp
 .LP
 Applications requiring I/O on a bulk endpoint can open the corresponding
 logical device name and perform regular UNIX I/O system calls. For example:
@@ -977,7 +965,6 @@ Data can be read from a bulk-IN endpoint as follows:
 .in -2
 
 .SH ISOCHRONOUS TRANSFERS
-.sp
 .LP
 Applications requiring I/O on an isochronous endpoint can open the
 corresponding logical device name and perform regular UNIX I/O system calls
@@ -1244,7 +1231,6 @@ endpoint:
 .in -2
 
 .SH ERRORS
-.sp
 .LP
 The following statuses are returned by endpoint status device logical names:
 .sp
@@ -1596,7 +1582,6 @@ No memory for the allocation of internal structures.
 .RE
 
 .SH FILES
-.sp
 .in +2
 .nf
         /kernel/drv/ugen   32 bit ELF kernel module (x86 platform only)
@@ -1638,7 +1623,6 @@ No memory for the allocation of internal structures.
 where \fIN\fR is an integer representing the instance number of this type of
 device. (All logical device names for a single device share the same \fIN\fR.)
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1654,13 +1638,11 @@ Architecture	PCI-based  SPARC
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibusb\fR(3LIB), \fBclose\fR(2), \fBpoll\fR(2), \fBread\fR(2),
 \fBwrite\fR(2), \fBaioread\fR(3C), \fBaiowrite\fR(3C), \fBusba\fR(7D),
 \fBusb_dev_descr\fR(9S).
 .SH DIAGNOSTICS
-.sp
 .LP
 In addition to being logged, the following messages may appear on the system
 console. All messages are formatted in the following manner:
@@ -1717,7 +1699,6 @@ to identify the original device with a name string.
 .RE
 
 .SH NOTES
-.sp
 .LP
 \fBugen\fR returns \fB-1\fR for all commands and sets \fBerrno\fR to
 \fBENODEV\fR when device has been hot-removed or resumed from a suspend. The
diff --git a/usr/src/man/man7d/usba.7d b/usr/src/man/man7d/usba.7d
index dffea6da91..c917bed146 100644
--- a/usr/src/man/man7d/usba.7d
+++ b/usr/src/man/man7d/usba.7d
@@ -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 USBA 7D "Apr 22, 2009"
+.TH USBA 7D "April 9, 2016"
 .SH NAME
 usba, usb \- Solaris USB Architecture (USBA)
 .SH DESCRIPTION
-.sp
 .LP
 USB provides a low-cost means for attaching peripheral devices, including
 mass-storage devices, keyboards, mice, and printers, to a system. For complete
@@ -33,7 +32,6 @@ a complete list of USBA interfaces, see \fBIntro\fR(9F) and \fBIntro\fR(9S).
 Devices without a driver may have a  \fBlibusb\fR(3LIB) application. For more
 information, see \fB/usr/sfw/share/doc/libusb/libusb.txt\fR.
 .SH FILES
-.sp
 .LP
 Listed below are drivers and modules which either utilize or are utilized by
 USBA. Drivers in \fB/kernel/drv\fR are 32 bit drivers (x86 only). Drivers in
@@ -91,7 +89,6 @@ kernel/drv/[sparcv9|amd64/]ehci         enhanced host controller driver
 .sp
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -107,7 +104,6 @@ Architecture	PCI-based  systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcfgadm_usb\fR(1M), \fBlibusb\fR(3LIB), \fBattributes\fR(5), \fBehci\fR(7D),
 \fBhid\fR(7D), \fBhubd\fR(7D), \fBohci\fR(7D), \fBscsa2usb\fR(7D),
@@ -131,12 +127,10 @@ Architecture	PCI-based  systems
 .LP
 http://www.sun.com
 .SH NOTES
-.sp
 .LP
 Booting from USB mass-storage devices is not supported on SPARC, but is
 supported on X86.
 .SH DIAGNOSTICS
-.sp
 .LP
 The messages described below may appear on the system console as well as being
 logged. All  messages are formatted in the following manner:
@@ -168,7 +162,7 @@ name or the device name.
 .ad
 .sp .6
 .RS 4n
-An internal error occured.  Please reboot your system.  If this problem
+An internal error occurred.  Please reboot your system.  If this problem
 persists, contact your system vendor.
 .RE
 
diff --git a/usr/src/man/man7d/usbprn.7d b/usr/src/man/man7d/usbprn.7d
index 5fe69f2b4f..017e648cd7 100644
--- a/usr/src/man/man7d/usbprn.7d
+++ b/usr/src/man/man7d/usbprn.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 USBPRN 7D "Jun 18, 2005"
+.TH USBPRN 7D "April 9, 2016"
 .SH NAME
 usbprn \- USB printer class driver
 .SH SYNOPSIS
@@ -23,7 +23,6 @@ usbprn@unit-address
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBusbprn\fR driver is a USBA (Solaris USB Architecture) compliant client
 driver that supports the \fIUSB Printer Class 1.0\fR specification. The
@@ -43,11 +42,10 @@ additional format conversion packages available in the Solaris distribution.
 Configuration of these conversion packages under the Solaris printing system
 can be simplified through the use of the \fBprintmgr\fR(1M). This tool allows
 selection of printer manufacturer/model information while creating a print
-queue. For USB connected printers, it attempts to pre-select the the
+queue. For USB connected printers, it attempts to pre-select the
 manufacturer and model information based on the 1284 device id supplied by the
 printer.
 .SS "UGEN (Generic USB)"
-.sp
 .LP
 The \fBusbprn\fR driver also supports a \fBugen\fR(7D) interface allowing raw
 access to the device, for example by \fBlibusb\fR(3LIB) applications, by
@@ -55,7 +53,6 @@ passing the drivers bound to each interface. Because a libusb application might
 change the state of the device, you should not access the device through the
 child interface drivers.
 .SH DEFAULT OPERATION
-.sp
 .LP
 With certain minor exceptions (outlined in the Notes sections below), the
 \fBusbprn\fR driver supports a subset of the \fBecpp\fR(7D) ioctl interfaces:
@@ -78,7 +75,6 @@ to their default values with each \fBattach\fR(9E). (The \fBecpp\fR(7D) driver
 resets configuration variables with each \fBopen\fR(2).)
 .RE
 .SH WRITE OPERATION
-.sp
 .LP
 A \fBwrite\fR(2) operation returns the number of bytes successfully written to
 the device. If a failure occurs while a driver is transferring data to printer,
@@ -87,7 +83,6 @@ be retrieved by the application program using the ECPPIOC_GETERR \fBioctl\fR(2)
 call. The captured status information is overwritten each time an
 ECPPIOC_TESTIO \fBioctl\fR(2) occurs.
 .SH IOCTLS
-.sp
 .LP
 The \fBusbprn\fR driver supports \fBprnio(7I)\fR interfaces. Note that the
 \fBPRNIOC_RESET\fR command has no effect on USB printers.
@@ -250,11 +245,9 @@ Unlike \fBecpp\fR(7D), only the ECPP_CENTRONICS mode is currently supported in
 .RE
 
 .SH READ OPERATION
-.sp
 .LP
  The \fBread\fR operation is not supported and returns \fBEIO\fR.
 .SH ERRORS
-.sp
 .ne 2
 .na
 \fB\fBEBUSY\fR\fR
@@ -318,7 +311,6 @@ other than ECPP_CENTRONICS in the \fBecpp_transfer_parms\fR structure.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/drv/usbprn\fR\fR
@@ -364,7 +356,6 @@ Character special files
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -380,7 +371,6 @@ Architecture	SPARC, x86, PCI-based systems
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcfgadm_usb\fR(1M), \fBprintmgr\fR(1M), \fBioctl\fR(2), \fBopen\fR(2),
 \fBread\fR(2), \fBwrite\fR(2), \fBlibusb\fR(3LIB), \fBattributes\fR(5),
@@ -402,7 +392,6 @@ Architecture	SPARC, x86, PCI-based systems
 .LP
 http://\fIwww.sun.com/io\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 In addition to being logged, the following messages may appear on the system
 console. All messages are formatted in the following manner:
@@ -462,7 +451,6 @@ to the hot-removal may be lost.
 .RE
 
 .SH NOTES
-.sp
 .LP
 The USB printer will be power managed if the device is closed.
 .sp
diff --git a/usr/src/man/man7d/zs.7d b/usr/src/man/man7d/zs.7d
index 34c7e95f4f..690935cca8 100644
--- a/usr/src/man/man7d/zs.7d
+++ b/usr/src/man/man7d/zs.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 ZS 7D "Jul 16, 2009"
+.TH ZS 7D "April 9, 2016"
 .SH NAME
 zs \- Zilog 8530 SCC serial communications driver
 .SH SYNOPSIS
@@ -33,7 +33,6 @@ open("/dev/cua/\fIn\fR", \fImode\fR);
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The Zilog 8530 provides two serial input/output channels capable of supporting
 a variety of communication protocols.  A typical system uses two or more of
@@ -92,7 +91,6 @@ information on parameters that are persistent across reboots, see the
 \fBeeprom\fR(1M) man page.
 .RE
 .SH IOCTLS
-.sp
 .LP
 The \fBzs\fR module supports the standard set of \fBtermio ioctl\fR(\|) calls.
 .sp
@@ -127,7 +125,7 @@ command, respectively.  Due to hardware limitations, only the \fBRTS\fR and
 .LP
 The input and output line speeds may be set to any of the speeds supported by
 \fBtermio\fR. The input and output line speeds cannot be set independently; for
-example, when you set the the output speed, the input speed is automatically
+example, when you set the output speed, the input speed is automatically
 set to the same speed.
 .sp
 .LP
@@ -160,7 +158,6 @@ tilde and control-B (CR ~ CTRL-B), but may be changed by the driver. For more
 information on breaking (entering the debugger or monitor), see \fBkbd\fR(1)
 and \fBkb\fR(7M).
 .SH ERRORS
-.sp
 .LP
 An \fBopen\fR will fail under the following conditions:
 .sp
@@ -212,7 +209,6 @@ The open was interrupted by the delivery of a signal.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/cua/\fR[\fIa-z\fR]\fR
@@ -240,7 +236,6 @@ binary compatibility package device names
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -256,14 +251,12 @@ Architecture	SPARC
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBeeprom\fR(1M), \fBkadb\fR(1M), \fBtip\fR(1), \fBcu\fR(1C), \fBuucp\fR(1C),
 \fBports\fR(1M), \fBpppd\fR(1M), \fBioctl\fR(2), \fBopen\fR(2),
 \fBattributes\fR(5), \fBzsh\fR(7D), \fBtermio\fR(7I), \fBkb\fR(7M),
 \fBldterm\fR(7M), \fBttcompat\fR(7M)
 .SH DIAGNOSTICS
-.sp
 .ne 2
 .na
 \fB\fBzs\fR\fIn\fR\fB\|: silo overflow.\fR\fR
diff --git a/usr/src/man/man7i/mtio.7i b/usr/src/man/man7i/mtio.7i
index 7b3d9eee8a..570cc9d174 100644
--- a/usr/src/man/man7i/mtio.7i
+++ b/usr/src/man/man7i/mtio.7i
@@ -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 MTIO 7I "Sep 15, 2007"
+.TH MTIO 7I "April 9, 2016"
 .SH NAME
 mtio \- general magnetic tape interface
 .SH SYNOPSIS
@@ -15,7 +15,6 @@ mtio \- general magnetic tape interface
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 1/2", 1/4", 4mm, and 8mm magnetic tape drives all share the same general
 character device interface.
@@ -29,7 +28,6 @@ record is separated by interrecord (or tape) gaps on a tape.
 End-of-recorded-media (EOM) is indicated by two \fBEOF\fR marks on 1/2" tape;
 by one \fBEOF\fR mark on 1/4", 4mm, and 8mm cartridge tapes.
 .SS "1/2" Reel Tape"
-.sp
 .LP
 Data bytes are recorded in parallel onto the 9-track tape. Since it is a
 variable-length tape device, the number of bytes in a  physical record may
@@ -43,7 +41,6 @@ example, using a 2400 foot tape, 20 Mbyte can be stored using 800 \fBBPI,\fR 40
 Mbyte using 1600 \fBBPI,\fR 140 Mbyte using 6250 \fBBPI,\fR or up to 700 Mbyte
 using data compression.
 .SS "1/4" Cartridge Tape"
-.sp
 .LP
 Data is recorded serially onto 1/4" cartridge tape. The number of bytes per
 record is determined by the physical record size of the device. The I/O request
@@ -73,14 +70,12 @@ The \fBQIC-150\fR tape drives require \fBDC-6150\fR (or equivalent) tape
 cartridges for writing. However, they can read other tape cartridges in
 \fBQIC-11,\fR \fBQIC-24,\fR or \fBQIC-120\fR tape formats.
 .SS "8mm Cartridge Tape"
-.sp
 .LP
 Data is recorded serially onto 8mm helical scan cartridge tape. Since it is a
 variable-length tape device, the number of bytes in a  physical record may
 vary. The recording formats available (check specific tape drive) are standard
 2Gbyte, 5Gbyte, and compressed format.
 .SS "4mm DAT Tape"
-.sp
 .LP
 Data is recorded either in Digital Data Storage (DDS) tape format or in Digital
 Data Storage, Data Compressed (DDS-DC) tape format. Since it is a
@@ -88,7 +83,6 @@ variable-length tape device, the number of bytes in a  physical record may
 vary. The recording formats available are standard 2Gbyte and compressed
 format.
 .SS "Persistent Error Handling"
-.sp
 .LP
 Persistent error handling is a modification of the current error handling
 behaviors, BSD and SVR4. With persistent error handling enabled, all tape
@@ -122,7 +116,6 @@ disable persistent error handling and clear any errors or exceptions.
 The \fBRead Operation\fR and \fBWrite Operation\fR subsections contain more
 pertinent information reguarding persistent error handling.
 .SS "Read Operation"
-.sp
 .LP
 The \fBread\fR(2) function reads the next record on the tape. The record size
 is passed back as the number of bytes read, provided it is not greater than the
@@ -165,7 +158,6 @@ should never hit physical EOT.
 Read requests that are lesser than a physical tape record are not allowed.
 Appropriate error is returned.
 .SS "Write Operation"
-.sp
 .LP
 The \fBwrite\fR(2) function writes the next record on the tape. The record has
 the same length as the given buffer.
@@ -235,7 +227,6 @@ the file as soon as possible.
 .LP
 Seeks are ignored in tape I/O.
 .SS "Close Operation"
-.sp
 .LP
 Magnetic tapes are rewound when closed, except when the "no-rewind" devices
 have been specified. The names of no-rewind device files use the letter \fBn\fR
@@ -284,7 +275,6 @@ one or two file marks are written, thus creating a null file.
 After closing the device, persistent error handling will be disabled and any
 error or exception will be cleared.
 .SH IOCTLS
-.sp
 .LP
 Not all devices support all \fBioctls\fR. The driver returns an \fBENOTTY\fR
 error on unsupported ioctls.
@@ -701,7 +691,7 @@ extensive start-stop operations or long-term storage.
 .LP
 \fBMTERASE\fR rewinds the tape, erases it completely, and returns to the
 beginning of tape. Erasing may take a long time depending on the device and/or
-tapes.  For time details, refer to the the drive specific manual.
+tapes. For time details, refer to the drive specific manual.
 .sp
 .LP
 \fBMTEOM\fR positions the tape at a location just after the last file written
@@ -786,7 +776,6 @@ returned in struct tapepos as defined in
 .LP
 The  MTIOCRESTPOS ioctl restores a saved position from the MTIOCGETPOS.
 .SS "Persistent Error Handling IOCTLs and Asynchronous Tape Operations"
-.sp
 .ne 2
 .na
 \fBMTIOCPERSISTENT\fR
@@ -879,7 +868,6 @@ ioctl(fd, MTIOCGUARANTEEDORDER)
 See the \fBPersistent Error Handling\fR subsection above for more information
 on persistent error handling.
 .SS "Asynchronous and State Change IOCTLS"
-.sp
 .ne 2
 .na
 \fB\fBMTIOCSTATE\fR\fR
@@ -909,7 +897,6 @@ MTIO_INSERTED  /* Tape state is "inserted" */
 When using asynchronous operations, most ioctls will wait for all outstanding
 commands to complete before they are executed.
 .SS "IOCTLS for Multi-initiator Configurations"
-.sp
 .ne 2
 .na
 \fBMTIOCRESERVE\fR
@@ -970,13 +957,12 @@ ioctl(fd, MTIOCFORCERESERVE);
 .in -2
 
 .SS "IOCTLS for Handling Tape Configuration Options"
-.sp
 .ne 2
 .na
 \fBMTIOCSHORTFMK\fR
 .ad
 .RS 23n
-enables/disable support for writing short filemarks. This is specific to
+enables/disables support for writing short filemarks. This is specific to
 Exabyte drives.
 .RE
 
@@ -986,7 +972,7 @@ Exabyte drives.
 \fBMTIOCREADIGNOREILI\fR
 .ad
 .RS 23n
-enables/disable supress incorrect length indicator support during reads
+enables/disables suppress incorrect length indicator (SILI) support during reads
 .RE
 
 .sp
@@ -995,7 +981,7 @@ enables/disable supress incorrect length indicator support during reads
 \fBMTIOCREADIGNOREEOFS\fR
 .ad
 .RS 23n
-enables/disable support for reading past two EOF marks which otherwise indicate
+enables/disables support for reading past two EOF marks which otherwise indicate
 End-Of-recording-Media (EOM) in the case of 1/2" reel tape drives
 .RE
 
@@ -1005,7 +991,7 @@ The \fBMTIOCSHORTFMK\fR ioctl enables or disables support for short filemarks.
 This ioctl is only applicable to Exabyte drives which support short filemarks.
 As an argument, it takes a pointer to an integer.  If 0 (zero) is the
 specified integer, then long filemarks will be written. If 1 is the  specified
-integer, then short filemarks will be written. The specified tape bahavior will
+integer, then short filemarks will be written. The specified tape behavior will
 be in effect until the device is closed.
 .sp
 .LP
@@ -1031,9 +1017,9 @@ Tape drives which do not support short filemarks will return an \fBerrno\fR of
 The \fBMTIOCREADIGNOREILI\fR ioctl enables or disables the suppress incorrect
 length indicator (SILI) support during reads.  As an argument, it takes a
 pointer to an integer.   If 0 (zero) is the specified integer, SILI will not be
-used during reads and incorrect length indicator will not be supressed.  If 1
+used during reads and incorrect length indicator will not be suppressed.  If 1
 is  the specified integer, SILI will be used during reads and incorrect length
-indicator will be supressed.  The specified  tape bahavior will be in effect
+indicator will be suppressed.  The specified  tape behavior will be in effect
 until the device is closed.
 .sp
 .LP
@@ -1057,7 +1043,7 @@ integer.   If 0 (zero) is the specified integer, then double EOF marks indicate
 End-Of-recodred-media (EOD). If 1 is the specified integer, the double EOF
 marks no longer indicate EOM, thus allowing applications to read past two EOF
 marks.  In this case it is the responsibility of the application to detect
-end-of-recorded-media (EOM).  The specified  tape bahavior will be in effect
+end-of-recorded-media (EOM).  The specified  tape behavior will be in effect
 until the device is closed.
 .sp
 .LP
@@ -1144,7 +1130,6 @@ ioctl(fd, MTIOCGETDRIVETYPE, &mtreq);
 .in -2
 
 .SH FILES
-.sp
 .LP
 \fB/dev/rmt/\fR\fI<unit number><density>\fR[\fI<BSD behavior>\fR][\fI<no
 rewind>\fR]
@@ -1158,7 +1143,6 @@ high, ultra/compressed, respectively), the \fIBSD behavior \fR option is
 For example, \fB/dev/rmt/0hbn\fR specifies unit 0, high density, \fBBSD\fR
 behavior and no rewind.
 .SH SEE ALSO
-.sp
 .LP
 \fBmt\fR(1), \fBtar\fR(1), \fBdd\fR(1M), \fBopen\fR(2), \fBread\fR(2),
 \fBwrite\fR(2), \fBaioread\fR(3C), \fBaiowrite\fR(3C), \fBar.h\fR(3HEAD),
diff --git a/usr/src/man/man7i/termiox.7i b/usr/src/man/man7i/termiox.7i
index 1b22b6f20d..67daa26abc 100644
--- a/usr/src/man/man7i/termiox.7i
+++ b/usr/src/man/man7i/termiox.7i
@@ -4,11 +4,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 TERMIOX 7I "Jul 3, 1990"
+.TH TERMIOX 7I "April 9, 2016"
 .SH NAME
 termiox \- extended general terminal interface
 .SH DESCRIPTION
-.sp
 .LP
 The extended general terminal interface supplements the \fBtermio\fR(7I)
 general terminal interface by adding support for asynchronous hardware flow
@@ -19,7 +18,6 @@ may not permit certain functions to be disabled.  In these cases the
 appropriate bits will be ignored.  See <\fBsys/termiox.h\fR> for your system to
 find out which capabilities are supported.
 .SS "Hardware Flow Control Modes"
-.sp
 .LP
 Hardware flow control supplements the \fBtermio\fR(7I) \fBIXON\fR, \fBIXOFF\fR,
 and \fBIXANY\fR character flow control. Character flow control occurs when one
@@ -51,7 +49,6 @@ connected device is also a DTE and not a DCE, then DTE to DTE (for example,
 terminal or printer connected to computer) hardware flow control is possible by
 using a null modem to interconnect the appropriate data and control circuits.
 .SS "Clock Modes"
-.sp
 .LP
 Isochronous communication is a variation of asynchronous communication whereby
 two communicating devices may provide transmit and/or receive clock signals to
@@ -69,7 +66,6 @@ In terms of clock modes, traditional asynchronous communication is implemented
 simply by using the local baud rate generator as the incoming transmit and
 receive clock source and not outputting any clock signals.
 .SS "Terminal Parameters"
-.sp
 .LP
 The parameters that control the behavior of devices providing the \fBtermiox\fR
 interface are specified by the \fBtermiox\fR structure defined in the
@@ -129,7 +125,7 @@ functions.
 .sp
 .LP
 Variations of different hardware flow control methods may be selected by
-setting the the appropriate bits. For example, bidirectional RTS/CTS flow
+setting the appropriate bits. For example, bidirectional RTS/CTS flow
 control is selected by setting both the \fBRTSXOFF\fR and \fBCTSXON\fR bits and
 bidirectional DTR/CTS flow control is selected by setting both the
 \fBDTRXOFF\fR and \fBCTSXON\fR. Modem control or unidirectional CTS hardware
@@ -288,7 +284,6 @@ be used by any implementations. The \fBx_sflag\fR may be used by local
 implementations wishing to customize their terminal interface using the
 \fBtermiox\fR ioctl system calls.
 .SH IOCTLS
-.sp
 .LP
 The  \fBioctl\fR(2) system calls have the form:
 .sp
@@ -347,15 +342,12 @@ queued for input are discarded and then the change occurs.
 .RE
 
 .SH FILES
-.sp
 .LP
 \fB/dev/*\fR
 .SH SEE ALSO
-.sp
 .LP
 \fBstty\fR(1), \fBioctl\fR(2), \fBtermio\fR(7I)
 .SH NOTES
-.sp
 .LP
 The  termiox(7I) system call is provided for compatibility with previous
 releases and  its use is discouraged.  Instead, the  \fBtermio\fR(7I) system
diff --git a/usr/src/man/man7ipp/tokenmt.7ipp b/usr/src/man/man7ipp/tokenmt.7ipp
index 8e7ebb2490..8b2f3e22bc 100644
--- a/usr/src/man/man7ipp/tokenmt.7ipp
+++ b/usr/src/man/man7ipp/tokenmt.7ipp
@@ -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 TOKENMT 7IPP "Sep 29, 2004"
+.TH TOKENMT 7IPP "April 9, 2016"
 .SH NAME
 tokenmt \- Single and Two Rate Three Conformance Level Meter
 .SH DESCRIPTION
-.sp
 .LP
 The \fBtokenmt\fR module can be configured as a Single or a Two Rate meter.
 Packets are deemed to belong to one of the three levels - Red, Yellow or Green
@@ -72,7 +71,7 @@ is decided as follows:
                 T(t) = committed rate * (t - t')
                 (where t' is the time the last packet was seen)
               o Add T tokens to C up to a maximum of committed burst
-                size. Add remaining tokens ((C+T) - Commited Burst),
+                size. Add remaining tokens ((C+T) - Committed Burst),
                 if any, to P, to a maximum of peak burst size.
         - Decide outcome
               o If not color aware
@@ -123,7 +122,6 @@ When operating as a Two Rate meter, the outcome (level) is decided as follows:
 .in -2
 
 .SH STATISTICS
-.sp
 .LP
 The \fBtokenmt\fR module exports the following statistics through \fBkstat\fR:
 .sp
@@ -145,7 +143,6 @@ module: tokenmt                          instance: <action id>
 .in -2
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/kernel/ipp/sparcv9/tokenmt\fR\fR
@@ -156,7 +153,6 @@ module: tokenmt                          instance: <action id>
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBipqosconf\fR(1M), \fBdlcosmk\fR(7ipp), \fBdscpmk\fR(7ipp),
 \fBflowacct\fR(7ipp), \fBipqos\fR(7ipp), \fBipgpc\fR(7ipp),
diff --git a/usr/src/man/man7p/dlpi.7p b/usr/src/man/man7p/dlpi.7p
index 6852799626..c2ffdc6889 100644
--- a/usr/src/man/man7p/dlpi.7p
+++ b/usr/src/man/man7p/dlpi.7p
@@ -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 DLPI 7P "Sep 7, 2009"
+.TH DLPI 7P "April 9, 2016"
 .SH NAME
 dlpi \- Data Link Provider Interface
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ dlpi \- Data Link Provider Interface
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 SunOS STREAMS-based device drivers wishing to support the STREAMS \fB TCP/IP\fR
 and other STREAMS-based networking protocol suite implementations support
@@ -43,7 +42,6 @@ Solaris conforms to The Open Group Technical Standard for \fIDLPI, Version
 \fIwww.opengroup.org/pubs/catalog/c811.htm\fR. Solaris also provides extensions
 to the DLPI standard, as detailed in this man page.
 .SH SOLARIS-SPECIFIC DLPI EXTENSIONS
-.sp
 .ne 2
 .na
 \fBNotification Support\fR
@@ -155,7 +153,7 @@ set to zero by DLPI providers and ignored by DLPI consumers.
 .sp
 In addition to generating DL_NOTIFY_IND messages when a requested event has
 occurred, the \fBDLPI\fR provider must initially generate one or more
-DL_NOTIFY_IND messages to notify the \fBDLPI\fR consumer of the the current
+DL_NOTIFY_IND messages to notify the \fBDLPI\fR consumer of the current
 state of the interface. For instance, if the consumer has requested
 DL_NOTE_LINK_UP | DL_NOTE_LINK_DOWN, the provider must send a DL_NOTIFY_IND
 containing the current state of the link (either DL_NOTE_LINK_UP or
@@ -166,7 +164,7 @@ recommended against sending DL_NOTE_LINK_DOWN, even if the interface is still
 initializing and is not yet ready to send or receive packets. Instead, either
 delaying the DL_NOTIFY_IND message until the interface is ready or
 optimistically reporting DL_NOTIFY_LINK_UP and subsequently   reporting
-DL_NOTE_LINK_DOWN if the negotation fails is strongly   preferred. This
+DL_NOTE_LINK_DOWN if the negotiation fails is strongly   preferred. This
 prevents DL_NOTIFY_IND consumers from needlessly triggering network failover
 operations and logging error messages during network interface initialization.
 .sp
@@ -241,7 +239,7 @@ the links do not have any DLPI consumers or only \fBpassive\fR consumers.
 .RS 4n
 The \fBDLIOCRAW\fR ioctl function is used by some DLPI applications, most
 notably the \fBsnoop\fR(1M) command. The \fBDLIOCRAW\fR command puts the stream
-into a raw mode, which, upon receive, causes the the full MAC-level packet to
+into a raw mode, which, upon receive, causes the full MAC-level packet to
 be sent upstream in an \fBM_DATA\fR message instead of it being transformed
 into the \fBDL_UNITDATA_IND\fR form normally used for reporting incoming
 packets. Packet \fBSAP\fR filtering is still performed on streams that are in
@@ -297,7 +295,6 @@ size.
 .SH DL_ETHER-SPECIFIC DLPI SEMANTICS
 .SS "VLAN Support"
 .SS "Traditional VLAN Access"
-.sp
 .LP
 Some \fBDL_ETHER DLPI\fR providers support \fIIEEE 802.1Q\fR Virtual LANs
 (VLAN). For these providers, traffic for a particular VLAN can be accessed by
@@ -311,7 +308,6 @@ are added by the provider) and received data is passed to interested DLPI
 consumers without link-layer headers.  As a result,  DLPI consumers not require
 special-case logic to implement VLAN access.
 .SS "SAP-Based VLAN Access"
-.sp
 .LP
 As per \fIIEEE 802.1Q\fR, all VLAN traffic is sent using Ether- Type  0x8100,
 meaning  that in addition to directly opening a VLAN data-link, all VLAN
@@ -333,7 +329,6 @@ enables promiscuous mode of a stream at the \fBDL_PROMISC_SAP\fR level. As
 mentioned earlier, these packets are received starting with their VLAN headers
 if raw mode is not enabled.
 .SS "QoS Support"
-.sp
 .LP
 The \fIIEEE 802.1Q\fR standard defines eight classes of priority values used by
 QoS traffic control of Ethernet packets. Although the priority values are
@@ -349,7 +344,6 @@ also specify the per-packet priority value using the b_band field of a M_DATA
 message or the \fBdl_priority\fR field of a \fBDL_UNITDATA_REQ\fR.
 .SS "Raw Mode"
 .SS "SAP-Based VLAN Access"
-.sp
 .LP
 When raw mode is enabled, the complete, unmodified MAC- level packet (including
 Ethernet  and  VLAN headers) is passed to interested DLPI consumers. Similarly,
@@ -358,7 +352,6 @@ to the DLPI provider for transmission.  Note that the priority value specified
 in the b_band field can be overridden by encoding the priority value (if any)
 into the VLAN header.
 .SS "Traditional VLAN Access"
-.sp
 .LP
 When raw mode is enabled, only packets with the correct VLAN ID are passed up
 to interested DLPI consumers. With the exception of priority-tagged packets,
@@ -375,11 +368,9 @@ the VLAN header to  indicate the priority value, however its VLAN ID must be
 zero. The DLPI providers then insert the VLAN tags or encode the VLAN tags
 using the priority value specified in the VLAN headers and send the packets.
 .SH FILES
-.sp
 .LP
 Files in or under \fB/dev\fR.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -397,12 +388,10 @@ T}	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdladm\fR(1M), \fBsnoop\fR(1M), \fBlibdlpi\fR(3LIB), \fBgld\fR(7D),
 \fBip\fR(7P)
 .SH NOTES
-.sp
 .LP
 A Solaris DLPI link name consists of a \fBDLPI provider name\fR followed by a
 numeric \fBPPA\fR (physical point of attachment).
diff --git a/usr/src/man/man7p/route.7p b/usr/src/man/man7p/route.7p
index bbd74fd740..22d4f4c735 100644
--- a/usr/src/man/man7p/route.7p
+++ b/usr/src/man/man7p/route.7p
@@ -7,7 +7,7 @@
 .\" OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
 .\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" Portions Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved.
-.TH ROUTE 7P "Sep 02, 2015"
+.TH ROUTE 7P "April 9, 2016"
 .SH NAME
 route \- kernel packet forwarding database
 .SH SYNOPSIS
@@ -91,7 +91,7 @@ are exhausted.
 .sp
 .LP
 The \fIprotocol\fR parameter specifies which messages an application listening
-on the routing socket is interested in seeing, based on the the address family
+on the routing socket is interested in seeing, based on the address family
 of the \fBsockaddrs\fR present. Currently, you can specify \fBAF_INET\fR and
 \fBAF_INET6\fR to filter the messages seen by the listener, or alternatively,
 you can specify \fBAF_UNSPEC\fR to indicate that the listener is interested in
diff --git a/usr/src/man/man9e/tran_start.9e b/usr/src/man/man9e/tran_start.9e
index 5b3059e4f9..f48dc83fd1 100644
--- a/usr/src/man/man9e/tran_start.9e
+++ b/usr/src/man/man9e/tran_start.9e
@@ -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 TRAN_START 9E "Aug 17, 2005"
+.TH TRAN_START 9E "April 9, 2016"
 .SH NAME
 tran_start \- request to transport a SCSI command
 .SH SYNOPSIS
@@ -18,11 +18,9 @@ tran_start \- request to transport a SCSI command
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris architecture specific (Solaris DDI).
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIpkt\fR \fR
@@ -41,7 +39,6 @@ Pointer to a \fBscsi_address\fR(9S) structure.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The  \fBtran_start()\fR vector in the  \fBscsi_hba_tran\fR(9S) structure must
 be initialized during the \fBHBA \fRdriver's \fBattach\fR(9E) to point to an
@@ -188,7 +185,6 @@ by the transport layer.
 .RE
 
 .SH RETURN VALUES
-.sp
 .LP
 \fBtran_start()\fR must return:
 .sp
@@ -231,12 +227,10 @@ A fatal error has occurred in the \fBHBA. \fR
 .RE
 
 .SH CONTEXT
-.sp
 .LP
-The \fBtran_start()\fR function can be called from user or interupt context.
+The \fBtran_start()\fR function can be called from user or interrupt context.
 This requirement comes from \fBscsi_transport()\fR.
 .SH SEE ALSO
-.sp
 .LP
 \fBattach\fR(9E), \fBtran_init_pkt\fR(9E), \fBscsi_hba_attach\fR(9F),
 \fBscsi_transport\fR(9F), \fBscsi_address\fR(9S), \fBscsi_arq_status\fR(9S),
diff --git a/usr/src/man/man9f/Makefile b/usr/src/man/man9f/Makefile
index 066f5373f6..9e5f5f2b52 100644
--- a/usr/src/man/man9f/Makefile
+++ b/usr/src/man/man9f/Makefile
@@ -279,6 +279,7 @@ MANFILES= 	ASSERT.9f				\
 	 	gld.9f					\
 	 	hook_alloc.9f				\
 	 	hook_free.9f				\
+		id_space.9f				\
 	 	id32_alloc.9f				\
 	 	inb.9f					\
 	 	insq.9f					\
@@ -893,6 +894,15 @@ MANLINKS=	SIZEOF_PTR.9f				\
 	 	gld_register.9f				\
 	 	gld_sched.9f				\
 	 	gld_unregister.9f			\
+		id_space_create.9f			\
+		id_space_destroy.9f			\
+		id_space_extend.9f			\
+		id_alloc.9f				\
+		id_alloc_nosleep.9f			\
+		id_allocff.9f				\
+		id_allocff_nosleep.9f			\
+		id_alloc_specific_nosleep.9f		\
+		id_free.9f				\
 	 	id32_free.9f				\
 	 	id32_lookup.9f				\
 	 	inl.9f					\
@@ -1660,6 +1670,16 @@ gld_register.9f				:= LINKSRC = gld.9f
 gld_sched.9f				:= LINKSRC = gld.9f
 gld_unregister.9f			:= LINKSRC = gld.9f
 
+id_space_create.9f			:= LINKSRC = id_space.9f
+id_space_destroy.9f			:= LINKSRC = id_space.9f
+id_space_extend.9f			:= LINKSRC = id_space.9f
+id_alloc.9f				:= LINKSRC = id_space.9f
+id_alloc_nosleep.9f			:= LINKSRC = id_space.9f
+id_allocff.9f				:= LINKSRC = id_space.9f
+id_allocff_nosleep.9f			:= LINKSRC = id_space.9f
+id_alloc_specific_nosleep.9f		:= LINKSRC = id_space.9f
+id_free.9f				:= LINKSRC = id_space.9f
+
 id32_free.9f				:= LINKSRC = id32_alloc.9f
 id32_lookup.9f				:= LINKSRC = id32_alloc.9f
 
diff --git a/usr/src/man/man9f/bioerror.9f b/usr/src/man/man9f/bioerror.9f
index c242956dd5..e20dafb834 100644
--- a/usr/src/man/man9f/bioerror.9f
+++ b/usr/src/man/man9f/bioerror.9f
@@ -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 BIOERROR 9F "May 26, 1994"
+.TH BIOERROR 9F "April 9, 2016"
 .SH NAME
 bioerror \- indicate error in buffer header
 .SH SYNOPSIS
@@ -19,11 +19,9 @@ bioerror \- indicate error in buffer header
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI)
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIbp\fR \fR
@@ -42,9 +40,8 @@ Error number to be set, or zero to clear an error indication.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
-If \fIerror\fR is non-zero, \fBbioerror()\fR indicates an error has occured in
+If \fIerror\fR is non-zero, \fBbioerror()\fR indicates an error has occurred in
 the \fBbuf\fR(9S) structure. A subsequent call to \fBgeterror\fR(9F) will
 return \fIerror\fR.
 .sp
@@ -52,10 +49,8 @@ return \fIerror\fR.
 If \fIerror\fR is  \fB0\fR, the error indication is cleared and a subsequent
 call to \fBgeterror\fR(9F) will return  \fB0\fR.
 .SH CONTEXT
-.sp
 .LP
 \fBbioerror()\fR can be called from any context.
 .SH SEE ALSO
-.sp
 .LP
 \fBstrategy\fR(9E), \fBgeterror\fR(9F), \fBgetrbuf\fR(9F), \fBbuf\fR(9S)
diff --git a/usr/src/man/man9f/canputnext.9f b/usr/src/man/man9f/canputnext.9f
index cb53fe3a58..f2675dbd05 100644
--- a/usr/src/man/man9f/canputnext.9f
+++ b/usr/src/man/man9f/canputnext.9f
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\"
-.Dd "Dec 15, 2014"
+.Dd "April 9, 2016"
 .Dt CANPUTNEXT 9F
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@ They are preferable to and safer than calling
 .Xr canput 9F
 and
 .Xr bcanput 9F
-directly on the the queue linked to by
+directly on the queue linked to by
 .Fa q Ns No -> Ns Fa q_next .
 .Lp
 Drivers and modules should call these routines to ensure that room
diff --git a/usr/src/man/man9f/csx_RegisterClient.9f b/usr/src/man/man9f/csx_RegisterClient.9f
index 66bf3b8136..fe807b8a08 100644
--- a/usr/src/man/man9f/csx_RegisterClient.9f
+++ b/usr/src/man/man9f/csx_RegisterClient.9f
@@ -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 CSX_REGISTERCLIENT 9F "Jul 19, 1996"
+.TH CSX_REGISTERCLIENT 9F "April 9, 2016"
 .SH NAME
 csx_RegisterClient \- register a client
 .SH SYNOPSIS
@@ -17,11 +17,9 @@ csx_RegisterClient \- register a client
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris \fBDDI\fR Specific (Solaris \fBDDI\fR)
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIch\fR\fR
@@ -40,13 +38,11 @@ Pointer to a \fBclient_reg_t\fR structure.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 This function registers a client with Card Services and returns a unique client
 handle for the client. The client handle must be passed to
 \fBcsx_DeregisterClient\fR(9F) when the client terminates.
 .SH STRUCTURE MEMBERS
-.sp
 .LP
 The structure members of \fBclient_reg_t\fR are:
 .sp
@@ -156,7 +152,7 @@ of the bits must be set.
 .RS 4n
 If either of these bits is set, the client will receive a
 \fBCS_EVENT_REGISTRATION_COMPLETE\fR event when Card Services has completed its
-internal client registration processing and after a sucessful call to
+internal client registration processing and after a successful call to
 \fBcsx_RequestSocketMask\fR(9F).
 .sp
 Also, if either of these bits is set, and if a card of the type that the client
@@ -255,7 +251,6 @@ identical across all instances of the driver.
 .RE
 
 .SH RETURN VALUES
-.sp
 .ne 2
 .na
 \fB\fBCS_SUCCESS\fR\fR
@@ -310,11 +305,9 @@ No \fBPCMCIA\fR hardware installed.
 .RE
 
 .SH CONTEXT
-.sp
 .LP
 This function may be called from user or kernel context.
 .SH SEE ALSO
-.sp
 .LP
 \fBcsx_DeregisterClient\fR(9F), \fBcsx_RequestSocketMask\fR(9F)
 .sp
diff --git a/usr/src/man/man9f/dlbindack.9f b/usr/src/man/man9f/dlbindack.9f
index b16018c6f5..d1121b47d9 100644
--- a/usr/src/man/man9f/dlbindack.9f
+++ b/usr/src/man/man9f/dlbindack.9f
@@ -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 DLBINDACK 9F "Jan 16, 2006"
+.TH DLBINDACK 9F "April 9, 2016"
 .SH NAME
 dlbindack, dlphysaddrack, dlokack, dlerrorack, dluderrorind \- DLPI device
 driver helper functions
@@ -42,11 +42,9 @@ driver helper functions
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI).
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIwq\fR\fR
@@ -148,7 +146,6 @@ in the \fBDLPI\fR request.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 All functions described in this manpage take a pointer to the message passed to
 the \fBDLPI\fR provider (\fBmblk_t\fR) and attempt to reuse it in formulating
@@ -160,12 +157,12 @@ All functions reply upstream using \fBqreply\fR(9F). The write-side queue
 pointer must be provided.
 .sp
 .LP
-The \fBdlokack()\fR function provides the successfull acknowledgement
+The \fBdlokack()\fR function provides the successful acknowledgement
 \fBDL_OK_ACK\fR message reply to the \fBDLPI\fR provider and is used to
 complete many of the \fBDLPI\fR requests in the \fBDLPI\fR consumer.
 .sp
 .LP
-The \fBdlerrorack()\fR function provides the unsuccessfull acknowledgement
+The \fBdlerrorack()\fR function provides the unsuccessful acknowledgement
 \fBDL_ERROR_ACK\fR message reply to the \fBDLPI\fR() provider and is used for
 error completions were required for \fBDLPI\fR requests in the \fBDLPI\fR
 consumer.
@@ -183,21 +180,17 @@ message reply used to complete the \fBDL_PHYS_ADDR_ACK\fR processing.
 The \fBdluderrorind()\fR function provides the \fBDL_UDERROR_IND\fR message
 reply used to complete an unsuccessful \fBDL_UNITDATA_REQ\fR.
 .SH RETURN VALUES
-.sp
 .LP
 None.
 .SH NOTES
-.sp
 .LP
 These functions are not required if you are are writing a \fBDLPI\fR device
 driver using \fBgld\fR(7D).
 .SH CONTEXT
-.sp
 .LP
 All \fBDLPI\fR helper functions can be called from user, interrupt, or kernel
 context.
 .SH SEE ALSO
-.sp
 .LP
 \fBgld\fR(7D), \fBdlpi\fR(7P), \fBqreply\fR(9F)
 .sp
diff --git a/usr/src/man/man9f/id_space.9f b/usr/src/man/man9f/id_space.9f
new file mode 100644
index 0000000000..b9770cab1f
--- /dev/null
+++ b/usr/src/man/man9f/id_space.9f
@@ -0,0 +1,266 @@
+.\"
+.\" This file and its contents are supplied under the terms of the
+.\" Common Development and Distribution License ("CDDL"), version 1.0.
+.\" You may only use this file in accordance with the terms of version
+.\" 1.0 of the CDDL.
+.\"
+.\" A full copy of the text of the CDDL should have accompanied this
+.\" source.  A copy of the CDDL is also available via the Internet at
+.\" http://www.illumos.org/license/CDDL.
+.\"
+.\"
+.\" Copyright 2016 Joyent, Inc.
+.\"
+.Dd June 04, 2016
+.Dt ID_SPACE 9F
+.Os
+.Sh NAME
+.Nm id_space ,
+.Nm id_space_create ,
+.Nm id_space_destroy ,
+.Nm id_space_extend ,
+.Nm id_alloc ,
+.Nm id_alloc_nosleep ,
+.Nm id_allocff ,
+.Nm id_allocff_nosleep ,
+.Nm id_alloc_specific_nosleep ,
+.Nm id_free
+.Nd create, destroy, and use identifier spaces
+.Sh SYNOPSIS
+.In sys/id_space.h
+.Ft "id_space_t *"
+.Fo id_space_create
+.Fa "const char *name"
+.Fa "id_t low"
+.Fa "id_t high"
+.Fc
+.Ft void
+.Fo id_space_destroy
+.Fa "id_space_t *idspace"
+.Fc
+.Ft void
+.Fo id_space_extend
+.Fa "id_t low"
+.Fa "id_t high"
+.Fc
+.Ft id_t
+.Fo id_alloc
+.Fa "id_space_t *idspace"
+.Fc
+.Ft id_t
+.Fo id_alloc_nosleep
+.Fa "id_space_t *idspace"
+.Fc
+.Ft id_t
+.Fo id_allocff
+.Fa "id_space_t *idspace"
+.Fc
+.Ft id_t
+.Fo id_allocff_nosleep
+.Fa "id_space_t *idspace"
+.Fc
+.Ft id_t
+.Fo id_allocff_specific_nosleep
+.Fa "id_space_t *idspace"
+.Fa "id_t id"
+.Fc
+.Ft void
+.Fo id_free
+.Fa "id_space_t *idspace"
+.Fa "id_t id"
+.Fc
+.Sh INTERFACE STABILITY
+illumos DDI specific
+.Sh PARAMETERS
+.Bl -tag -width Fa
+.It Fa idspace
+A pointer to an
+.Sy id_space_t
+structure allocated with the
+.Fn id_space_create
+function.
+.It Fa id
+An identifier, a signed 32-bit integer.
+.It Fa name
+A null-terminated ASCII character string to call the identifier space.
+.It Fa low
+The lower end of an identifier space. This value is included in the
+range.
+.It Fa high
+The upper end of an identifier space. This value is excluded in the
+range.
+.El
+.Sh DESCRIPTION
+The
+.Sy id_space
+suite of functions is used to create and manage identifier spaces. An
+identifier space allows the system to manage a range of identifiers. It
+tracks what values have been used and which values have not been used
+and has different ways of allocating values from the identifier space.
+.Pp
+Identifier spaces are often used by device drivers to manage ranges of
+numeric identifiers that may be disjoint. A common use case for
+identifier spaces is to manage the set of allocated minor numbers for a
+device driver.
+.Ss Creating, Expanding and Destroying Identifier Spaces
+To create an identifier space, the
+.Fn id_space_create
+function should be used. A name for the id space must be passed in the
+.Fa name
+argument. It should be unique. For device drivers, often combining the
+name of the driver and the instance from the
+.Xr ddi_get_instance 9F
+function results in a unique name.
+.Pp
+The values of
+.Fa low
+and
+.Fa high
+describe the range of the identifier space. The range is inclusive on
+the low end and exclusive on the high end. Mathematically, this would be
+represented as
+.Pf [ Fa low ,
+.Fa high Ns ).
+.Pp
+Once the
+.Fn id_space_create
+function has been successfully called, the returned identifier space can
+be used to allocate and manage identifiers.
+.Pp
+Once an identifier space has been created, additional ranges of
+identifiers can be added. This process allows for disjoint ranges of
+values to be added to a single identifier space. The
+.Fn id_space_extend
+function is used to do this, and it adds the range
+.Fa low
+to
+.Fa high
+to the identifier space. The range follows the same rules as with the
+.Fn id_space_create
+function.
+It is inclusive of
+.Fa low
+and is exclusive of
+.Fa high .
+.Pp
+Finally, when an identifier space is no longer being used and all of its
+identifiers have been freed, the caller should call the
+.Fn id_space_destroy
+function to destroy the id space
+.Fa idspace .
+.Pp
+All three of these functions,
+.Fn id_space_create ,
+.Fn id_space_extend ,
+and
+.Fn id_space_destory
+may block. They should only be called from a context where it's safe for
+it to block. This is logically the equivalent of calling
+.Xr kmem_alloc 9F
+with the flag
+.Dv KMEM_SLEEP .
+.Ss Allocating Identifiers
+Once an id space has been created with the
+.Fn id_space_create
+function, identifiers can be allocated from the space. There are three
+different strategies for allocating an identifier:
+.Bl -enum
+.It
+Allocating an identifier using the standard algorithm that attempts to
+use the next identifier first.
+.It
+Allocating an identifier using a first fit algorithm. These are
+functions with
+.Em ff
+in the name. Using this will tend to keep the allocated id space more
+compressed.
+.It
+Allocating a specific id.
+.El
+.Pp
+In addition, identifiers can be allocated in both a blocking and
+non-blocking fashion. When functions with the
+.Sy _nosleep
+prefix are used, they are non-blocking. If no identifier is available,
+they will return an error.
+.Pp
+The
+.Fn id_alloc
+function will allocate the next identifier. The
+.Fn id_alloc_nosleep
+function uses the same algorithm as
+.Fn id_alloc ,
+but will fail rather than block.
+.Pp
+The
+.Fn id_allocff
+function will allocate the first available identifier. The
+.Fn id_allocff_nosleep
+function uses the same algorithm as
+.Fn id_allocff ,
+but will fail rather than block.
+.Pp
+The
+.Fn id_alloc_specific_nosleep
+function attempts to allocate the specific identifier
+.Fa id
+from the specified identifier space. If
+.Fa id
+has already been allocated, then the function will fail.
+.Ss Freeing Identifiers
+Every allocated identifier must eventually be freed and returned to the
+identifier space. To free an identifier, use the
+.Fn id_free
+function, specifying the identifier in
+.Fa id
+and the identifier space it came from in
+.Fa id_space .
+It is a programmer error to call the
+.Fn id_free
+function on an identifier that has not been allocated.
+.Sh CONTEXT
+In general, all the functions listed here may be executed in either
+.Sy user ,
+.Sy kernel ,
+or
+.Sy interrupt
+context. However, the functions
+.Fn id_space_create ,
+.Fn id_space_destroy ,
+.Fn id_space_extend ,
+.Fn id_alloc ,
+and
+.Fn id_allocff
+must be called from a context where it is safe to block and sleep. If
+the caller is not in such a context, then it must only use the
+.Sy '_nosleep'
+functions.
+.Sh RETURN VALUES
+Upon successful completion, the
+.Fn id_space_create
+function returns a pointer to an identifier space. Otherwise,
+.Dv NULL
+is returned to indicate that the identifier space could not be created.
+.Pp
+The
+.Fn id_alloc
+and
+.Fn id_allocff
+functions always return an identifier that's in the range of the
+specified identifier space.
+.Pp
+Upon successful completion, the
+.Fn id_alloc_nosleep ,
+.Fn id_allocff_nosleep ,
+and
+.Fn id_alloc_specific_nosleep
+functions will return an identifier that's in the range of the specified
+identifier space. Otherwise,
+.Sy -1
+is returned to indicate that no identifier was available, or in the case
+of the
+.Fn id_alloc_specific_nosleep
+function, that the specified identifier was not available.
+.Sh SEE ALSO
+.Xr kmem_alloc 9F ,
+.Xr rmallocmap 9F
diff --git a/usr/src/man/man9f/ldi_add_event_handler.9f b/usr/src/man/man9f/ldi_add_event_handler.9f
index 2f7d22f160..dad4420934 100644
--- a/usr/src/man/man9f/ldi_add_event_handler.9f
+++ b/usr/src/man/man9f/ldi_add_event_handler.9f
@@ -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 LDI_ADD_EVENT_HANDLER 9F "Aug 21, 2007"
+.TH LDI_ADD_EVENT_HANDLER 9F "April 9, 2016"
 .SH NAME
 ldi_add_event_handler \- add NDI event service callback handler
 .SH SYNOPSIS
@@ -17,11 +17,9 @@ ldi_add_event_handler \- add NDI event service callback handler
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Obsolete
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIldi_handle_t lh\fR\fR
@@ -75,7 +73,6 @@ Registration id must be saved and used when calling
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 This function is obsolete and is only maintained for compatibility. Use of this
 function is strongly discouraged. For equivalent functionality provided by new
@@ -84,7 +81,7 @@ interfaces, see \fBldi_ev_get_cookie\fR(9F) and
 .sp
 .LP
 The \fBldi_add_event_handler()\fR function adds a callback handler to be
-invoked at the occurance of the event specified by the cookie. Adding a
+invoked at the occurrence of the event specified by the cookie. Adding a
 callback handler is also known as subscribing to an event. Upon successful
 subscription, the handler is invoked when the event occurs. You can unregister
 the handler by using \fBldi_remove_event_handler\fR(9F).
@@ -135,7 +132,6 @@ callback function.
 .RE
 
 .SH RETURN VALUES
-.sp
 .ne 2
 .na
 \fB\fBDDI_SUCCESS\fR\fR
@@ -155,12 +151,10 @@ or a bad cookie.
 .RE
 
 .SH CONTEXT
-.sp
 .LP
 The \fBldi_add_event_handler()\fR function can be called from user and kernel
 contexts only.
 .SH SEE ALSO
-.sp
 .LP
 \fBldi_ev_get_cookie\fR(9F), \fBldi_ev_register_callbacks\fR(9F),
 \fBldi_get_eventcookie\fR(9F), \fBldi_remove_event_handler\fR(9F)
@@ -168,7 +162,6 @@ contexts only.
 .LP
 \fIWriting Device Drivers\fR
 .SH NOTES
-.sp
 .LP
 Layered drivers must remove all registered callback handlers for a device
 instance, represented by the layered handle, by calling
diff --git a/usr/src/man/man9f/ldi_remove_event_handler.9f b/usr/src/man/man9f/ldi_remove_event_handler.9f
index f5593116ec..4449cf71c8 100644
--- a/usr/src/man/man9f/ldi_remove_event_handler.9f
+++ b/usr/src/man/man9f/ldi_remove_event_handler.9f
@@ -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 LDI_REMOVE_EVENT_HANDLER 9F "Aug 21, 2007"
+.TH LDI_REMOVE_EVENT_HANDLER 9F "April 9, 2016"
 .SH NAME
 ldi_remove_event_handler \- remove an NDI event service callback
 .SH SYNOPSIS
@@ -16,11 +16,9 @@ ldi_remove_event_handler \- remove an NDI event service callback
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Obsolete
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIldi_handle_t lh\fR\fR
@@ -41,7 +39,6 @@ upon successful registration.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 This function is obsolete and is only maintained for compatibility. Use of this
 function is strongly discouraged. For equivalent functionality provided by new
@@ -52,9 +49,8 @@ interfaces, see \fBldi_ev_register_callbacks\fR(9F) and
 The \fBldi_remove_event_handler()\fR function removes the callback handler
 specified by the registration ID (\fIldi_callback_id_t\fR). Upon successful
 removal, the callback handler is removed from the system and is not invoked at
-the event occurance.
+the event occurrence.
 .SH RETURN VALUES
-.sp
 .ne 2
 .na
 \fB\fBDDI_SUCCESS\fR\fR
@@ -73,11 +69,9 @@ Failed to remove callback handler.
 .RE
 
 .SH CONTEXT
-.sp
 .LP
 This function can be called from user and kernel contexts only.
 .SH SEE ALSO
-.sp
 .LP
 \fBldi_ev_register_callbacks\fR(9F), \fBldi_ev_remove_callbacks\fR(9F),
 \fBldi_add_event_handler\fR(9F), \fBldi_get_eventcookie\fR(9F)
diff --git a/usr/src/man/man9f/scsi_ifgetcap.9f b/usr/src/man/man9f/scsi_ifgetcap.9f
index 758c58baf1..a6dabf72b0 100644
--- a/usr/src/man/man9f/scsi_ifgetcap.9f
+++ b/usr/src/man/man9f/scsi_ifgetcap.9f
@@ -4,7 +4,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 SCSI_IFGETCAP 9F "May 24, 2014"
+.TH SCSI_IFGETCAP 9F "April 9, 2016"
 .SH NAME
 scsi_ifgetcap, scsi_ifsetcap \- get/set SCSI transport capability
 .SH SYNOPSIS
@@ -24,11 +24,9 @@ scsi_ifgetcap, scsi_ifsetcap \- get/set SCSI transport capability
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI).
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIap\fR\fR
@@ -65,7 +63,6 @@ Determines if all targets or only the specified target is affected.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBscsi_ifsetcap()\fR function is used by target drivers to set the
 capabilities of the host adapter driver. The \fIcap\fR pointer is a name-value
@@ -238,7 +235,7 @@ If geometry is not relevant or appropriate for the target disk,
 \fBscsi_ifgetcap()\fR can return \fB-1\fR to indicate that the geometry is not
 defined. For example, if the \fBHBA\fR BIOS supports Logical Block Addressing
 for the target disk, \fBscsi_ifgetcap()\fR returns \fB-1\fR. Attempts to
-retreive the "virtual geometry" from the target driver, such as the
+retrieve the "virtual geometry" from the target driver, such as the
 \fBDKIOCG_VIRTGEOM\fR ioctl, will fail. See \fBdkio\fR(7I) for more information
 about \fBDKIOCG_VIRTGEOM\fR.
 .RE
@@ -334,7 +331,6 @@ the default value of the target driver is used for the \fBCDB\fR determination.
 .RE
 
 .SH RETURN VALUES
-.sp
 .LP
 The \fBscsi_ifsetcap()\fR function returns:
 .sp
@@ -406,11 +402,9 @@ if (scsi_ifsetcap(&devp->sd_address, "tagged-qing", 1, 1) == 1) {
 .in -2
 
 .SH CONTEXT
-.sp
 .LP
 These functions can be called from user, interrupt, or kernel context.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -426,7 +420,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBtran_reset\fR(9E), \fBscsi_hba_lookup_capstr\fR(9F), \fBscsi_reset\fR(9F),
 \fBscsi_reset_notify\fR(9F), \fBddi_dma_attr\fR(9S),
diff --git a/usr/src/man/man9f/scsi_validate_sense.9f b/usr/src/man/man9f/scsi_validate_sense.9f
index 6e24cc8eaf..efe75a55af 100644
--- a/usr/src/man/man9f/scsi_validate_sense.9f
+++ b/usr/src/man/man9f/scsi_validate_sense.9f
@@ -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 SCSI_VALIDATE_SENSE 9F "Jun 29, 2006"
+.TH SCSI_VALIDATE_SENSE 9F "April 9, 2016"
 .SH NAME
 scsi_validate_sense \- find descriptor in SCSI sense data
 .SH SYNOPSIS
@@ -18,11 +18,9 @@ scsi_validate_sense \- find descriptor in SCSI sense data
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI).
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIsense_buffer\fR\fR
@@ -51,7 +49,6 @@ Returns additional properties of the sense data.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBscsi_validate_sense()\fR function returns the format of the sense data
 contained in the provided sense buffer. If the response code field in the sense
@@ -81,11 +78,10 @@ sense data.
 .RS 20n
 The sense data contained in the buffer relates to an error that has occurred
 during the processing of a successfully completed command, such as a cached
-write that could not be commited to the media.
+write that could not be committed to the media.
 .RE
 
 .SH RETURN VALUES
-.sp
 .ne 2
 .na
 \fB\fBSENSE_UNUSABLE\fR\fR
@@ -114,12 +110,10 @@ The sense data in the buffer is in "descriptor format".
 .RE
 
 .SH CONTEXT
-.sp
 .LP
 The \fBscsi_validate_sense()\fR function can be called from user or interrupt
 context.
 .SH SEE ALSO
-.sp
 .LP
 \fBscsi_ext_sense_fields\fR(9F), \fBscsi_find_sense_descr\fR(9F),
 \fBscsi_sense_asc\fR(9F), \fBscsi_sense_ascq\fR(9F),
diff --git a/usr/src/man/man9f/scsi_vu_errmsg.9f b/usr/src/man/man9f/scsi_vu_errmsg.9f
index 59d15f393b..0d2ead1e18 100644
--- a/usr/src/man/man9f/scsi_vu_errmsg.9f
+++ b/usr/src/man/man9f/scsi_vu_errmsg.9f
@@ -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 SCSI_VU_ERRMSG 9F "Jan 16, 2006"
+.TH SCSI_VU_ERRMSG 9F "April 9, 2016"
 .SH NAME
 scsi_vu_errmsg \- display a SCSI request sense message
 .SH SYNOPSIS
@@ -21,11 +21,9 @@ scsi_vu_errmsg \- display a SCSI request sense message
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI).
 .SH PARAMETERS
-.sp
 .LP
 The following parameters are supported:
 .sp
@@ -126,7 +124,6 @@ possible and \fINULL\fR if no decoding is possible.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 This function is very similar to \fBscsi_errmsg\fR(9F) but allows decoding of
 vendor-unique ASC/ASCQ and FRU information.
@@ -217,7 +214,6 @@ For a basic SCSI disk, the following list is appropriate:
 .in -2
 
 .SH CONTEXT
-.sp
 .LP
 The \fBscsi_vu_errmsg()\fR function may be called from user, interrupt, or
 kernel context.
@@ -228,7 +224,7 @@ kernel context.
 .in +2
 .nf
      struct scsi_asq_key_strings cd_slist[] = {
-             0x81, 0, "Logical Unit is inaccessable",
+             0x81, 0, "Logical Unit is inaccessible",
              -1, 0, NULL,
      };
 
@@ -252,13 +248,12 @@ WARNING: /sbus@1,f8000000/esp@0,800000/sd@1,0 (sd1):
           Requested Block: 23936         Error Block: 23936
           Vendor: XYZ                Serial Number: 123456
           Sense Key:  Unit Attention
-          ASC: 0x81 (Logical Unit is inaccessable), ASCQ: 0x0
+          ASC: 0x81 (Logical Unit is inaccessible), ASCQ: 0x0
           FRU: 0x11 (replace LUN 1, located in slot 1)
 .fi
 .in -2
 
 .SH SEE ALSO
-.sp
 .LP
 \fBcmn_err\fR(9F), \fBscsi_errmsg\fR(9F), \fBscsi_log\fR(9F),
 \fBscsi_errmsg\fR(9F), \fBscsi_asc_key_strings\fR(9S), \fBscsi_device\fR(9S),
diff --git a/usr/src/man/man9s/usb_intr_request.9s b/usr/src/man/man9s/usb_intr_request.9s
index 9f8fc006cb..beb9f271d8 100644
--- a/usr/src/man/man9s/usb_intr_request.9s
+++ b/usr/src/man/man9s/usb_intr_request.9s
@@ -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 USB_INTR_REQUEST 9S "Jan 5, 2004"
+.TH USB_INTR_REQUEST 9S "April 9, 2016"
 .SH NAME
 usb_intr_request \- USB interrupt request structure
 .SH SYNOPSIS
@@ -13,11 +13,9 @@ usb_intr_request \- USB interrupt request structure
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI)
 .SH DESCRIPTION
-.sp
 .LP
 An interrupt request (that is, a request sent through an interrupt pipe), is
 used to transfer  small amounts  of data infrequently, but with bounded
@@ -152,7 +150,7 @@ constraints and caveats:
      Table notes:
 
        A) Continuous polling, new data is returned in cloned request
-          structures via continous callbacks, original request is
+          structures via continuous callbacks, original request is
           returned on stop polling.
 
        B) One time poll, no timeout, callback when data is
@@ -263,7 +261,6 @@ constraints and caveats:
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See attributes(5) for descriptions of the following attributes:
 .sp
@@ -281,7 +278,6 @@ Interface stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBusb_alloc_request\fR(9F), \fBusb_pipe_ctrl_xfer\fR(9F),
 \fBusb_pipe_bulk_xfer\fR(9F), \fBusb_pipe_intr_xfer\fR(9F),
diff --git a/usr/src/man/man9s/usb_isoc_request.9s b/usr/src/man/man9s/usb_isoc_request.9s
index 0473228f6a..3e957be111 100644
--- a/usr/src/man/man9s/usb_isoc_request.9s
+++ b/usr/src/man/man9s/usb_isoc_request.9s
@@ -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 USB_ISOC_REQUEST 9S "Dec 28, 2006"
+.TH USB_ISOC_REQUEST 9S "April 9, 2016"
 .SH NAME
 usb_isoc_request \- USB isochronous request structure
 .SH SYNOPSIS
@@ -13,11 +13,9 @@ usb_isoc_request \- USB isochronous request structure
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI)
 .SH DESCRIPTION
-.sp
 .LP
 A request sent through an isochronous pipe is used to transfer large amounts of
 packetized data with relative unreliability, but with bounded service periods.
@@ -179,7 +177,7 @@ X      X      ISOC_XFER_ASAP       !=NULL  See table note (C)
 Table notes:
 
     A) continuous polling, new data is returned in
-       cloned request structures via continous callbacks,
+       cloned request structures via continuous callbacks,
        original request is returned on stop polling
 
     B) invalid if the current_frame number is past
@@ -233,7 +231,6 @@ usb_callback_flags(9s) for a description of use and operation.
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See attributes(5) for descriptions of the following attributes:
 .sp
@@ -251,7 +248,6 @@ Interface stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5), \fBusb_alloc_request\fR(9F),
 \fBusb_get_current_frame_number\fR(9F),
diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf
index a02522c4ed..85d11480c2 100644
--- a/usr/src/pkg/manifests/developer-build-onbld.mf
+++ b/usr/src/pkg/manifests/developer-build-onbld.mf
@@ -168,6 +168,8 @@ file path=opt/onbld/lib/python2.6/onbld/Checks/Mapfile.py mode=0444
 file path=opt/onbld/lib/python2.6/onbld/Checks/Mapfile.pyc mode=0444
 file path=opt/onbld/lib/python2.6/onbld/Checks/ProcessCheck.py mode=0444
 file path=opt/onbld/lib/python2.6/onbld/Checks/ProcessCheck.pyc mode=0444
+file path=opt/onbld/lib/python2.6/onbld/Checks/SpellCheck.py mode=0444
+file path=opt/onbld/lib/python2.6/onbld/Checks/SpellCheck.pyc mode=0444
 file path=opt/onbld/lib/python2.6/onbld/Checks/__init__.py mode=0444
 file path=opt/onbld/lib/python2.6/onbld/Checks/__init__.pyc mode=0444
 file path=opt/onbld/lib/python2.6/onbld/Scm/Backup.py mode=0444
diff --git a/usr/src/pkg/manifests/system-kernel.man9f.inc b/usr/src/pkg/manifests/system-kernel.man9f.inc
index 94e46f191c..a9046569c0 100644
--- a/usr/src/pkg/manifests/system-kernel.man9f.inc
+++ b/usr/src/pkg/manifests/system-kernel.man9f.inc
@@ -275,6 +275,7 @@ file path=usr/share/man/man9f/gld.9f
 file path=usr/share/man/man9f/hook_alloc.9f
 file path=usr/share/man/man9f/hook_free.9f
 file path=usr/share/man/man9f/id32_alloc.9f
+file path=usr/share/man/man9f/id_space.9f
 file path=usr/share/man/man9f/inb.9f
 file path=usr/share/man/man9f/insq.9f
 file path=usr/share/man/man9f/kiconv.9f
@@ -903,6 +904,15 @@ link path=usr/share/man/man9f/gld_sched.9f target=gld.9f
 link path=usr/share/man/man9f/gld_unregister.9f target=gld.9f
 link path=usr/share/man/man9f/id32_free.9f target=id32_alloc.9f
 link path=usr/share/man/man9f/id32_lookup.9f target=id32_alloc.9f
+link path=usr/share/man/man9f/id_alloc.9f target=id_space.9f
+link path=usr/share/man/man9f/id_alloc_nosleep.9f target=id_space.9f
+link path=usr/share/man/man9f/id_alloc_specific_nosleep.9f target=id_space.9f
+link path=usr/share/man/man9f/id_allocff.9f target=id_space.9f
+link path=usr/share/man/man9f/id_allocff_nosleep.9f target=id_space.9f
+link path=usr/share/man/man9f/id_free.9f target=id_space.9f
+link path=usr/share/man/man9f/id_space_create.9f target=id_space.9f
+link path=usr/share/man/man9f/id_space_destroy.9f target=id_space.9f
+link path=usr/share/man/man9f/id_space_extend.9f target=id_space.9f
 link path=usr/share/man/man9f/inl.9f target=inb.9f
 link path=usr/share/man/man9f/intro.9f target=Intro.9f
 link path=usr/share/man/man9f/inw.9f target=inb.9f
diff --git a/usr/src/test/libc-tests/tests/Makefile b/usr/src/test/libc-tests/tests/Makefile
index f6fed9445e..34c0123d88 100644
--- a/usr/src/test/libc-tests/tests/Makefile
+++ b/usr/src/test/libc-tests/tests/Makefile
@@ -87,7 +87,7 @@ $(ROOTOPTDIR)/%: %.ksh
 	$(POST_PROCESS)
 
 %.32: %.c
-	$(LINK.c) -m32 -o $@ $< $(LDLIBS)
+	$(LINK.c) -o $@ $< $(LDLIBS)
 	$(POST_PROCESS)
 
 clobber: $(SUBDIRS)
diff --git a/usr/src/tools/onbld/Checks/Makefile b/usr/src/tools/onbld/Checks/Makefile
index 413a580981..02f13b8351 100644
--- a/usr/src/tools/onbld/Checks/Makefile
+++ b/usr/src/tools/onbld/Checks/Makefile
@@ -25,6 +25,7 @@
 
 # Copyright 2010, Richard Lowe
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
+# Copyright 2016, Joyent, Inc.
 
 include $(SRC)/Makefile.master
 include ../../Makefile.tools
@@ -42,6 +43,7 @@ PYSRCS = \
 	ManLint.py	\
 	Mapfile.py	\
 	ProcessCheck.py \
+	SpellCheck.py \
 	__init__.py
 
 PYOBJS =	$(PYSRCS:%.py=%.pyc)
diff --git a/usr/src/tools/onbld/Checks/SpellCheck.py b/usr/src/tools/onbld/Checks/SpellCheck.py
new file mode 100644
index 0000000000..8923b41818
--- /dev/null
+++ b/usr/src/tools/onbld/Checks/SpellCheck.py
@@ -0,0 +1,288 @@
+#
+# CDDL HEADER START
+#
+# 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]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2016 Joyent, Inc.
+#
+
+import re, sys
+
+spellMsg = '%s: Line %d contains "%s", a common misspelling of "%s"\n'
+altMsg = '%s: Lined %d contains "%s"; please use "%s" instead for consistency with other documentation\n'
+
+misspellings = {
+	'absense': 'absence',
+	'accessable': 'accessible',
+	'accomodate': 'accommodate',
+	'accomodation': 'accommodation',
+	'accross': 'across',
+	'acheive': 'achieve',
+	'addional': 'additional',
+	'addres': 'address',
+	'admininistrative': 'administrative',
+	'adminstered': 'administered',
+	'adminstrate': 'administrate',
+	'adminstration': 'administration',
+	'adminstrative': 'administrative',
+	'adminstrator': 'administrator',
+	'admissability': 'admissibility',
+	'adress': 'address',
+	'adressable': 'addressable',
+	'adressed': 'addressed',
+	'adressing': 'addressing, dressing',
+	'aginst': 'against',
+	'agression': 'aggression',
+	'agressive': 'aggressive',
+	'alot': 'a lot, allot',
+	'and and': 'and',
+	'apparantly': 'apparently',
+	'appearence': 'appearance',
+	'arguement': 'argument',
+	'assasination': 'assassination',
+	'auxilliary': 'auxiliary',
+	'basicly': 'basically',
+	'begining': 'beginning',
+	'belive': 'believe',
+	'beteen': 'between',
+	'betwen': 'between',
+	'beween': 'between',
+	'bewteen': 'between',
+	'bizzare': 'bizarre',
+	'buisness': 'business',
+	'calender': 'calendar',
+	'cemetary': 'cemetery',
+	'chauffer': 'chauffeur',
+	'collegue': 'colleague',
+	'comming': 'coming',
+	'commited': 'committed',
+	'commitee': 'committee',
+	'commiting': 'committing',
+	'comparision': 'comparison',
+	'comparisions': 'comparisons',
+	'compatability': 'compatibility',
+	'compatable': 'compatible',
+	'compatablity': 'compatibility',
+	'compatiable': 'compatible',
+	'compatiblity': 'compatibility',
+	'completly': 'completely',
+	'concious': 'conscious',
+	'condidtion': 'condition',
+	'conected': 'connected',
+	'conjuction': 'conjunction',
+	'continous': 'continuous',
+	'curiousity': 'curiosity',
+	'deamon': 'daemon',
+	'definately': 'definitely',
+	'desireable': 'desirable',
+	'diffrent': 'different',
+	'dilemna': 'dilemma',
+	'dissapear': 'disappear',
+	'dissapoint': 'disappoint',
+	'ecstacy': 'ecstasy',
+	'embarass': 'embarrass',
+	'enviroment': 'environment',
+	'exept': 'except',
+	'existance': 'existence',
+	'familar': 'familiar',
+	'finaly': 'finally',
+	'folowing': 'following',
+	'foriegn': 'foreign',
+	'forseeable': 'foreseeable',
+	'fourty': 'forty',
+	'foward': 'forward',
+	'freind': 'friend',
+	'futher': 'further',
+	'gaurd': 'guard',
+	'glamourous': 'glamorous',
+	'goverment': 'government',
+	'happend': 'happened',
+	'harrassment': 'harassment',
+	'hierachical': 'hierarchical',
+	'hierachies': 'hierarchies',
+	'hierachy': 'hierarchy',
+	'hierarcical': 'hierarchical',
+	'hierarcy': 'hierarchy',
+	'honourary': 'honorary',
+	'humourous': 'humorous',
+	'idiosyncracy': 'idiosyncrasy',
+	'immediatly': 'immediately',
+	'inaccessable': 'inaccessible',
+	'inbetween': 'between',
+	'incidently': 'incidentally',
+	'independant': 'independent',
+	'infomation': 'information',
+	'interupt': 'interrupt',
+	'intial': 'initial',
+	'intially': 'initially',
+	'irresistable': 'irresistible',
+	'jist': 'gist',
+	'knowlege': 'knowledge',
+	'lenght': 'length',
+	'liase': 'liaise',
+	'liason': 'liaison',
+	'libary': 'library',
+	'maching': 'machine, marching, matching',
+	'millenia': 'millennia',
+	'millenium': 'millennium',
+	'neccessary': 'necessary',
+	'negotation': 'negotiation',
+	'nontheless': 'nonetheless',
+	'noticable': 'noticeable',
+	'occassion': 'occasion',
+	'occassional': 'occasional',
+	'occassionally': 'occasionally',
+	'occurance': 'occurrence',
+	'occured': 'occurred',
+	'occurence': 'occurrence',
+	'occuring': 'occurring',
+	'ommision': 'omission',
+	'orginal': 'original',
+	'orginally': 'originally',
+	'pavillion': 'pavilion',
+	'peice': 'piece',
+	'persistant': 'persistent',
+	'politican': 'politician',
+	'posession': 'possession',
+	'possiblity': 'possibility',
+	'preceed': 'precede',
+	'preceeded': 'preceded',
+	'preceeding': 'preceding',
+	'preceeds': 'precedes',
+	'prefered': 'preferred',
+	'prefering': 'preferring',
+	'presense': 'presence',
+	'proces': 'process',
+	'propoganda': 'propaganda',
+	'psuedo': 'pseudo',
+	'publically': 'publicly',
+	'realy': 'really',
+	'reciept': 'receipt',
+	'recieve': 'receive',
+	'recieved': 'received',
+	'reciever': 'receiver',
+	'recievers': 'receivers',
+	'recieves': 'receives',
+	'recieving': 'receiving',
+	'recomend': 'recommend',
+	'recomended': 'recommended',
+	'recomending': 'recommending',
+	'recomends': 'recommends',
+	'recurse': 'recur',
+	'recurses': 'recurs',
+	'recursing': 'recurring',
+	'refered': 'referred',
+	'refering': 'referring',
+	'religous': 'religious',
+	'rember': 'remember',
+	'remeber': 'remember',
+	'repetion': 'repetition',
+	'reponsible': 'responsible',
+	'resistence': 'resistance',
+	'retreive': 'retrieve',
+	'seige': 'siege',
+	'sence': 'since',
+	'seperate': 'separate',
+	'seperated': 'separated',
+	'seperately': 'separately',
+	'seperates': 'separates',
+	'similiar': 'similar',
+	'somwhere': 'somewhere',
+	'sould': 'could, should, sold, soul',
+	'sturcture': 'structure',
+	'succesful': 'successful',
+	'succesfully': 'successfully',
+	'successfull': 'successful',
+	'sucessful': 'successful',
+	'supercede': 'supersede',
+	'supress': 'suppress',
+	'supressed': 'suppressed',
+	'suprise': 'surprise',
+	'suprisingly': 'surprisingly',
+	'sytem': 'system',
+	'tendancy': 'tendency',
+	'the the': 'the',
+	'the these': 'these',
+	'therefor': 'therefore',
+	'threshhold': 'threshold',
+	'tolerence': 'tolerance',
+	'tommorow': 'tomorrow',
+	'tommorrow': 'tomorrow',
+	'tounge': 'tongue',
+	'tranformed': 'transformed',
+	'transfered': 'transferred',
+	'truely': 'truly',
+	'trustworthyness': 'trustworthiness',
+	'unforseen': 'unforeseen',
+	'unfortunatly': 'unfortunately',
+	'unsuccessfull': 'unsuccessful',
+	'untill': 'until',
+	'upto': 'up to',
+	'whereever': 'wherever',
+	'wich': 'which',
+	'wierd': 'weird',
+	'wtih': 'with',
+}
+
+alternates = {
+	'parseable': 'parsable',
+	'sub-command': 'subcommand',
+	'sub-commands': 'subcommands',
+	'writeable': 'writable'
+}
+
+misspellingREs = []
+alternateREs = []
+
+for misspelling, correct in misspellings.iteritems():
+	regex = re.compile(r'\b%s\b' % (misspelling), re.IGNORECASE)
+	entry = (regex, misspelling, correct)
+	misspellingREs.append(entry)
+
+for alternate, correct in alternates.iteritems():
+	regex = re.compile(r'\b%s\b' % (alternate), re.IGNORECASE)
+	entry = (regex, alternate, correct)
+	alternateREs.append(entry)
+
+def check(errmsg, output, filename, line, lineno, entry):
+	if entry[0].search(line):
+		output.write(errmsg % (filename, lineno, entry[1], entry[2]))
+		return 1
+	else:
+		return 0
+
+def spellcheck(fh, filename=None, output=sys.stderr, **opts):
+	lineno = 1
+	ret = 0
+
+	if not filename:
+		filename = fh.name
+
+	fh.seek(0)
+	for line in fh:
+		for entry in misspellingREs:
+			ret |= check(spellMsg, output, filename, line,
+			    lineno, entry)
+		for entry in alternateREs:
+			ret |= check(altMsg, output, filename, line,
+			    lineno, entry)
+		lineno += 1
+
+	return ret
diff --git a/usr/src/tools/onbld/Checks/__init__.py b/usr/src/tools/onbld/Checks/__init__.py
index 2fde833098..c088df4ead 100644
--- a/usr/src/tools/onbld/Checks/__init__.py
+++ b/usr/src/tools/onbld/Checks/__init__.py
@@ -41,4 +41,5 @@ __all__ = [
 	'JStyle',
 	'Keywords',
 	'ManLint',
-	'Mapfile']
+	'Mapfile',
+	'SpellCheck']
diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py
index ddaa65a622..dff057d6f5 100644
--- a/usr/src/tools/scripts/git-pbchk.py
+++ b/usr/src/tools/scripts/git-pbchk.py
@@ -48,7 +48,7 @@ sys.path.insert(2, os.path.join(os.path.dirname(__file__), ".."))
 
 from onbld.Scm import Ignore
 from onbld.Checks import Comments, Copyright, CStyle, HdrChk
-from onbld.Checks import JStyle, Keywords, ManLint, Mapfile
+from onbld.Checks import JStyle, Keywords, ManLint, Mapfile, SpellCheck
 
 
 class GitError(Exception):
@@ -291,11 +291,12 @@ def jstyle(root, parent, flist, output):
 
 def manlint(root, parent, flist, output):
     ret = 0
-    output.write("Man page format:\n")
+    output.write("Man page format/spelling:\n")
     ManfileRE = re.compile(r'.*\.[0-9][a-z]*$', re.IGNORECASE)
     for f in flist(lambda x: ManfileRE.match(x)):
         fh = open(f, 'r')
         ret |= ManLint.manlint(fh, output=output, picky=True)
+        ret |= SpellCheck.spellcheck(fh, output=output)
 	fh.close()
     return ret
 
diff --git a/usr/src/uts/common/fs/vfs.c b/usr/src/uts/common/fs/vfs.c
index ead382ce07..c1b5c12542 100644
--- a/usr/src/uts/common/fs/vfs.c
+++ b/usr/src/uts/common/fs/vfs.c
@@ -22,6 +22,7 @@
  * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2016 Joyent, Inc.
  * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  */
 
 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
@@ -358,7 +359,7 @@ fs_copyfsops(const fs_operation_def_t *template, vfsops_t *actual,
 }
 
 void
-zfs_boot_init()
+zfs_boot_init(void)
 {
 	if (strcmp(rootfs.bo_fstype, MNTTYPE_ZFS) == 0)
 		spa_boot_init();
@@ -528,7 +529,7 @@ vfs_init(vfs_t *vfsp, vfsops_t *op, void *data)
 	vfsp->vfs_prev = vfsp;
 	vfsp->vfs_zone_next = vfsp;
 	vfsp->vfs_zone_prev = vfsp;
-	vfsp->vfs_lofi_minor = 0;
+	vfsp->vfs_lofi_id = 0;
 	sema_init(&vfsp->vfs_reflock, 1, NULL, SEMA_DEFAULT, NULL);
 	vfsimpl_setup(vfsp);
 	vfsp->vfs_data = (data);
@@ -987,7 +988,7 @@ lofi_add(const char *fsname, struct vfs *vfsp,
 	ldi_ident_t ldi_id;
 	ldi_handle_t ldi_hdl;
 	vfssw_t *vfssw;
-	int minor;
+	int id;
 	int err = 0;
 
 	if ((vfssw = vfs_getvfssw(fsname)) == NULL)
@@ -1031,12 +1032,12 @@ lofi_add(const char *fsname, struct vfs *vfsp,
 		goto out2;
 
 	err = ldi_ioctl(ldi_hdl, LOFI_MAP_FILE, (intptr_t)li,
-	    FREAD | FWRITE | FKIOCTL, kcred, &minor);
+	    FREAD | FWRITE | FKIOCTL, kcred, &id);
 
 	(void) ldi_close(ldi_hdl, FREAD | FWRITE, kcred);
 
 	if (!err)
-		vfsp->vfs_lofi_minor = minor;
+		vfsp->vfs_lofi_id = id;
 
 out2:
 	ldi_ident_release(ldi_id);
@@ -1057,13 +1058,13 @@ lofi_remove(struct vfs *vfsp)
 	ldi_handle_t ldi_hdl;
 	int err;
 
-	if (vfsp->vfs_lofi_minor == 0)
+	if (vfsp->vfs_lofi_id == 0)
 		return;
 
 	ldi_id = ldi_ident_from_anon();
 
 	li = kmem_zalloc(sizeof (*li), KM_SLEEP);
-	li->li_minor = vfsp->vfs_lofi_minor;
+	li->li_id = vfsp->vfs_lofi_id;
 	li->li_cleanup = B_TRUE;
 
 	err = ldi_open_by_name("/dev/lofictl", FREAD | FWRITE, kcred,
@@ -1078,7 +1079,7 @@ lofi_remove(struct vfs *vfsp)
 	(void) ldi_close(ldi_hdl, FREAD | FWRITE, kcred);
 
 	if (!err)
-		vfsp->vfs_lofi_minor = 0;
+		vfsp->vfs_lofi_id = 0;
 
 out:
 	ldi_ident_release(ldi_id);
@@ -1484,7 +1485,7 @@ domount(char *fsname, struct mounta *uap, vnode_t *vp, struct cred *credp,
 	/*
 	 * PRIV_SYS_MOUNT doesn't mean you can become root.
 	 */
-	if (vfsp->vfs_lofi_minor != 0) {
+	if (vfsp->vfs_lofi_id != 0) {
 		uap->flags |= MS_NOSUID;
 		vfs_setmntopt_nolock(&mnt_mntopts, MNTOPT_NOSUID, NULL, 0, 0);
 	}
@@ -4805,14 +4806,14 @@ vfs_get_lofi(vfs_t *vfsp, vnode_t **vpp)
 	int strsize;
 	int err;
 
-	if (vfsp->vfs_lofi_minor == 0) {
+	if (vfsp->vfs_lofi_id == 0) {
 		*vpp = NULL;
 		return (-1);
 	}
 
-	strsize = snprintf(NULL, 0, LOFINODE_PATH, vfsp->vfs_lofi_minor);
+	strsize = snprintf(NULL, 0, LOFINODE_PATH, vfsp->vfs_lofi_id);
 	path = kmem_alloc(strsize + 1, KM_SLEEP);
-	(void) snprintf(path, strsize + 1, LOFINODE_PATH, vfsp->vfs_lofi_minor);
+	(void) snprintf(path, strsize + 1, LOFINODE_PATH, vfsp->vfs_lofi_id);
 
 	/*
 	 * We may be inside a zone, so we need to use the /dev path, but
diff --git a/usr/src/uts/common/io/cmlb.c b/usr/src/uts/common/io/cmlb.c
index f668380868..ea04806be9 100644
--- a/usr/src/uts/common/io/cmlb.c
+++ b/usr/src/uts/common/io/cmlb.c
@@ -23,6 +23,7 @@
  * Copyright 2012 DEY Storage Systems, Inc.  All rights reserved.
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  */
 
 /*
@@ -647,6 +648,9 @@ cmlb_free_handle(cmlb_handle_t *cmlbhandlep)
  *			If there is a valid Solaris partition, s0 and s2 will
  *			only cover the entire Solaris partition.
  *
+ *			CMLB_CREATE_P0_MINOR_NODE: create p0 node covering
+ *			the entire disk. Used by lofi to ensure presence of
+ *			whole disk device node in case of LOFI_MAP_FILE ioctl.
  *
  *	cmlbhandle	cmlb handle associated with device
  *
@@ -1057,14 +1061,9 @@ cmlb_partinfo(cmlb_handle_t cmlbhandle, int part, diskaddr_t *nblocksp,
 			(void) cmlb_validate_geometry((struct cmlb_lun *)cl,
 			    B_FALSE, 0, tg_cookie);
 
-#if defined(_SUNOS_VTOC_16)
 		if (((!cl->cl_f_geometry_is_valid) ||
 		    (part < NDKMAP && cl->cl_solaris_size == 0)) &&
 		    (part != P0_RAW_DISK)) {
-#else
-		if ((!cl->cl_f_geometry_is_valid) ||
-		    (part < NDKMAP && cl->cl_solaris_size == 0)) {
-#endif
 			rval = EINVAL;
 		} else {
 			if (startblockp != NULL)
@@ -1361,8 +1360,14 @@ cmlb_ioctl(cmlb_handle_t cmlbhandle, dev_t dev, int cmd, intptr_t arg,
 dev_t
 cmlb_make_device(struct cmlb_lun *cl)
 {
-	return (makedevice(ddi_driver_major(CMLB_DEVINFO(cl)),
-	    ddi_get_instance(CMLB_DEVINFO(cl)) << CMLBUNIT_SHIFT));
+	if (cl->cl_alter_behavior & CMLB_CREATE_P0_MINOR_NODE) {
+		return (makedevice(ddi_driver_major(CMLB_DEVINFO(cl)),
+		    ddi_get_instance(
+		    CMLB_DEVINFO(cl)) << CMLBUNIT_FORCE_P0_SHIFT));
+	} else {
+		return (makedevice(ddi_driver_major(CMLB_DEVINFO(cl)),
+		    ddi_get_instance(CMLB_DEVINFO(cl)) << CMLBUNIT_SHIFT));
+	}
 }
 
 /*
@@ -1444,7 +1449,7 @@ static int
 cmlb_create_minor_nodes(struct cmlb_lun *cl)
 {
 	struct driver_minor_data	*dmdp;
-	int				instance;
+	int				instance, shift;
 	char				name[48];
 	cmlb_label_t			newlabeltype;
 	boolean_t			internal;
@@ -1455,6 +1460,11 @@ cmlb_create_minor_nodes(struct cmlb_lun *cl)
 	internal = VOID2BOOLEAN(
 	    (cl->cl_alter_behavior & (CMLB_INTERNAL_MINOR_NODES)) != 0);
 
+	if (cl->cl_alter_behavior & CMLB_CREATE_P0_MINOR_NODE)
+		shift = CMLBUNIT_FORCE_P0_SHIFT;
+	else
+		shift = CMLBUNIT_SHIFT;
+
 	/* check the most common case */
 	if (cl->cl_cur_labeltype != CMLB_LABEL_UNDEF &&
 	    cl->cl_last_labeltype == cl->cl_cur_labeltype) {
@@ -1482,7 +1492,7 @@ cmlb_create_minor_nodes(struct cmlb_lun *cl)
 
 			if (cmlb_create_minor(CMLB_DEVINFO(cl), name,
 			    dmdp->type,
-			    (instance << CMLBUNIT_SHIFT) | dmdp->minor,
+			    (instance << shift) | dmdp->minor,
 			    cl->cl_node_type, NULL, internal) == DDI_FAILURE) {
 				/*
 				 * Clean up any nodes that may have been
@@ -1495,6 +1505,27 @@ cmlb_create_minor_nodes(struct cmlb_lun *cl)
 			dmdp++;
 		}
 		cl->cl_last_labeltype = newlabeltype;
+#if defined(_SUNOS_VTOC_8)
+		/*
+		 * "emulate" p0 device for sparc, used by lofi
+		 */
+		if (cl->cl_alter_behavior & CMLB_CREATE_P0_MINOR_NODE) {
+			if (cmlb_create_minor(CMLB_DEVINFO(cl), "q", S_IFBLK,
+			    (instance << CMLBUNIT_FORCE_P0_SHIFT) | P0_RAW_DISK,
+			    cl->cl_node_type, NULL, internal) == DDI_FAILURE) {
+				ddi_remove_minor_node(CMLB_DEVINFO(cl), NULL);
+				return (ENXIO);
+			}
+
+			if (cmlb_create_minor(CMLB_DEVINFO(cl), "q,raw",
+			    S_IFCHR,
+			    (instance << CMLBUNIT_FORCE_P0_SHIFT) | P0_RAW_DISK,
+			    cl->cl_node_type, NULL, internal) == DDI_FAILURE) {
+				ddi_remove_minor_node(CMLB_DEVINFO(cl), NULL);
+				return (ENXIO);
+			}
+		}
+#endif	/* defined(_SUNOS_VTOC_8) */
 		return (0);
 	}
 
@@ -1536,20 +1567,20 @@ cmlb_create_minor_nodes(struct cmlb_lun *cl)
 		ddi_remove_minor_node(CMLB_DEVINFO(cl), "h");
 		ddi_remove_minor_node(CMLB_DEVINFO(cl), "h,raw");
 		(void) cmlb_create_minor(CMLB_DEVINFO(cl), "wd",
-		    S_IFBLK, (instance << CMLBUNIT_SHIFT) | WD_NODE,
+		    S_IFBLK, (instance << shift) | WD_NODE,
 		    cl->cl_node_type, NULL, internal);
 		(void) cmlb_create_minor(CMLB_DEVINFO(cl), "wd,raw",
-		    S_IFCHR, (instance << CMLBUNIT_SHIFT) | WD_NODE,
+		    S_IFCHR, (instance << shift) | WD_NODE,
 		    cl->cl_node_type, NULL, internal);
 	} else {
 		/* from efi to vtoc */
 		ddi_remove_minor_node(CMLB_DEVINFO(cl), "wd");
 		ddi_remove_minor_node(CMLB_DEVINFO(cl), "wd,raw");
 		(void) cmlb_create_minor(CMLB_DEVINFO(cl), "h",
-		    S_IFBLK, (instance << CMLBUNIT_SHIFT) | WD_NODE,
+		    S_IFBLK, (instance << shift) | WD_NODE,
 		    cl->cl_node_type, NULL, internal);
 		(void) cmlb_create_minor(CMLB_DEVINFO(cl), "h,raw",
-		    S_IFCHR, (instance << CMLBUNIT_SHIFT) | WD_NODE,
+		    S_IFCHR, (instance << shift) | WD_NODE,
 		    cl->cl_node_type, NULL, internal);
 	}
 
@@ -1605,7 +1636,6 @@ cmlb_validate_geometry(struct cmlb_lun *cl, boolean_t forcerevalid, int flags,
 
 	capacity = cl->cl_blockcount;
 
-#if defined(_SUNOS_VTOC_16)
 	/*
 	 * Set up the "whole disk" fdisk partition; this should always
 	 * exist, regardless of whether the disk contains an fdisk table
@@ -1618,7 +1648,7 @@ cmlb_validate_geometry(struct cmlb_lun *cl, boolean_t forcerevalid, int flags,
 	 * so no truncation happens
 	 */
 	cl->cl_map[P0_RAW_DISK].dkl_nblk  = capacity;
-#endif
+
 	/*
 	 * Refresh the logical and physical geometry caches.
 	 * (data from MODE SENSE format/rigid disk geometry pages,
@@ -2043,7 +2073,7 @@ cmlb_resync_geom_caches(struct cmlb_lun *cl, diskaddr_t capacity,
 static int
 cmlb_update_ext_minor_nodes(struct cmlb_lun *cl, int num_parts)
 {
-	int				i, count;
+	int				i, count, shift;
 	char				name[48];
 	int				instance;
 	struct driver_minor_data	*demdp, *demdpr;
@@ -2060,6 +2090,10 @@ cmlb_update_ext_minor_nodes(struct cmlb_lun *cl, int num_parts)
 	demdp = dk_ext_minor_data;
 	demdpr = &dk_ext_minor_data[MAX_EXT_PARTS];
 
+	if (cl->cl_alter_behavior & CMLB_CREATE_P0_MINOR_NODE)
+		shift = CMLBUNIT_FORCE_P0_SHIFT;
+	else
+		shift = CMLBUNIT_SHIFT;
 
 	if (cl->cl_logical_drive_count) {
 		for (i = 0; i < cl->cl_logical_drive_count; i++) {
@@ -2085,7 +2119,7 @@ cmlb_update_ext_minor_nodes(struct cmlb_lun *cl, int num_parts)
 		(void) sprintf(name, "%s", demdp->name);
 		if (cmlb_create_minor(CMLB_DEVINFO(cl), name,
 		    demdp->type,
-		    (instance << CMLBUNIT_SHIFT) | demdp->minor,
+		    (instance << shift) | demdp->minor,
 		    cl->cl_node_type, NULL, internal) == DDI_FAILURE) {
 			/*
 			 * Clean up any nodes that may have been
@@ -2099,7 +2133,7 @@ cmlb_update_ext_minor_nodes(struct cmlb_lun *cl, int num_parts)
 		(void) sprintf(name, "%s", demdpr->name);
 		if (ddi_create_minor_node(CMLB_DEVINFO(cl), name,
 		    demdpr->type,
-		    (instance << CMLBUNIT_SHIFT) | demdpr->minor,
+		    (instance << shift) | demdpr->minor,
 		    cl->cl_node_type, NULL) == DDI_FAILURE) {
 			/*
 			 * Clean up any nodes that may have been
@@ -4308,12 +4342,17 @@ cmlb_dkio_set_vtoc(struct cmlb_lun *cl, dev_t dev, caddr_t arg, int flag,
     void *tg_cookie)
 {
 	struct vtoc	user_vtoc;
-	int		rval = 0;
+	int		shift, rval = 0;
 	boolean_t	internal;
 
 	internal = VOID2BOOLEAN(
 	    (cl->cl_alter_behavior & (CMLB_INTERNAL_MINOR_NODES)) != 0);
 
+	if (cl->cl_alter_behavior & CMLB_CREATE_P0_MINOR_NODE)
+		shift = CMLBUNIT_FORCE_P0_SHIFT;
+	else
+		shift = CMLBUNIT_SHIFT;
+
 #ifdef _MULTI_DATAMODEL
 	switch (ddi_model_convert_from(flag & FMODELS)) {
 	case DDI_MODEL_ILP32: {
@@ -4375,10 +4414,10 @@ cmlb_dkio_set_vtoc(struct cmlb_lun *cl, dev_t dev, caddr_t arg, int flag,
 	ddi_remove_minor_node(CMLB_DEVINFO(cl), "h,raw");
 
 	(void) cmlb_create_minor(CMLB_DEVINFO(cl), "h",
-	    S_IFBLK, (CMLBUNIT(dev) << CMLBUNIT_SHIFT) | WD_NODE,
+	    S_IFBLK, (CMLBUNIT(dev, shift) << shift) | WD_NODE,
 	    cl->cl_node_type, NULL, internal);
 	(void) cmlb_create_minor(CMLB_DEVINFO(cl), "h,raw",
-	    S_IFCHR, (CMLBUNIT(dev) << CMLBUNIT_SHIFT) | WD_NODE,
+	    S_IFCHR, (CMLBUNIT(dev, shift) << shift) | WD_NODE,
 	    cl->cl_node_type, NULL, internal);
 	mutex_enter(CMLB_MUTEX(cl));
 
@@ -4404,10 +4443,14 @@ static int
 cmlb_dkio_set_extvtoc(struct cmlb_lun *cl, dev_t dev, caddr_t arg, int flag,
     void *tg_cookie)
 {
-	int		rval = 0;
+	int		shift, rval = 0;
 	struct vtoc	user_vtoc;
 	boolean_t	internal;
 
+	if (cl->cl_alter_behavior & CMLB_CREATE_P0_MINOR_NODE)
+		shift = CMLBUNIT_FORCE_P0_SHIFT;
+	else
+		shift = CMLBUNIT_SHIFT;
 
 	/*
 	 * Checking callers data model does not make much sense here
@@ -4459,10 +4502,10 @@ cmlb_dkio_set_extvtoc(struct cmlb_lun *cl, dev_t dev, caddr_t arg, int flag,
 	ddi_remove_minor_node(CMLB_DEVINFO(cl), "h,raw");
 
 	(void) cmlb_create_minor(CMLB_DEVINFO(cl), "h",
-	    S_IFBLK, (CMLBUNIT(dev) << CMLBUNIT_SHIFT) | WD_NODE,
+	    S_IFBLK, (CMLBUNIT(dev, shift) << shift) | WD_NODE,
 	    cl->cl_node_type, NULL, internal);
 	(void) cmlb_create_minor(CMLB_DEVINFO(cl), "h,raw",
-	    S_IFCHR, (CMLBUNIT(dev) << CMLBUNIT_SHIFT) | WD_NODE,
+	    S_IFCHR, (CMLBUNIT(dev, shift) << shift) | WD_NODE,
 	    cl->cl_node_type, NULL, internal);
 
 	mutex_enter(CMLB_MUTEX(cl));
@@ -4925,7 +4968,7 @@ cmlb_dkio_set_efi(struct cmlb_lun *cl, dev_t dev, caddr_t arg, int flag,
     void *tg_cookie)
 {
 	dk_efi_t	user_efi;
-	int		rval = 0;
+	int		shift, rval = 0;
 	void		*buffer;
 	diskaddr_t	tgt_lba;
 	boolean_t	internal;
@@ -4936,6 +4979,11 @@ cmlb_dkio_set_efi(struct cmlb_lun *cl, dev_t dev, caddr_t arg, int flag,
 	internal = VOID2BOOLEAN(
 	    (cl->cl_alter_behavior & (CMLB_INTERNAL_MINOR_NODES)) != 0);
 
+	if (cl->cl_alter_behavior & CMLB_CREATE_P0_MINOR_NODE)
+		shift = CMLBUNIT_FORCE_P0_SHIFT;
+	else
+		shift = CMLBUNIT_SHIFT;
+
 	user_efi.dki_data = (void *)(uintptr_t)user_efi.dki_data_64;
 
 	if (user_efi.dki_length == 0 ||
@@ -4976,11 +5024,11 @@ cmlb_dkio_set_efi(struct cmlb_lun *cl, dev_t dev, caddr_t arg, int flag,
 			ddi_remove_minor_node(CMLB_DEVINFO(cl), "h,raw");
 			(void) cmlb_create_minor(CMLB_DEVINFO(cl), "wd",
 			    S_IFBLK,
-			    (CMLBUNIT(dev) << CMLBUNIT_SHIFT) | WD_NODE,
+			    (CMLBUNIT(dev, shift) << shift) | WD_NODE,
 			    cl->cl_node_type, NULL, internal);
 			(void) cmlb_create_minor(CMLB_DEVINFO(cl), "wd,raw",
 			    S_IFCHR,
-			    (CMLBUNIT(dev) << CMLBUNIT_SHIFT) | WD_NODE,
+			    (CMLBUNIT(dev, shift) << shift) | WD_NODE,
 			    cl->cl_node_type, NULL, internal);
 		} else
 			mutex_exit(CMLB_MUTEX(cl));
@@ -5344,7 +5392,6 @@ cmlb_update_fdisk_and_vtoc(struct cmlb_lun *cl, void *tg_cookie)
 	if (cmlb_check_update_blockcount(cl, tg_cookie) != 0)
 		return (EINVAL);
 
-#if defined(_SUNOS_VTOC_16)
 	/*
 	 * Set up the "whole disk" fdisk partition; this should always
 	 * exist, regardless of whether the disk contains an fdisk table
@@ -5352,7 +5399,6 @@ cmlb_update_fdisk_and_vtoc(struct cmlb_lun *cl, void *tg_cookie)
 	 */
 	cl->cl_map[P0_RAW_DISK].dkl_cylno = 0;
 	cl->cl_map[P0_RAW_DISK].dkl_nblk = cl->cl_blockcount;
-#endif	/* defined(_SUNOS_VTOC_16) */
 
 	/*
 	 * copy the lbasize and capacity so that if they're
@@ -5578,7 +5624,10 @@ cmlb_dkio_partinfo(struct cmlb_lun *cl, dev_t dev, caddr_t  arg, int flag)
 	 */
 	int part;
 
-	part = CMLBPART(dev);
+	if (cl->cl_alter_behavior & CMLB_CREATE_P0_MINOR_NODE)
+		part = getminor(dev) & ((1 << CMLBUNIT_FORCE_P0_SHIFT) - 1);
+	else
+		part = CMLBPART(dev);
 
 	mutex_enter(CMLB_MUTEX(cl));
 	/* don't check cl_solaris_size for pN */
@@ -5631,7 +5680,10 @@ cmlb_dkio_extpartinfo(struct cmlb_lun *cl, dev_t dev, caddr_t  arg, int flag)
 	 */
 	int part;
 
-	part = CMLBPART(dev);
+	if (cl->cl_alter_behavior & CMLB_CREATE_P0_MINOR_NODE)
+		part = getminor(dev) & ((1 << CMLBUNIT_FORCE_P0_SHIFT) - 1);
+	else
+		part = CMLBPART(dev);
 
 	mutex_enter(CMLB_MUTEX(cl));
 	/* don't check cl_solaris_size for pN */
diff --git a/usr/src/uts/common/io/lofi.c b/usr/src/uts/common/io/lofi.c
index e11f910a91..0312a54b62 100644
--- a/usr/src/uts/common/io/lofi.c
+++ b/usr/src/uts/common/io/lofi.c
@@ -23,6 +23,7 @@
  *
  * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2016 Andrey Sokolov
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  */
 
 /*
@@ -34,14 +35,25 @@
  * mounting images of filesystems.
  *
  * lofi is controlled through /dev/lofictl - this is the only device exported
- * during attach, and is minor number 0. lofiadm communicates with lofi through
- * ioctls on this device. When a file is attached to lofi, block and character
- * devices are exported in /dev/lofi and /dev/rlofi. Currently, these devices
- * are identified by their minor number, and the minor number is also used
- * as the name in /dev/lofi. If we ever decide to support virtual disks,
- * we'll have to divide the minor number space to identify fdisk partitions
- * and slices, and the name will then be the minor number shifted down a
- * few bits. Minor devices are tracked with state structures handled with
+ * during attach, and is instance number 0. lofiadm communicates with lofi
+ * through ioctls on this device. When a file is attached to lofi, block and
+ * character devices are exported in /dev/lofi and /dev/rlofi. These devices
+ * are identified by lofi instance number, and the instance number is also used
+ * as the name in /dev/lofi.
+ *
+ * Virtual disks, or, labeled lofi, implements virtual disk support to
+ * support partition table and related tools. Such mappings will cause
+ * block and character devices to be exported in /dev/dsk and /dev/rdsk
+ * directories.
+ *
+ * To support virtual disks, the instance number space is divided to two
+ * parts, upper part for instance number and lower part for minor number
+ * space to identify partitions and slices. The virtual disk support is
+ * implemented by stacking cmlb module. For virtual disks, the partition
+ * related ioctl calls are routed to cmlb module. Compression and encryption
+ * is not supported for virtual disks.
+ *
+ * Mapped devices are tracked with state structures handled with
  * ddi_soft_state(9F) for simplicity.
  *
  * A file attached to lofi is opened when attached and not closed until
@@ -131,6 +143,10 @@
 #include <sys/crypto/common.h>
 #include <sys/crypto/api.h>
 #include <sys/rctl.h>
+#include <sys/vtoc.h>
+#include <sys/scsi/scsi.h>	/* for DTYPE_DIRECT */
+#include <sys/scsi/impl/uscsi.h>
+#include <sys/sysevent/dev.h>
 #include <LzmaDec.h>
 
 #define	NBLOCKS_PROP_NAME	"Nblocks"
@@ -151,10 +167,16 @@
 		return (EINVAL); \
 	}
 
-static dev_info_t *lofi_dip = NULL;
-static void *lofi_statep = NULL;
+#define	DEVFS_CHANNEL	"devfsadm_event_channel"
+#define	LOFI_TIMEOUT	30
+static evchan_t *lofi_chan;
+static kmutex_t lofi_chan_lock;
+static kcondvar_t lofi_chan_cv;
+static nvlist_t *lofi_devlink_cache;
+
+static void *lofi_statep;
 static kmutex_t lofi_lock;		/* state lock */
-static id_space_t *lofi_minor_id;
+static id_space_t *lofi_id;		/* lofi ID values */
 static list_t lofi_list;
 static zone_key_t lofi_zone_key;
 
@@ -204,6 +226,17 @@ lofi_compress_info_t lofi_compress_table[LOFI_COMPRESS_FUNCTIONS] = {
 	{lzma_decompress,	NULL,	0,	"lzma"}
 };
 
+static void lofi_strategy_task(void *);
+static int lofi_tg_rdwr(dev_info_t *, uchar_t, void *, diskaddr_t,
+    size_t, void *);
+static int lofi_tg_getinfo(dev_info_t *, int, void *, void *);
+
+struct cmlb_tg_ops lofi_tg_ops = {
+	TG_DK_OPS_VERSION_1,
+	lofi_tg_rdwr,
+	lofi_tg_getinfo
+};
+
 /*ARGSUSED*/
 static void
 *SzAlloc(void *p, size_t size)
@@ -240,47 +273,24 @@ lofi_free_comp_cache(struct lofi_state *lsp)
 static int
 is_opened(struct lofi_state *lsp)
 {
-	ASSERT(MUTEX_HELD(&lofi_lock));
-	return (lsp->ls_chr_open || lsp->ls_blk_open || lsp->ls_lyr_open_count);
-}
+	int i;
+	boolean_t last = B_TRUE;
 
-static int
-mark_opened(struct lofi_state *lsp, int otyp)
-{
 	ASSERT(MUTEX_HELD(&lofi_lock));
-	switch (otyp) {
-	case OTYP_CHR:
-		lsp->ls_chr_open = 1;
-		break;
-	case OTYP_BLK:
-		lsp->ls_blk_open = 1;
-		break;
-	case OTYP_LYR:
-		lsp->ls_lyr_open_count++;
-		break;
-	default:
-		return (-1);
+	for (i = 0; i < LOFI_PART_MAX; i++) {
+		if (lsp->ls_open_lyr[i]) {
+			last = B_FALSE;
+			break;
+		}
 	}
-	return (0);
-}
 
-static void
-mark_closed(struct lofi_state *lsp, int otyp)
-{
-	ASSERT(MUTEX_HELD(&lofi_lock));
-	switch (otyp) {
-	case OTYP_CHR:
-		lsp->ls_chr_open = 0;
-		break;
-	case OTYP_BLK:
-		lsp->ls_blk_open = 0;
-		break;
-	case OTYP_LYR:
-		lsp->ls_lyr_open_count--;
-		break;
-	default:
-		break;
+	for (i = 0; last && (i < OTYP_LYR); i++) {
+		if (lsp->ls_open_reg[i]) {
+			last = B_FALSE;
+		}
 	}
+
+	return (!last);
 }
 
 static void
@@ -320,10 +330,171 @@ lofi_free_crypto(struct lofi_state *lsp)
 	}
 }
 
+/* ARGSUSED */
+static int
+lofi_tg_rdwr(dev_info_t *dip, uchar_t cmd, void *bufaddr, diskaddr_t start,
+    size_t length, void *tg_cookie)
+{
+	struct lofi_state *lsp;
+	buf_t	*bp;
+	int	instance;
+	int	rv = 0;
+
+	instance = ddi_get_instance(dip);
+	if (instance == 0)	/* control node does not have disk */
+		return (ENXIO);
+
+	lsp = ddi_get_soft_state(lofi_statep, instance);
+
+	if (lsp == NULL)
+		return (ENXIO);
+
+	if (cmd != TG_READ && cmd != TG_WRITE)
+		return (EINVAL);
+
+	/*
+	 * Make sure the mapping is set up by checking lsp->ls_vp_ready.
+	 */
+	mutex_enter(&lsp->ls_vp_lock);
+	while (lsp->ls_vp_ready == B_FALSE)
+		cv_wait(&lsp->ls_vp_cv, &lsp->ls_vp_lock);
+	mutex_exit(&lsp->ls_vp_lock);
+
+	if (P2PHASE(length, (1U << lsp->ls_lbshift)) != 0) {
+		/* We can only transfer whole blocks at a time! */
+		return (EINVAL);
+	}
+
+	bp = getrbuf(KM_SLEEP);
+
+	if (cmd == TG_READ) {
+		bp->b_flags = B_READ;
+	} else {
+		if (lsp->ls_readonly == B_TRUE) {
+			freerbuf(bp);
+			return (EROFS);
+		}
+		bp->b_flags = B_WRITE;
+	}
+
+	bp->b_un.b_addr = bufaddr;
+	bp->b_bcount = length;
+	bp->b_lblkno = start;
+	bp->b_private = NULL;
+	bp->b_edev = lsp->ls_dev;
+
+	if (lsp->ls_kstat) {
+		mutex_enter(lsp->ls_kstat->ks_lock);
+		kstat_waitq_enter(KSTAT_IO_PTR(lsp->ls_kstat));
+		mutex_exit(lsp->ls_kstat->ks_lock);
+	}
+	(void) taskq_dispatch(lsp->ls_taskq, lofi_strategy_task, bp, KM_SLEEP);
+	(void) biowait(bp);
+
+	rv = geterror(bp);
+	freerbuf(bp);
+	return (rv);
+}
+
+/*
+ * Get device geometry info for cmlb.
+ *
+ * We have mapped disk image as virtual block device and have to report
+ * physical/virtual geometry to cmlb.
+ *
+ * So we have two principal cases:
+ * 1. Uninitialised image without any existing labels,
+ *    for this case we fabricate the data based on mapped image.
+ * 2. Image with existing label information.
+ *    Since we have no information how the image was created (it may be
+ *    dump from some physical device), we need to rely on label information
+ *    from image, or we get "corrupted label" errors.
+ *    NOTE: label can be MBR, MBR+SMI, GPT
+ */
+static int
+lofi_tg_getinfo(dev_info_t *dip, int cmd, void *arg, void *tg_cookie)
+{
+	struct lofi_state *lsp;
+	int instance;
+	int ashift;
+
+	_NOTE(ARGUNUSED(tg_cookie));
+	instance = ddi_get_instance(dip);
+	if (instance == 0)		/* control device has no storage */
+		return (ENXIO);
+
+	lsp = ddi_get_soft_state(lofi_statep, instance);
+
+	if (lsp == NULL)
+		return (ENXIO);
+
+	/*
+	 * Make sure the mapping is set up by checking lsp->ls_vp_ready.
+	 *
+	 * When mapping is created, new lofi instance is created and
+	 * lofi_attach() will call cmlb_attach() as part of the procedure
+	 * to set the mapping up. This chain of events will happen in
+	 * the same thread.
+	 * Since cmlb_attach() will call lofi_tg_getinfo to get
+	 * capacity, we return error on that call if cookie is set,
+	 * otherwise lofi_attach will be stuck as the mapping is not yet
+	 * finalized and lofi is not yet ready.
+	 * Note, such error is not fatal for cmlb, as the label setup
+	 * will be finalized when cmlb_validate() is called.
+	 */
+	mutex_enter(&lsp->ls_vp_lock);
+	if (tg_cookie != NULL && lsp->ls_vp_ready == B_FALSE) {
+		mutex_exit(&lsp->ls_vp_lock);
+		return (ENXIO);
+	}
+	while (lsp->ls_vp_ready == B_FALSE)
+		cv_wait(&lsp->ls_vp_cv, &lsp->ls_vp_lock);
+	mutex_exit(&lsp->ls_vp_lock);
+
+	ashift = lsp->ls_lbshift;
+
+	switch (cmd) {
+	case TG_GETPHYGEOM: {
+		cmlb_geom_t *geomp = arg;
+
+		geomp->g_capacity	=
+		    (lsp->ls_vp_size - lsp->ls_crypto_offset) >> ashift;
+		geomp->g_nsect		= lsp->ls_dkg.dkg_nsect;
+		geomp->g_nhead		= lsp->ls_dkg.dkg_nhead;
+		geomp->g_acyl		= lsp->ls_dkg.dkg_acyl;
+		geomp->g_ncyl		= lsp->ls_dkg.dkg_ncyl;
+		geomp->g_secsize	= (1U << ashift);
+		geomp->g_intrlv		= lsp->ls_dkg.dkg_intrlv;
+		geomp->g_rpm		= lsp->ls_dkg.dkg_rpm;
+		return (0);
+	}
+
+	case TG_GETCAPACITY:
+		*(diskaddr_t *)arg =
+		    (lsp->ls_vp_size - lsp->ls_crypto_offset) >> ashift;
+		return (0);
+
+	case TG_GETBLOCKSIZE:
+		*(uint32_t *)arg = (1U << ashift);
+		return (0);
+
+	case TG_GETATTR: {
+		tg_attribute_t *tgattr = arg;
+
+		tgattr->media_is_writable = !lsp->ls_readonly;
+		tgattr->media_is_solid_state = B_FALSE;
+		return (0);
+	}
+
+	default:
+		return (EINVAL);
+	}
+}
+
 static void
 lofi_destroy(struct lofi_state *lsp, cred_t *credp)
 {
-	minor_t minor = getminor(lsp->ls_dev);
+	int id = LOFI_MINOR2ID(getminor(lsp->ls_dev));
 	int i;
 
 	ASSERT(MUTEX_HELD(&lofi_lock));
@@ -345,13 +516,17 @@ lofi_destroy(struct lofi_state *lsp, cred_t *credp)
 		    sizeof (struct compbuf) * lofi_taskq_nthreads);
 	}
 
-	(void) VOP_CLOSE(lsp->ls_vp, lsp->ls_openflag,
-	    1, 0, credp, NULL);
-	VN_RELE(lsp->ls_vp);
+	if (lsp->ls_vp != NULL) {
+		(void) VOP_PUTPAGE(lsp->ls_vp, 0, 0, B_INVAL, credp, NULL);
+		(void) VOP_CLOSE(lsp->ls_vp, lsp->ls_openflag,
+		    1, 0, credp, NULL);
+		VN_RELE(lsp->ls_vp);
+	}
 	if (lsp->ls_stacked_vp != lsp->ls_vp)
 		VN_RELE(lsp->ls_stacked_vp);
 
-	taskq_destroy(lsp->ls_taskq);
+	if (lsp->ls_taskq != NULL)
+		taskq_destroy(lsp->ls_taskq);
 
 	if (lsp->ls_kstat != NULL)
 		kstat_delete(lsp->ls_kstat);
@@ -374,28 +549,27 @@ lofi_destroy(struct lofi_state *lsp, cred_t *credp)
 	mutex_destroy(&lsp->ls_comp_bufs_lock);
 	mutex_destroy(&lsp->ls_kstat_lock);
 	mutex_destroy(&lsp->ls_vp_lock);
+	cv_destroy(&lsp->ls_vp_cv);
+	lsp->ls_vp_ready = B_FALSE;
 
-	ASSERT(ddi_get_soft_state(lofi_statep, minor) == lsp);
-	ddi_soft_state_free(lofi_statep, minor);
-	id_free(lofi_minor_id, minor);
+	ASSERT(ddi_get_soft_state(lofi_statep, id) == lsp);
+	(void) ndi_devi_offline(lsp->ls_dip, NDI_DEVI_REMOVE);
+	id_free(lofi_id, id);
 }
 
 static void
-lofi_free_dev(dev_t dev)
+lofi_free_dev(struct lofi_state *lsp)
 {
-	minor_t minor = getminor(dev);
-	char namebuf[50];
-
 	ASSERT(MUTEX_HELD(&lofi_lock));
 
-	(void) ddi_prop_remove(dev, lofi_dip, ZONE_PROP_NAME);
-	(void) ddi_prop_remove(dev, lofi_dip, SIZE_PROP_NAME);
-	(void) ddi_prop_remove(dev, lofi_dip, NBLOCKS_PROP_NAME);
-
-	(void) snprintf(namebuf, sizeof (namebuf), "%d", minor);
-	ddi_remove_minor_node(lofi_dip, namebuf);
-	(void) snprintf(namebuf, sizeof (namebuf), "%d,raw", minor);
-	ddi_remove_minor_node(lofi_dip, namebuf);
+	if (lsp->ls_cmlbhandle != NULL) {
+		cmlb_invalidate(lsp->ls_cmlbhandle, 0);
+		cmlb_detach(lsp->ls_cmlbhandle, 0);
+		cmlb_free_handle(&lsp->ls_cmlbhandle);
+		lsp->ls_cmlbhandle = NULL;
+	}
+	(void) ddi_prop_remove_all(lsp->ls_dip);
+	ddi_remove_minor_node(lsp->ls_dip, NULL);
 }
 
 /*ARGSUSED*/
@@ -424,7 +598,7 @@ lofi_zone_shutdown(zoneid_t zoneid, void *arg)
 		if (is_opened(lsp)) {
 			lsp->ls_cleanup = 1;
 		} else {
-			lofi_free_dev(lsp->ls_dev);
+			lofi_free_dev(lsp);
 			lofi_destroy(lsp, kcred);
 		}
 	}
@@ -436,9 +610,20 @@ lofi_zone_shutdown(zoneid_t zoneid, void *arg)
 static int
 lofi_open(dev_t *devp, int flag, int otyp, struct cred *credp)
 {
-	minor_t	minor;
+	int id;
+	minor_t	part;
+	uint64_t mask;
+	diskaddr_t nblks;
+	diskaddr_t lba;
+	boolean_t ndelay;
+
 	struct lofi_state *lsp;
 
+	if (otyp >= OTYPCNT)
+		return (EINVAL);
+
+	ndelay = (flag & (FNDELAY | FNONBLOCK)) ? B_TRUE : B_FALSE;
+
 	/*
 	 * lofiadm -a /dev/lofi/1 gets us here.
 	 */
@@ -447,16 +632,18 @@ lofi_open(dev_t *devp, int flag, int otyp, struct cred *credp)
 
 	mutex_enter(&lofi_lock);
 
-	minor = getminor(*devp);
+	id = LOFI_MINOR2ID(getminor(*devp));
+	part = LOFI_PART(getminor(*devp));
+	mask = (1U << part);
 
 	/* master control device */
-	if (minor == 0) {
+	if (id == 0) {
 		mutex_exit(&lofi_lock);
 		return (0);
 	}
 
 	/* otherwise, the mapping should already exist */
-	lsp = ddi_get_soft_state(lofi_statep, minor);
+	lsp = ddi_get_soft_state(lofi_statep, id);
 	if (lsp == NULL) {
 		mutex_exit(&lofi_lock);
 		return (EINVAL);
@@ -472,9 +659,53 @@ lofi_open(dev_t *devp, int flag, int otyp, struct cred *credp)
 		return (EROFS);
 	}
 
-	if (mark_opened(lsp, otyp) == -1) {
+	if ((lsp->ls_open_excl) & (mask)) {
 		mutex_exit(&lofi_lock);
-		return (EINVAL);
+		return (EBUSY);
+	}
+
+	if (flag & FEXCL) {
+		if (lsp->ls_open_lyr[part]) {
+			mutex_exit(&lofi_lock);
+			return (EBUSY);
+		}
+		for (int i = 0; i < OTYP_LYR; i++) {
+			if (lsp->ls_open_reg[i] & mask) {
+				mutex_exit(&lofi_lock);
+				return (EBUSY);
+			}
+		}
+	}
+
+	if (lsp->ls_cmlbhandle != NULL) {
+		if (cmlb_validate(lsp->ls_cmlbhandle, 0, 0) != 0) {
+			/*
+			 * non-blocking opens are allowed to succeed to
+			 * support format and fdisk to create partitioning.
+			 */
+			if (!ndelay) {
+				mutex_exit(&lofi_lock);
+				return (ENXIO);
+			}
+		} else if (cmlb_partinfo(lsp->ls_cmlbhandle, part, &nblks, &lba,
+		    NULL, NULL, 0) == 0) {
+			if ((!nblks) && ((!ndelay) || (otyp != OTYP_CHR))) {
+				mutex_exit(&lofi_lock);
+				return (ENXIO);
+			}
+		} else if (!ndelay) {
+			mutex_exit(&lofi_lock);
+			return (ENXIO);
+		}
+	}
+
+	if (otyp == OTYP_LYR) {
+		lsp->ls_open_lyr[part]++;
+	} else {
+		lsp->ls_open_reg[otyp] |= mask;
+	}
+	if (flag & FEXCL) {
+		lsp->ls_open_excl |= mask;
 	}
 
 	mutex_exit(&lofi_lock);
@@ -485,23 +716,35 @@ lofi_open(dev_t *devp, int flag, int otyp, struct cred *credp)
 static int
 lofi_close(dev_t dev, int flag, int otyp, struct cred *credp)
 {
-	minor_t	minor;
+	minor_t	part;
+	int id;
+	uint64_t mask;
 	struct lofi_state *lsp;
 
+	id = LOFI_MINOR2ID(getminor(dev));
+	part = LOFI_PART(getminor(dev));
+	mask = (1U << part);
+
 	mutex_enter(&lofi_lock);
-	minor = getminor(dev);
-	lsp = ddi_get_soft_state(lofi_statep, minor);
+	lsp = ddi_get_soft_state(lofi_statep, id);
 	if (lsp == NULL) {
 		mutex_exit(&lofi_lock);
 		return (EINVAL);
 	}
 
-	if (minor == 0) {
+	if (id == 0) {
 		mutex_exit(&lofi_lock);
 		return (0);
 	}
 
-	mark_closed(lsp, otyp);
+	if (lsp->ls_open_excl & mask)
+		lsp->ls_open_excl &= ~mask;
+
+	if (otyp == OTYP_LYR) {
+		lsp->ls_open_lyr[part]--;
+	} else {
+		lsp->ls_open_reg[otyp] &= ~mask;
+	}
 
 	/*
 	 * If we forcibly closed the underlying device (li_force), or
@@ -509,7 +752,7 @@ lofi_close(dev_t dev, int flag, int otyp, struct cred *credp)
 	 * out of the door.
 	 */
 	if (!is_opened(lsp) && (lsp->ls_cleanup || lsp->ls_vp == NULL)) {
-		lofi_free_dev(lsp->ls_dev);
+		lofi_free_dev(lsp);
 		lofi_destroy(lsp, credp);
 	}
 
@@ -970,7 +1213,7 @@ gzip_decompress(void *src, size_t srclen, void *dst,
 /*ARGSUSED*/
 static int
 lzma_decompress(void *src, size_t srclen, void *dst,
-	size_t *dstlen, int level)
+    size_t *dstlen, int level)
 {
 	size_t insizepure;
 	void *actual_src;
@@ -1005,7 +1248,9 @@ lofi_strategy_task(void *arg)
 	size_t	xfersize;
 	boolean_t bufinited = B_FALSE;
 
-	lsp = ddi_get_soft_state(lofi_statep, getminor(bp->b_edev));
+	lsp = ddi_get_soft_state(lofi_statep,
+	    LOFI_MINOR2ID(getminor(bp->b_edev)));
+
 	if (lsp == NULL) {
 		error = ENXIO;
 		goto errout;
@@ -1015,9 +1260,15 @@ lofi_strategy_task(void *arg)
 		kstat_waitq_to_runq(KSTAT_IO_PTR(lsp->ls_kstat));
 		mutex_exit(lsp->ls_kstat->ks_lock);
 	}
+
+	mutex_enter(&lsp->ls_vp_lock);
+	lsp->ls_vp_iocount++;
+	mutex_exit(&lsp->ls_vp_lock);
+
 	bp_mapin(bp);
 	bufaddr = bp->b_un.b_addr;
-	offset = bp->b_lblkno * DEV_BSIZE;	/* offset within file */
+	offset = (bp->b_lblkno + (diskaddr_t)(uintptr_t)bp->b_private)
+	    << lsp->ls_lbshift;	/* offset within file */
 	if (lsp->ls_crypto_enabled) {
 		/* encrypted data really begins after crypto header */
 		offset += lsp->ls_crypto_offset;
@@ -1345,6 +1596,10 @@ lofi_strategy(struct buf *bp)
 {
 	struct lofi_state *lsp;
 	offset_t	offset;
+	minor_t		part;
+	diskaddr_t	p_lba;
+	diskaddr_t	p_nblks;
+	int		shift;
 
 	/*
 	 * We cannot just do I/O here, because the current thread
@@ -1357,12 +1612,38 @@ lofi_strategy(struct buf *bp)
 	 * do the I/O asynchronously, or we could use task queues. task
 	 * queues were incredibly easy so they win.
 	 */
-	lsp = ddi_get_soft_state(lofi_statep, getminor(bp->b_edev));
+
+	lsp = ddi_get_soft_state(lofi_statep,
+	    LOFI_MINOR2ID(getminor(bp->b_edev)));
+	part = LOFI_PART(getminor(bp->b_edev));
+
 	if (lsp == NULL) {
 		bioerror(bp, ENXIO);
 		biodone(bp);
 		return (0);
 	}
+	shift = lsp->ls_lbshift;
+
+	p_lba = 0;
+	p_nblks = lsp->ls_vp_size >> shift;
+
+	if (lsp->ls_cmlbhandle != NULL) {
+		if (cmlb_partinfo(lsp->ls_cmlbhandle, part, &p_nblks, &p_lba,
+		    NULL, NULL, 0)) {
+			bioerror(bp, ENXIO);
+			biodone(bp);
+			return (0);
+		}
+	}
+
+	/* start block past partition end? */
+	if (bp->b_lblkno > p_nblks) {
+		bioerror(bp, ENXIO);
+		biodone(bp);
+		return (0);
+	}
+
+	offset = (bp->b_lblkno+p_lba) << shift;	/* offset within file */
 
 	mutex_enter(&lsp->ls_vp_lock);
 	if (lsp->ls_vp == NULL || lsp->ls_vp_closereq) {
@@ -1372,12 +1653,14 @@ lofi_strategy(struct buf *bp)
 		return (0);
 	}
 
-	offset = bp->b_lblkno * DEV_BSIZE;	/* offset within file */
 	if (lsp->ls_crypto_enabled) {
 		/* encrypted data really begins after crypto header */
 		offset += lsp->ls_crypto_offset;
 	}
-	if (offset == lsp->ls_vp_size) {
+
+	/* make sure we will not pass the file or partition size */
+	if (offset == lsp->ls_vp_size ||
+	    offset == (((p_lba + p_nblks) << shift) + lsp->ls_crypto_offset)) {
 		/* EOF */
 		if ((bp->b_flags & B_READ) != 0) {
 			bp->b_resid = bp->b_bcount;
@@ -1390,13 +1673,15 @@ lofi_strategy(struct buf *bp)
 		mutex_exit(&lsp->ls_vp_lock);
 		return (0);
 	}
-	if (offset > lsp->ls_vp_size) {
+	if ((offset > lsp->ls_vp_size) ||
+	    (offset > (((p_lba + p_nblks) << shift) + lsp->ls_crypto_offset)) ||
+	    ((offset + bp->b_bcount) > ((p_lba + p_nblks) << shift))) {
 		bioerror(bp, ENXIO);
 		biodone(bp);
 		mutex_exit(&lsp->ls_vp_lock);
 		return (0);
 	}
-	lsp->ls_vp_iocount++;
+
 	mutex_exit(&lsp->ls_vp_lock);
 
 	if (lsp->ls_kstat) {
@@ -1404,6 +1689,7 @@ lofi_strategy(struct buf *bp)
 		kstat_waitq_enter(KSTAT_IO_PTR(lsp->ls_kstat));
 		mutex_exit(lsp->ls_kstat->ks_lock);
 	}
+	bp->b_private = (void *)(uintptr_t)p_lba;	/* partition start */
 	(void) taskq_dispatch(lsp->ls_taskq, lofi_strategy_task, bp, KM_SLEEP);
 	return (0);
 }
@@ -1452,54 +1738,269 @@ lofi_awrite(dev_t dev, struct aio_req *aio, struct cred *credp)
 static int
 lofi_info(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg, void **result)
 {
+	struct lofi_state *lsp;
+	dev_t	dev = (dev_t)arg;
+	int instance;
+
+	instance = LOFI_MINOR2ID(getminor(dev));
 	switch (infocmd) {
 	case DDI_INFO_DEVT2DEVINFO:
-		*result = lofi_dip;
+		lsp = ddi_get_soft_state(lofi_statep, instance);
+		if (lsp == NULL)
+			return (DDI_FAILURE);
+		*result = lsp->ls_dip;
 		return (DDI_SUCCESS);
 	case DDI_INFO_DEVT2INSTANCE:
-		*result = 0;
+		*result = (void *) (intptr_t)instance;
 		return (DDI_SUCCESS);
 	}
 	return (DDI_FAILURE);
 }
 
 static int
-lofi_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
+lofi_create_minor_nodes(struct lofi_state *lsp, boolean_t labeled)
 {
-	int	error;
+	int error = 0;
+	int instance = ddi_get_instance(lsp->ls_dip);
+
+	if (labeled == B_TRUE) {
+		cmlb_alloc_handle(&lsp->ls_cmlbhandle);
+		error = cmlb_attach(lsp->ls_dip, &lofi_tg_ops, DTYPE_DIRECT,
+		    B_FALSE, B_FALSE, DDI_NT_BLOCK_CHAN,
+		    CMLB_CREATE_P0_MINOR_NODE, lsp->ls_cmlbhandle, (void *)1);
+
+		if (error != DDI_SUCCESS) {
+			cmlb_free_handle(&lsp->ls_cmlbhandle);
+			lsp->ls_cmlbhandle = NULL;
+			error = ENXIO;
+		}
+	} else {
+		/* create minor nodes */
+		error = ddi_create_minor_node(lsp->ls_dip, LOFI_BLOCK_NODE,
+		    S_IFBLK, LOFI_ID2MINOR(instance), DDI_PSEUDO, 0);
+		if (error == DDI_SUCCESS) {
+			error = ddi_create_minor_node(lsp->ls_dip,
+			    LOFI_CHAR_NODE, S_IFCHR, LOFI_ID2MINOR(instance),
+			    DDI_PSEUDO, 0);
+			if (error != DDI_SUCCESS) {
+				ddi_remove_minor_node(lsp->ls_dip,
+				    LOFI_BLOCK_NODE);
+				error = ENXIO;
+			}
+		} else
+			error = ENXIO;
+	}
+	return (error);
+}
 
-	if (cmd != DDI_ATTACH)
-		return (DDI_FAILURE);
+static int
+lofi_zone_bind(struct lofi_state *lsp)
+{
+	int error = 0;
 
-	lofi_minor_id = id_space_create("lofi_minor_id", 1, L_MAXMIN32 + 1);
+	mutex_enter(&curproc->p_lock);
+	if ((error = rctl_incr_lofi(curproc, curproc->p_zone, 1)) != 0) {
+		mutex_exit(&curproc->p_lock);
+		return (error);
+	}
+	mutex_exit(&curproc->p_lock);
 
-	if (!lofi_minor_id)
-		return (DDI_FAILURE);
+	if (ddi_prop_update_string(lsp->ls_dev, lsp->ls_dip, ZONE_PROP_NAME,
+	    (char *)curproc->p_zone->zone_name) != DDI_PROP_SUCCESS) {
+		rctl_decr_lofi(curproc->p_zone, 1);
+		error = EINVAL;
+	} else {
+		zone_init_ref(&lsp->ls_zone);
+		zone_hold_ref(curzone, &lsp->ls_zone, ZONE_REF_LOFI);
+	}
+	return (error);
+}
 
-	error = ddi_soft_state_zalloc(lofi_statep, 0);
+static void
+lofi_zone_unbind(struct lofi_state *lsp)
+{
+	(void) ddi_prop_remove(DDI_DEV_T_NONE, lsp->ls_dip, ZONE_PROP_NAME);
+	rctl_decr_lofi(curproc->p_zone, 1);
+	zone_rele_ref(&lsp->ls_zone, ZONE_REF_LOFI);
+}
+
+static int
+lofi_online_dev(dev_info_t *dip)
+{
+	boolean_t labeled;
+	int	error;
+	int	instance = ddi_get_instance(dip);
+	struct lofi_state *lsp;
+
+	labeled = B_FALSE;
+	if (ddi_prop_exists(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS, "labeled"))
+		labeled = B_TRUE;
+
+	/* lsp alloc+init, soft state is freed in lofi_detach */
+	error = ddi_soft_state_zalloc(lofi_statep, instance);
 	if (error == DDI_FAILURE) {
-		id_space_destroy(lofi_minor_id);
-		return (DDI_FAILURE);
+		return (ENOMEM);
 	}
-	error = ddi_create_minor_node(dip, LOFI_CTL_NODE, S_IFCHR, 0,
-	    DDI_PSEUDO, NULL);
-	if (error == DDI_FAILURE) {
-		ddi_soft_state_free(lofi_statep, 0);
-		id_space_destroy(lofi_minor_id);
-		return (DDI_FAILURE);
+
+	lsp = ddi_get_soft_state(lofi_statep, instance);
+	lsp->ls_dip = dip;
+
+	if ((error = lofi_zone_bind(lsp)) != 0)
+		goto err;
+
+	cv_init(&lsp->ls_vp_cv, NULL, CV_DRIVER, NULL);
+	mutex_init(&lsp->ls_comp_cache_lock, NULL, MUTEX_DRIVER, NULL);
+	mutex_init(&lsp->ls_comp_bufs_lock, NULL, MUTEX_DRIVER, NULL);
+	mutex_init(&lsp->ls_kstat_lock, NULL, MUTEX_DRIVER, NULL);
+	mutex_init(&lsp->ls_vp_lock, NULL, MUTEX_DRIVER, NULL);
+
+	if ((error = lofi_create_minor_nodes(lsp, labeled)) != 0) {
+		lofi_zone_unbind(lsp);
+		goto lerr;
 	}
+
 	/* driver handles kernel-issued IOCTLs */
 	if (ddi_prop_create(DDI_DEV_T_NONE, dip, DDI_PROP_CANSLEEP,
 	    DDI_KERNEL_IOCTL, NULL, 0) != DDI_PROP_SUCCESS) {
-		ddi_remove_minor_node(dip, NULL);
-		ddi_soft_state_free(lofi_statep, 0);
-		id_space_destroy(lofi_minor_id);
-		return (DDI_FAILURE);
+		error = DDI_FAILURE;
+		goto merr;
+	}
+
+	lsp->ls_kstat = kstat_create_zone(LOFI_DRIVER_NAME, instance,
+	    NULL, "disk", KSTAT_TYPE_IO, 1, 0, getzoneid());
+	if (lsp->ls_kstat == NULL) {
+		(void) ddi_prop_remove(DDI_DEV_T_NONE, lsp->ls_dip,
+		    DDI_KERNEL_IOCTL);
+		error = ENOMEM;
+		goto merr;
+	}
+
+	lsp->ls_kstat->ks_lock = &lsp->ls_kstat_lock;
+	kstat_zone_add(lsp->ls_kstat, GLOBAL_ZONEID);
+	kstat_install(lsp->ls_kstat);
+	return (DDI_SUCCESS);
+merr:
+	if (lsp->ls_cmlbhandle != NULL) {
+		cmlb_detach(lsp->ls_cmlbhandle, 0);
+		cmlb_free_handle(&lsp->ls_cmlbhandle);
+	}
+	ddi_remove_minor_node(dip, NULL);
+	lofi_zone_unbind(lsp);
+lerr:
+	mutex_destroy(&lsp->ls_comp_cache_lock);
+	mutex_destroy(&lsp->ls_comp_bufs_lock);
+	mutex_destroy(&lsp->ls_kstat_lock);
+	mutex_destroy(&lsp->ls_vp_lock);
+	cv_destroy(&lsp->ls_vp_cv);
+err:
+	ddi_soft_state_free(lofi_statep, instance);
+	return (error);
+}
+
+/*ARGSUSED*/
+static int
+lofi_dev_callback(sysevent_t *ev, void *cookie)
+{
+	nvlist_t *nvlist;
+	char *class, *driver;
+	char name[10];
+	int32_t instance;
+
+	class = sysevent_get_class_name(ev);
+	if (strcmp(class, EC_DEV_ADD) && strcmp(class, EC_DEV_REMOVE))
+		return (0);
+
+	(void) sysevent_get_attr_list(ev, &nvlist);
+	driver = fnvlist_lookup_string(nvlist, DEV_DRIVER_NAME);
+	instance = fnvlist_lookup_int32(nvlist, DEV_INSTANCE);
+
+	if (strcmp(driver, LOFI_DRIVER_NAME) != 0) {
+		fnvlist_free(nvlist);
+		return (0);
 	}
 
-	zone_key_create(&lofi_zone_key, NULL, lofi_zone_shutdown, NULL);
+	/*
+	 * insert or remove device info, then announce the change
+	 * via cv_broadcast.
+	 * This allows the MAP/UNMAP to monitor device change.
+	 */
+	(void) snprintf(name, sizeof (name), "%d", instance);
+	if (strcmp(class, EC_DEV_ADD) == 0) {
+		mutex_enter(&lofi_chan_lock);
+		fnvlist_add_nvlist(lofi_devlink_cache, name, nvlist);
+		cv_broadcast(&lofi_chan_cv);
+		mutex_exit(&lofi_chan_lock);
+	} else if (strcmp(class, EC_DEV_REMOVE) == 0) {
+		mutex_enter(&lofi_chan_lock);
+		/* Can not use fnvlist_remove() as we can get ENOENT. */
+		(void) nvlist_remove_all(lofi_devlink_cache, name);
+		cv_broadcast(&lofi_chan_cv);
+		mutex_exit(&lofi_chan_lock);
+	}
+
+	fnvlist_free(nvlist);
+	return (0);
+}
+
+static int
+lofi_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
+{
+	int	rv;
+	int	instance = ddi_get_instance(dip);
+	struct lofi_state *lsp;
+
+	if (cmd != DDI_ATTACH)
+		return (DDI_FAILURE);
+
+	/*
+	 * Instance 0 is control instance, attaching control instance
+	 * will set the lofi up and ready.
+	 */
+	if (instance == 0) {
+		rv = ddi_soft_state_zalloc(lofi_statep, 0);
+		if (rv == DDI_FAILURE) {
+			return (DDI_FAILURE);
+		}
+		lsp = ddi_get_soft_state(lofi_statep, instance);
+		rv = ddi_create_minor_node(dip, LOFI_CTL_NODE, S_IFCHR, 0,
+		    DDI_PSEUDO, 0);
+		if (rv == DDI_FAILURE) {
+			ddi_soft_state_free(lofi_statep, 0);
+			return (DDI_FAILURE);
+		}
+		/* driver handles kernel-issued IOCTLs */
+		if (ddi_prop_create(DDI_DEV_T_NONE, dip, DDI_PROP_CANSLEEP,
+		    DDI_KERNEL_IOCTL, NULL, 0) != DDI_PROP_SUCCESS) {
+			ddi_remove_minor_node(dip, NULL);
+			ddi_soft_state_free(lofi_statep, 0);
+			return (DDI_FAILURE);
+		}
+
+		rv = sysevent_evc_bind(DEVFS_CHANNEL, &lofi_chan,
+		    EVCH_CREAT | EVCH_HOLD_PEND);
+		if (rv == 0) {
+			rv = sysevent_evc_subscribe(lofi_chan, "lofi",
+			    EC_ALL, lofi_dev_callback, NULL, 0);
+			rv |= sysevent_evc_subscribe(lofi_chan, "disk",
+			    EC_ALL, lofi_dev_callback, NULL, 0);
+		} else
+			lofi_chan = NULL;
+		if (rv != 0) {
+			if (lofi_chan != NULL)
+				(void) sysevent_evc_unbind(lofi_chan);
+			ddi_prop_remove_all(dip);
+			ddi_remove_minor_node(dip, NULL);
+			ddi_soft_state_free(lofi_statep, 0);
+			return (DDI_FAILURE);
+		}
+		zone_key_create(&lofi_zone_key, NULL, lofi_zone_shutdown, NULL);
+
+		lsp->ls_dip = dip;
+	} else {
+		if (lofi_online_dev(dip) == DDI_FAILURE)
+			return (DDI_FAILURE);
+	}
 
-	lofi_dip = dip;
 	ddi_report_dev(dip);
 	return (DDI_SUCCESS);
 }
@@ -1507,9 +2008,25 @@ lofi_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 static int
 lofi_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 {
+	struct lofi_state *lsp;
+	int instance = ddi_get_instance(dip);
+
 	if (cmd != DDI_DETACH)
 		return (DDI_FAILURE);
 
+	/*
+	 * If the instance is not 0, release state.
+	 * The instance 0 is control device, we can not detach it
+	 * before other instances are detached.
+	 */
+	if (instance != 0) {
+		lsp = ddi_get_soft_state(lofi_statep, instance);
+		if (lsp != NULL && lsp->ls_vp_ready == B_FALSE) {
+			ddi_soft_state_free(lofi_statep, instance);
+			return (DDI_SUCCESS);
+		} else
+			return (DDI_FAILURE);
+	}
 	mutex_enter(&lofi_lock);
 
 	if (!list_is_empty(&lofi_list)) {
@@ -1517,26 +2034,24 @@ lofi_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 		return (DDI_FAILURE);
 	}
 
-	lofi_dip = NULL;
 	ddi_remove_minor_node(dip, NULL);
 	ddi_prop_remove_all(dip);
 
 	mutex_exit(&lofi_lock);
 
+	(void) sysevent_evc_unbind(lofi_chan);
 	if (zone_key_delete(lofi_zone_key) != 0)
 		cmn_err(CE_WARN, "failed to delete zone key");
 
 	ddi_soft_state_free(lofi_statep, 0);
 
-	id_space_destroy(lofi_minor_id);
-
 	return (DDI_SUCCESS);
 }
 
 /*
- * With addition of encryption, be careful that encryption key is wiped before
- * kernel memory structures are freed, and also that key is not accidentally
- * passed out into userland structures.
+ * With the addition of encryption, we must be careful that encryption key is
+ * wiped before kernel's data structures are freed so it cannot accidentally
+ * slip out to userland through uninitialized data elsewhere.
  */
 static void
 free_lofi_ioctl(struct lofi_ioctl *klip)
@@ -1547,7 +2062,7 @@ free_lofi_ioctl(struct lofi_ioctl *klip)
 }
 
 /*
- * These two just simplify the rest of the ioctls that need to copyin/out
+ * These two functions simplify the rest of the ioctls that need to copyin/out
  * the lofi_ioctl structure.
  */
 int
@@ -1564,11 +2079,12 @@ copy_in_lofi_ioctl(const struct lofi_ioctl *ulip, struct lofi_ioctl **klipp,
 
 	/* ensure NULL termination */
 	klip->li_filename[MAXPATHLEN-1] = '\0';
+	klip->li_devpath[MAXPATHLEN-1] = '\0';
 	klip->li_algorithm[MAXALGLEN-1] = '\0';
 	klip->li_cipher[CRYPTO_MAX_MECH_NAME-1] = '\0';
 	klip->li_iv_cipher[CRYPTO_MAX_MECH_NAME-1] = '\0';
 
-	if (klip->li_minor > L_MAXMIN32) {
+	if (klip->li_id > L_MAXMIN32) {
 		error = EINVAL;
 		goto err;
 	}
@@ -1582,7 +2098,7 @@ err:
 
 int
 copy_out_lofi_ioctl(const struct lofi_ioctl *klip, struct lofi_ioctl *ulip,
-	int flag)
+    int flag)
 {
 	int	error;
 
@@ -1698,12 +2214,9 @@ file_to_lofi(char *filename, boolean_t readonly, struct lofi_state **lspp)
 }
 
 /*
- * Fakes up a disk geometry, and one big partition, based on the size
- * of the file. This is needed because we allow newfs'ing the device,
- * and newfs will do several disk ioctls to figure out the geometry and
- * partition information. It uses that information to determine the parameters
- * to pass to mkfs. Geometry is pretty much irrelevant these days, but we
- * have to support it.
+ * Fakes up a disk geometry based on the size of the file. This is needed
+ * to support newfs on traditional lofi device, but also will provide
+ * geometry hint for cmlb.
  */
 static void
 fake_disk_geometry(struct lofi_state *lsp)
@@ -1722,6 +2235,7 @@ fake_disk_geometry(struct lofi_state *lsp)
 	 * for a small file, or so many on a big file that you waste space
 	 * for backup superblocks or cylinder group structures.
 	 */
+	bzero(&lsp->ls_dkg, sizeof (lsp->ls_dkg));
 	if (dsize < (2 * 1024 * 1024)) /* floppy? */
 		lsp->ls_dkg.dkg_ncyl = dsize / (100 * 1024);
 	else
@@ -1729,70 +2243,74 @@ fake_disk_geometry(struct lofi_state *lsp)
 	/* in case file file is < 100k */
 	if (lsp->ls_dkg.dkg_ncyl == 0)
 		lsp->ls_dkg.dkg_ncyl = 1;
-	lsp->ls_dkg.dkg_acyl = 0;
-	lsp->ls_dkg.dkg_bcyl = 0;
+
+	lsp->ls_dkg.dkg_pcyl = lsp->ls_dkg.dkg_ncyl;
 	lsp->ls_dkg.dkg_nhead = 1;
-	lsp->ls_dkg.dkg_obs1 = 0;
-	lsp->ls_dkg.dkg_intrlv = 0;
-	lsp->ls_dkg.dkg_obs2 = 0;
-	lsp->ls_dkg.dkg_obs3 = 0;
-	lsp->ls_dkg.dkg_apc = 0;
 	lsp->ls_dkg.dkg_rpm = 7200;
-	lsp->ls_dkg.dkg_pcyl = lsp->ls_dkg.dkg_ncyl + lsp->ls_dkg.dkg_acyl;
-	lsp->ls_dkg.dkg_nsect = dsize / (DEV_BSIZE * lsp->ls_dkg.dkg_ncyl);
-	lsp->ls_dkg.dkg_write_reinstruct = 0;
-	lsp->ls_dkg.dkg_read_reinstruct = 0;
-
-	/* vtoc - see dkio(7I) */
-	bzero(&lsp->ls_vtoc, sizeof (struct vtoc));
-	lsp->ls_vtoc.v_sanity = VTOC_SANE;
-	lsp->ls_vtoc.v_version = V_VERSION;
-	(void) strncpy(lsp->ls_vtoc.v_volume, LOFI_DRIVER_NAME,
-	    sizeof (lsp->ls_vtoc.v_volume));
-	lsp->ls_vtoc.v_sectorsz = DEV_BSIZE;
-	lsp->ls_vtoc.v_nparts = 1;
-	lsp->ls_vtoc.v_part[0].p_tag = V_UNASSIGNED;
+
+	lsp->ls_dkg.dkg_nsect = dsize /
+	    (lsp->ls_dkg.dkg_ncyl << lsp->ls_pbshift);
+}
+
+/*
+ * build vtoc - see dkio(7I)
+ *
+ * Fakes one big partition based on the size of the file. This is needed
+ * because we allow newfs'ing the traditional lofi device and newfs will
+ * do several disk ioctls to figure out the geometry and partition information.
+ * It uses that information to determine the parameters to pass to mkfs.
+ */
+static void
+fake_disk_vtoc(struct lofi_state *lsp, struct vtoc *vt)
+{
+	bzero(vt, sizeof (struct vtoc));
+	vt->v_sanity = VTOC_SANE;
+	vt->v_version = V_VERSION;
+	(void) strncpy(vt->v_volume, LOFI_DRIVER_NAME,
+	    sizeof (vt->v_volume));
+	vt->v_sectorsz = 1 << lsp->ls_pbshift;
+	vt->v_nparts = 1;
+	vt->v_part[0].p_tag = V_UNASSIGNED;
 
 	/*
 	 * A compressed file is read-only, other files can
 	 * be read-write
 	 */
 	if (lsp->ls_uncomp_seg_sz > 0) {
-		lsp->ls_vtoc.v_part[0].p_flag = V_UNMNT | V_RONLY;
+		vt->v_part[0].p_flag = V_UNMNT | V_RONLY;
 	} else {
-		lsp->ls_vtoc.v_part[0].p_flag = V_UNMNT;
+		vt->v_part[0].p_flag = V_UNMNT;
 	}
-	lsp->ls_vtoc.v_part[0].p_start = (daddr_t)0;
+	vt->v_part[0].p_start = (daddr_t)0;
 	/*
 	 * The partition size cannot just be the number of sectors, because
 	 * that might not end on a cylinder boundary. And if that's the case,
 	 * newfs/mkfs will print a scary warning. So just figure the size
 	 * based on the number of cylinders and sectors/cylinder.
 	 */
-	lsp->ls_vtoc.v_part[0].p_size = lsp->ls_dkg.dkg_pcyl *
+	vt->v_part[0].p_size = lsp->ls_dkg.dkg_pcyl *
 	    lsp->ls_dkg.dkg_nsect * lsp->ls_dkg.dkg_nhead;
+}
 
-	/* dk_cinfo - see dkio(7I) */
-	bzero(&lsp->ls_ci, sizeof (struct dk_cinfo));
-	(void) strcpy(lsp->ls_ci.dki_cname, LOFI_DRIVER_NAME);
-	lsp->ls_ci.dki_ctype = DKC_MD;
-	lsp->ls_ci.dki_flags = 0;
-	lsp->ls_ci.dki_cnum = 0;
-	lsp->ls_ci.dki_addr = 0;
-	lsp->ls_ci.dki_space = 0;
-	lsp->ls_ci.dki_prio = 0;
-	lsp->ls_ci.dki_vec = 0;
-	(void) strcpy(lsp->ls_ci.dki_dname, LOFI_DRIVER_NAME);
-	lsp->ls_ci.dki_unit = 0;
-	lsp->ls_ci.dki_slave = 0;
-	lsp->ls_ci.dki_partition = 0;
+/*
+ * build dk_cinfo - see dkio(7I)
+ */
+static void
+fake_disk_info(dev_t dev, struct dk_cinfo *ci)
+{
+	bzero(ci, sizeof (struct dk_cinfo));
+	(void) strlcpy(ci->dki_cname, LOFI_DRIVER_NAME, sizeof (ci->dki_cname));
+	ci->dki_ctype = DKC_SCSI_CCS;
+	(void) strlcpy(ci->dki_dname, LOFI_DRIVER_NAME, sizeof (ci->dki_dname));
+	ci->dki_unit = LOFI_MINOR2ID(getminor(dev));
+	ci->dki_partition = LOFI_PART(getminor(dev));
 	/*
 	 * newfs uses this to set maxcontig. Must not be < 16, or it
 	 * will be 0 when newfs multiplies it by DEV_BSIZE and divides
 	 * it by the block size. Then tunefs doesn't work because
 	 * maxcontig is 0.
 	 */
-	lsp->ls_ci.dki_maxtransfer = 16;
+	ci->dki_maxtransfer = 16;
 }
 
 /*
@@ -2110,21 +2628,177 @@ lofi_init_compress(struct lofi_state *lsp)
 }
 
 /*
+ * Allocate new or proposed id from lofi_id.
+ *
+ * Special cases for proposed id:
+ * 0: not allowed, 0 is id for control device.
+ * -1: allocate first usable id from lofi_id.
+ * any other value is proposed value from userland
+ *
+ * returns DDI_SUCCESS or errno.
+ */
+static int
+lofi_alloc_id(int *idp)
+{
+	int id, error = DDI_SUCCESS;
+
+	if (*idp == -1) {
+		id = id_allocff_nosleep(lofi_id);
+		if (id == -1) {
+			error = EAGAIN;
+			goto err;
+		}
+	} else if (*idp == 0) {
+		error = EINVAL;
+		goto err;
+	} else if (*idp > ((1 << (L_BITSMINOR - LOFI_CMLB_SHIFT)) - 1)) {
+		error = ERANGE;
+		goto err;
+	} else {
+		if (ddi_get_soft_state(lofi_statep, *idp) != NULL) {
+			error = EEXIST;
+			goto err;
+		}
+
+		id = id_alloc_specific_nosleep(lofi_id, *idp);
+		if (id == -1) {
+			error = EAGAIN;
+			goto err;
+		}
+	}
+	*idp = id;
+err:
+	return (error);
+}
+
+static int
+lofi_create_dev(struct lofi_ioctl *klip)
+{
+	dev_info_t *parent, *child;
+	struct lofi_state *lsp = NULL;
+	char namebuf[MAXNAMELEN];
+	int error, circ;
+
+	/* get control device */
+	lsp = ddi_get_soft_state(lofi_statep, 0);
+	parent = ddi_get_parent(lsp->ls_dip);
+
+	if ((error = lofi_alloc_id((int *)&klip->li_id)))
+		return (error);
+
+	(void) snprintf(namebuf, sizeof (namebuf), LOFI_DRIVER_NAME "@%d",
+	    klip->li_id);
+
+	ndi_devi_enter(parent, &circ);
+	child = ndi_devi_findchild(parent, namebuf);
+	ndi_devi_exit(parent, circ);
+
+	if (child == NULL) {
+		child = ddi_add_child(parent, LOFI_DRIVER_NAME,
+		    (pnode_t)DEVI_SID_NODEID, klip->li_id);
+		if ((error = ddi_prop_update_int(DDI_DEV_T_NONE, child,
+		    "instance", klip->li_id)) != DDI_PROP_SUCCESS)
+			goto err;
+
+		if (klip->li_labeled == B_TRUE) {
+			if ((error = ddi_prop_create(DDI_DEV_T_NONE, child,
+			    DDI_PROP_CANSLEEP, "labeled", 0, 0))
+			    != DDI_PROP_SUCCESS)
+				goto err;
+		}
+
+		if ((error = ndi_devi_online(child, NDI_ONLINE_ATTACH))
+		    != NDI_SUCCESS)
+			goto err;
+	} else {
+		id_free(lofi_id, klip->li_id);
+		error = EEXIST;
+		return (error);
+	}
+
+	goto done;
+
+err:
+	ddi_prop_remove_all(child);
+	(void) ndi_devi_offline(child, NDI_DEVI_REMOVE);
+	id_free(lofi_id, klip->li_id);
+done:
+
+	return (error);
+}
+
+static void
+lofi_create_inquiry(struct lofi_state *lsp, struct scsi_inquiry *inq)
+{
+	char *p = NULL;
+
+	(void) strlcpy(inq->inq_vid, LOFI_DRIVER_NAME, sizeof (inq->inq_vid));
+
+	mutex_enter(&lsp->ls_vp_lock);
+	if (lsp->ls_vp != NULL)
+		p = strrchr(lsp->ls_vp->v_path, '/');
+	if (p != NULL)
+		(void) strncpy(inq->inq_pid, p + 1, sizeof (inq->inq_pid));
+	mutex_exit(&lsp->ls_vp_lock);
+	(void) strlcpy(inq->inq_revision, "1.0", sizeof (inq->inq_revision));
+}
+
+/*
+ * copy devlink name from event cache
+ */
+static void
+lofi_copy_devpath(struct lofi_ioctl *klip)
+{
+	int	error;
+	char	namebuf[MAXNAMELEN], *str;
+	clock_t ticks;
+	nvlist_t *nvl;
+
+	if (klip->li_labeled == B_TRUE)
+		klip->li_devpath[0] = '\0';
+	else {
+		/* no need to wait for messages */
+		(void) snprintf(klip->li_devpath, sizeof (klip->li_devpath),
+		    "/dev/" LOFI_CHAR_NAME "/%d", klip->li_id);
+		return;
+	}
+
+	(void) snprintf(namebuf, sizeof (namebuf), "%d", klip->li_id);
+	ticks = ddi_get_lbolt() + LOFI_TIMEOUT * drv_usectohz(1000000);
+
+	nvl = NULL;
+
+	mutex_enter(&lofi_chan_lock);
+	while (nvlist_lookup_nvlist(lofi_devlink_cache, namebuf, &nvl) != 0) {
+		error = cv_timedwait(&lofi_chan_cv, &lofi_chan_lock, ticks);
+		if (error == -1)
+			break;
+	}
+
+	if (nvl != NULL) {
+		if (nvlist_lookup_string(nvl, DEV_NAME, &str) == 0) {
+			(void) strlcpy(klip->li_devpath, str,
+			    sizeof (klip->li_devpath));
+		}
+	}
+	mutex_exit(&lofi_chan_lock);
+}
+
+/*
  * map a file to a minor number. Return the minor number.
  */
 static int
 lofi_map_file(dev_t dev, struct lofi_ioctl *ulip, int pickminor,
     int *rvalp, struct cred *credp, int ioctl_flag)
 {
-	minor_t	minor = (minor_t)-1;
+	int	id = -1;
 	struct lofi_state *lsp = NULL;
 	struct lofi_ioctl *klip;
 	int	error;
 	struct vnode *vp = NULL;
 	vattr_t	vattr;
 	int	flag;
-	dev_t	newdev;
-	char	namebuf[50];
+	char	namebuf[MAXNAMELEN];
 
 	error = copy_in_lofi_ioctl(ulip, &klip, ioctl_flag);
 	if (error != 0)
@@ -2132,38 +2806,12 @@ lofi_map_file(dev_t dev, struct lofi_ioctl *ulip, int pickminor,
 
 	mutex_enter(&lofi_lock);
 
-	mutex_enter(&curproc->p_lock);
-	if ((error = rctl_incr_lofi(curproc, curproc->p_zone, 1)) != 0) {
-		mutex_exit(&curproc->p_lock);
-		mutex_exit(&lofi_lock);
-		free_lofi_ioctl(klip);
-		return (error);
-	}
-	mutex_exit(&curproc->p_lock);
-
 	if (file_to_lofi_nocheck(klip->li_filename, klip->li_readonly,
 	    NULL) == 0) {
 		error = EBUSY;
 		goto err;
 	}
 
-	if (pickminor) {
-		minor = (minor_t)id_allocff_nosleep(lofi_minor_id);
-		if (minor == (minor_t)-1) {
-			error = EAGAIN;
-			goto err;
-		}
-	} else {
-		if (ddi_get_soft_state(lofi_statep, klip->li_minor) != NULL) {
-			error = EEXIST;
-			goto err;
-		}
-
-		minor = (minor_t)
-		    id_alloc_specific_nosleep(lofi_minor_id, klip->li_minor);
-		ASSERT(minor != (minor_t)-1);
-	}
-
 	flag = FREAD | FWRITE | FOFFMAX | FEXCL;
 	error = vn_open(klip->li_filename, UIO_SYSSPACE, flag, 0, &vp, 0, 0);
 	if (error) {
@@ -2191,35 +2839,22 @@ lofi_map_file(dev_t dev, struct lofi_ioctl *ulip, int pickminor,
 		goto err;
 	}
 
-	/* lsp alloc+init */
-
-	error = ddi_soft_state_zalloc(lofi_statep, minor);
-	if (error == DDI_FAILURE) {
-		error = ENOMEM;
-		goto err;
+	if (pickminor) {
+		klip->li_id = (uint32_t)-1;
 	}
+	if ((error = lofi_create_dev(klip)) != 0)
+		goto err;
 
-	lsp = ddi_get_soft_state(lofi_statep, minor);
-	list_insert_tail(&lofi_list, lsp);
-
-	newdev = makedevice(getmajor(dev), minor);
-	lsp->ls_dev = newdev;
-	zone_init_ref(&lsp->ls_zone);
-	zone_hold_ref(curzone, &lsp->ls_zone, ZONE_REF_LOFI);
-	lsp->ls_uncomp_seg_sz = 0;
-	lsp->ls_comp_algorithm[0] = '\0';
-	lsp->ls_crypto_offset = 0;
-
-	cv_init(&lsp->ls_vp_cv, NULL, CV_DRIVER, NULL);
-	mutex_init(&lsp->ls_comp_cache_lock, NULL, MUTEX_DRIVER, NULL);
-	mutex_init(&lsp->ls_comp_bufs_lock, NULL, MUTEX_DRIVER, NULL);
-	mutex_init(&lsp->ls_kstat_lock, NULL, MUTEX_DRIVER, NULL);
-	mutex_init(&lsp->ls_vp_lock, NULL, MUTEX_DRIVER, NULL);
+	id = klip->li_id;
+	lsp = ddi_get_soft_state(lofi_statep, id);
+	if (lsp == NULL)
+		goto err;
 
-	(void) snprintf(namebuf, sizeof (namebuf), "%s_taskq_%d",
-	    LOFI_DRIVER_NAME, minor);
-	lsp->ls_taskq = taskq_create_proc(namebuf, lofi_taskq_nthreads,
-	    minclsyspri, 1, lofi_taskq_maxalloc, curzone->zone_zsched, 0);
+	/*
+	 * from this point lofi_destroy() is used to clean up on error
+	 * make sure the basic data is set
+	 */
+	lsp->ls_dev = makedevice(getmajor(dev), LOFI_ID2MINOR(id));
 
 	list_create(&lsp->ls_comp_cache, sizeof (struct lofi_comp_cache),
 	    offsetof(struct lofi_comp_cache, lc_list));
@@ -2232,6 +2867,10 @@ lofi_map_file(dev_t dev, struct lofi_ioctl *ulip, int pickminor,
 
 	lsp->ls_vp = vp;
 	lsp->ls_stacked_vp = vp;
+
+	lsp->ls_vp_size = vattr.va_size;
+	lsp->ls_vp_comp_size = lsp->ls_vp_size;
+
 	/*
 	 * Try to handle stacked lofs vnodes.
 	 */
@@ -2249,21 +2888,18 @@ lofi_map_file(dev_t dev, struct lofi_ioctl *ulip, int pickminor,
 		}
 	}
 
-	lsp->ls_vp_size = vattr.va_size;
-	lsp->ls_vp_comp_size = lsp->ls_vp_size;
-
-	lsp->ls_kstat = kstat_create_zone(LOFI_DRIVER_NAME, minor,
-	    NULL, "disk", KSTAT_TYPE_IO, 1, 0, getzoneid());
-
-	if (lsp->ls_kstat == NULL) {
-		error = ENOMEM;
-		goto err;
-	}
-
-	lsp->ls_kstat->ks_lock = &lsp->ls_kstat_lock;
-	kstat_zone_add(lsp->ls_kstat, GLOBAL_ZONEID);
+	lsp->ls_lbshift = highbit(DEV_BSIZE) - 1;
+	lsp->ls_pbshift = lsp->ls_lbshift;
 
 	lsp->ls_readonly = klip->li_readonly;
+	lsp->ls_uncomp_seg_sz = 0;
+	lsp->ls_comp_algorithm[0] = '\0';
+	lsp->ls_crypto_offset = 0;
+
+	(void) snprintf(namebuf, sizeof (namebuf), "%s_taskq_%d",
+	    LOFI_DRIVER_NAME, id);
+	lsp->ls_taskq = taskq_create_proc(namebuf, lofi_taskq_nthreads,
+	    minclsyspri, 1, lofi_taskq_maxalloc, curzone->zone_zsched, 0);
 
 	if ((error = lofi_init_crypto(lsp, klip)) != 0)
 		goto err;
@@ -2273,74 +2909,46 @@ lofi_map_file(dev_t dev, struct lofi_ioctl *ulip, int pickminor,
 
 	fake_disk_geometry(lsp);
 
-	/* create minor nodes */
-
-	(void) snprintf(namebuf, sizeof (namebuf), "%d", minor);
-	error = ddi_create_minor_node(lofi_dip, namebuf, S_IFBLK, minor,
-	    DDI_PSEUDO, NULL);
-	if (error != DDI_SUCCESS) {
-		error = ENXIO;
-		goto err;
-	}
-
-	(void) snprintf(namebuf, sizeof (namebuf), "%d,raw", minor);
-	error = ddi_create_minor_node(lofi_dip, namebuf, S_IFCHR, minor,
-	    DDI_PSEUDO, NULL);
-	if (error != DDI_SUCCESS) {
-		/* remove block node */
-		(void) snprintf(namebuf, sizeof (namebuf), "%d", minor);
-		ddi_remove_minor_node(lofi_dip, namebuf);
-		error = ENXIO;
-		goto err;
-	}
-
-	/* create DDI properties */
-
-	if ((ddi_prop_update_int64(newdev, lofi_dip, SIZE_PROP_NAME,
+	if ((ddi_prop_update_int64(lsp->ls_dev, lsp->ls_dip, SIZE_PROP_NAME,
 	    lsp->ls_vp_size - lsp->ls_crypto_offset)) != DDI_PROP_SUCCESS) {
 		error = EINVAL;
-		goto nodeerr;
+		goto err;
 	}
 
-	if ((ddi_prop_update_int64(newdev, lofi_dip, NBLOCKS_PROP_NAME,
+	if ((ddi_prop_update_int64(lsp->ls_dev, lsp->ls_dip, NBLOCKS_PROP_NAME,
 	    (lsp->ls_vp_size - lsp->ls_crypto_offset) / DEV_BSIZE))
 	    != DDI_PROP_SUCCESS) {
 		error = EINVAL;
-		goto nodeerr;
-	}
-
-	if (ddi_prop_update_string(newdev, lofi_dip, ZONE_PROP_NAME,
-	    (char *)curproc->p_zone->zone_name) != DDI_PROP_SUCCESS) {
-		error = EINVAL;
-		goto nodeerr;
+		goto err;
 	}
 
-	kstat_install(lsp->ls_kstat);
-
+	list_insert_tail(&lofi_list, lsp);
+	/*
+	 * Notify we are ready to rock.
+	 */
+	mutex_enter(&lsp->ls_vp_lock);
+	lsp->ls_vp_ready = B_TRUE;
+	cv_broadcast(&lsp->ls_vp_cv);
+	mutex_exit(&lsp->ls_vp_lock);
 	mutex_exit(&lofi_lock);
 
+	lofi_copy_devpath(klip);
+
 	if (rvalp)
-		*rvalp = (int)minor;
-	klip->li_minor = minor;
+		*rvalp = id;
 	(void) copy_out_lofi_ioctl(klip, ulip, ioctl_flag);
 	free_lofi_ioctl(klip);
 	return (0);
 
-nodeerr:
-	lofi_free_dev(newdev);
 err:
 	if (lsp != NULL) {
 		lofi_destroy(lsp, credp);
 	} else {
 		if (vp != NULL) {
+			(void) VOP_PUTPAGE(vp, 0, 0, B_INVAL, credp, NULL);
 			(void) VOP_CLOSE(vp, flag, 1, 0, credp, NULL);
 			VN_RELE(vp);
 		}
-
-		if (minor != (minor_t)-1)
-			id_free(lofi_minor_id, minor);
-
-		rctl_decr_lofi(curproc->p_zone, 1);
 	}
 
 	mutex_exit(&lofi_lock);
@@ -2357,6 +2965,9 @@ lofi_unmap_file(struct lofi_ioctl *ulip, int byfilename,
 {
 	struct lofi_state *lsp;
 	struct lofi_ioctl *klip;
+	nvlist_t *nvl = NULL;
+	clock_t ticks;
+	char name[MAXNAMELEN];
 	int err;
 
 	err = copy_in_lofi_ioctl(ulip, &klip, ioctl_flag);
@@ -2370,12 +2981,12 @@ lofi_unmap_file(struct lofi_ioctl *ulip, int byfilename,
 			mutex_exit(&lofi_lock);
 			return (err);
 		}
-	} else if (klip->li_minor == 0) {
+	} else if (klip->li_id == 0) {
 		mutex_exit(&lofi_lock);
 		free_lofi_ioctl(klip);
 		return (ENXIO);
 	} else {
-		lsp = ddi_get_soft_state(lofi_statep, klip->li_minor);
+		lsp = ddi_get_soft_state(lofi_statep, klip->li_id);
 	}
 
 	if (lsp == NULL || lsp->ls_vp == NULL || lofi_access(lsp) != 0) {
@@ -2384,7 +2995,7 @@ lofi_unmap_file(struct lofi_ioctl *ulip, int byfilename,
 		return (ENXIO);
 	}
 
-	klip->li_minor = getminor(lsp->ls_dev);
+	klip->li_id = LOFI_MINOR2ID(getminor(lsp->ls_dev));
 
 	/*
 	 * If it's still held open, we'll do one of three things:
@@ -2432,9 +3043,27 @@ lofi_unmap_file(struct lofi_ioctl *ulip, int byfilename,
 	}
 
 out:
-	lofi_free_dev(lsp->ls_dev);
+	lofi_free_dev(lsp);
 	lofi_destroy(lsp, credp);
 
+	/*
+	 * check the lofi_devlink_cache if device is really gone.
+	 * note: we just wait for timeout here and dont give error if
+	 * timer will expire. This check is to try to ensure the unmap is
+	 * really done when lofiadm -d completes.
+	 * Since lofi_lock is held, also hopefully the lofiadm -a calls
+	 * wont interfere the the unmap.
+	 */
+	(void) snprintf(name, sizeof (name), "%d", klip->li_id);
+	ticks = ddi_get_lbolt() + LOFI_TIMEOUT * drv_usectohz(1000000);
+	mutex_enter(&lofi_chan_lock);
+	while (nvlist_lookup_nvlist(lofi_devlink_cache, name, &nvl) == 0) {
+		err = cv_timedwait(&lofi_chan_cv, &lofi_chan_lock, ticks);
+		if (err == -1)
+			break;
+	}
+	mutex_exit(&lofi_chan_lock);
+
 	mutex_exit(&lofi_lock);
 	(void) copy_out_lofi_ioctl(klip, ulip, ioctl_flag);
 	free_lofi_ioctl(klip);
@@ -2460,13 +3089,13 @@ lofi_get_info(dev_t dev, struct lofi_ioctl *ulip, int which,
 
 	switch (which) {
 	case LOFI_GET_FILENAME:
-		if (klip->li_minor == 0) {
+		if (klip->li_id == 0) {
 			free_lofi_ioctl(klip);
 			return (EINVAL);
 		}
 
 		mutex_enter(&lofi_lock);
-		lsp = ddi_get_soft_state(lofi_statep, klip->li_minor);
+		lsp = ddi_get_soft_state(lofi_statep, klip->li_id);
 		if (lsp == NULL || lofi_access(lsp) != 0) {
 			mutex_exit(&lofi_lock);
 			free_lofi_ioctl(klip);
@@ -2484,11 +3113,14 @@ lofi_get_info(dev_t dev, struct lofi_ioctl *ulip, int which,
 		}
 
 		klip->li_readonly = lsp->ls_readonly;
+		klip->li_labeled = lsp->ls_cmlbhandle != NULL;
 
 		(void) strlcpy(klip->li_algorithm, lsp->ls_comp_algorithm,
 		    sizeof (klip->li_algorithm));
 		klip->li_crypto_enabled = lsp->ls_crypto_enabled;
 		mutex_exit(&lofi_lock);
+
+		lofi_copy_devpath(klip);
 		error = copy_out_lofi_ioctl(klip, ulip, ioctl_flag);
 		free_lofi_ioctl(klip);
 		return (error);
@@ -2496,12 +3128,19 @@ lofi_get_info(dev_t dev, struct lofi_ioctl *ulip, int which,
 		mutex_enter(&lofi_lock);
 		error = file_to_lofi(klip->li_filename,
 		    klip->li_readonly, &lsp);
-		if (error == 0)
-			klip->li_minor = getminor(lsp->ls_dev);
+		if (error != 0) {
+			mutex_exit(&lofi_lock);
+			free_lofi_ioctl(klip);
+			return (error);
+		}
+		klip->li_id = LOFI_MINOR2ID(getminor(lsp->ls_dev));
+
+		klip->li_readonly = lsp->ls_readonly;
+		klip->li_labeled = lsp->ls_cmlbhandle != NULL;
 		mutex_exit(&lofi_lock);
 
-		if (error == 0)
-			error = copy_out_lofi_ioctl(klip, ulip, ioctl_flag);
+		lofi_copy_devpath(klip);
+		error = copy_out_lofi_ioctl(klip, ulip, ioctl_flag);
 
 		free_lofi_ioctl(klip);
 		return (error);
@@ -2515,7 +3154,7 @@ lofi_get_info(dev_t dev, struct lofi_ioctl *ulip, int which,
 			return (error);
 		}
 
-		klip->li_minor = getminor(lsp->ls_dev);
+		klip->li_id = LOFI_MINOR2ID(getminor(lsp->ls_dev));
 		(void) strlcpy(klip->li_algorithm, lsp->ls_comp_algorithm,
 		    sizeof (klip->li_algorithm));
 
@@ -2530,17 +3169,63 @@ lofi_get_info(dev_t dev, struct lofi_ioctl *ulip, int which,
 }
 
 static int
+uscsi_is_inquiry(intptr_t arg, int flag, union scsi_cdb *cdb,
+    struct uscsi_cmd *uscmd)
+{
+	int rval;
+
+#ifdef	_MULTI_DATAMODEL
+	switch (ddi_model_convert_from(flag & FMODELS)) {
+	case DDI_MODEL_ILP32: {
+		struct uscsi_cmd32 ucmd32;
+
+		if (ddi_copyin((void *)arg, &ucmd32, sizeof (ucmd32), flag)) {
+			rval = EFAULT;
+			goto err;
+		}
+		uscsi_cmd32touscsi_cmd((&ucmd32), uscmd);
+		break;
+	}
+	case DDI_MODEL_NONE:
+		if (ddi_copyin((void *)arg, uscmd, sizeof (*uscmd), flag)) {
+			rval = EFAULT;
+			goto err;
+		}
+		break;
+	default:
+		rval = EFAULT;
+		goto err;
+	}
+#else
+	if (ddi_copyin((void *)arg, uscmd, sizeof (*uscmd), flag)) {
+		rval = EFAULT;
+		goto err;
+	}
+#endif	/* _MULTI_DATAMODEL */
+	if (ddi_copyin(uscmd->uscsi_cdb, cdb, uscmd->uscsi_cdblen, flag)) {
+		rval = EFAULT;
+		goto err;
+	}
+	if (cdb->scc_cmd == SCMD_INQUIRY) {
+		return (0);
+	}
+err:
+	return (rval);
+}
+
+static int
 lofi_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *credp,
     int *rvalp)
 {
 	int	error;
 	enum dkio_state dkstate;
 	struct lofi_state *lsp;
-	minor_t	minor;
+	int	id;
+
+	id = LOFI_MINOR2ID(getminor(dev));
 
-	minor = getminor(dev);
 	/* lofi ioctls only apply to the master device */
-	if (minor == 0) {
+	if (id == 0) {
 		struct lofi_ioctl *lip = (struct lofi_ioctl *)arg;
 
 		/*
@@ -2576,27 +3261,29 @@ lofi_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *credp,
 		 * This API made limited sense when this value was fixed
 		 * at LOFI_MAX_FILES.  However, its use to iterate
 		 * across all possible devices in lofiadm means we don't
-		 * want to return L_MAXMIN32, but the highest
-		 * *allocated* minor.
+		 * want to return L_MAXMIN, but the highest
+		 * *allocated* id.
 		 */
 		case LOFI_GET_MAXMINOR:
-			minor = 0;
+			id = 0;
 
 			mutex_enter(&lofi_lock);
 
 			for (lsp = list_head(&lofi_list); lsp != NULL;
 			    lsp = list_next(&lofi_list, lsp)) {
+				int i;
 				if (lofi_access(lsp) != 0)
 					continue;
 
-				if (getminor(lsp->ls_dev) > minor)
-					minor = getminor(lsp->ls_dev);
+				i = ddi_get_instance(lsp->ls_dip);
+				if (i > id)
+					id = i;
 			}
 
 			mutex_exit(&lofi_lock);
 
-			error = ddi_copyout(&minor, &lip->li_minor,
-			    sizeof (minor), flag);
+			error = ddi_copyout(&id, &lip->li_id,
+			    sizeof (id), flag);
 			if (error)
 				return (EFAULT);
 			return (0);
@@ -2610,13 +3297,21 @@ lofi_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *credp,
 	}
 
 	mutex_enter(&lofi_lock);
-	lsp = ddi_get_soft_state(lofi_statep, minor);
+	lsp = ddi_get_soft_state(lofi_statep, id);
 	if (lsp == NULL || lsp->ls_vp_closereq) {
 		mutex_exit(&lofi_lock);
 		return (ENXIO);
 	}
 	mutex_exit(&lofi_lock);
 
+	if (ddi_prop_exists(DDI_DEV_T_ANY, lsp->ls_dip, DDI_PROP_DONTPASS,
+	    "labeled") == 1) {
+		error = cmlb_ioctl(lsp->ls_cmlbhandle, dev, cmd, arg, flag,
+		    credp, rvalp, 0);
+		if (error != ENOTTY)
+			return (error);
+	}
+
 	/*
 	 * We explicitly allow DKIOCSTATE, but all other ioctls should fail with
 	 * EIO as if the device was no longer present.
@@ -2626,12 +3321,44 @@ lofi_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *credp,
 
 	/* these are for faking out utilities like newfs */
 	switch (cmd) {
-	case DKIOCGVTOC:
+	case DKIOCGMEDIAINFO:
+	case DKIOCGMEDIAINFOEXT: {
+		struct dk_minfo_ext media_info;
+		int shift = lsp->ls_lbshift;
+		int size;
+
+		if (cmd == DKIOCGMEDIAINFOEXT) {
+			media_info.dki_pbsize = 1U << lsp->ls_pbshift;
+			size = sizeof (struct dk_minfo_ext);
+		} else {
+			size = sizeof (struct dk_minfo);
+		}
+
+		media_info.dki_media_type = DK_FIXED_DISK;
+		media_info.dki_lbsize = 1U << shift;
+		media_info.dki_capacity =
+		    (lsp->ls_vp_size - lsp->ls_crypto_offset) >> shift;
+
+		if (ddi_copyout(&media_info, (void *)arg, size, flag))
+			return (EFAULT);
+		return (0);
+	}
+	case DKIOCREMOVABLE: {
+		int i = 0;
+		if (ddi_copyout(&i, (caddr_t)arg, sizeof (int), flag))
+			return (EFAULT);
+		return (0);
+	}
+
+	case DKIOCGVTOC: {
+		struct vtoc vt;
+		fake_disk_vtoc(lsp, &vt);
+
 		switch (ddi_model_convert_from(flag & FMODELS)) {
 		case DDI_MODEL_ILP32: {
 			struct vtoc32 vtoc32;
 
-			vtoctovtoc32(lsp->ls_vtoc, vtoc32);
+			vtoctovtoc32(vt, vtoc32);
 			if (ddi_copyout(&vtoc32, (void *)arg,
 			    sizeof (struct vtoc32), flag))
 				return (EFAULT);
@@ -2639,18 +3366,20 @@ lofi_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *credp,
 			}
 
 		case DDI_MODEL_NONE:
-			if (ddi_copyout(&lsp->ls_vtoc, (void *)arg,
+			if (ddi_copyout(&vt, (void *)arg,
 			    sizeof (struct vtoc), flag))
 				return (EFAULT);
 			break;
 		}
 		return (0);
-	case DKIOCINFO:
-		error = ddi_copyout(&lsp->ls_ci, (void *)arg,
-		    sizeof (struct dk_cinfo), flag);
-		if (error)
+	}
+	case DKIOCINFO: {
+		struct dk_cinfo ci;
+		fake_disk_info(dev, &ci);
+		if (ddi_copyout(&ci, (void *)arg, sizeof (ci), flag))
 			return (EFAULT);
 		return (0);
+	}
 	case DKIOCG_VIRTGEOM:
 	case DKIOCG_PHYGEOM:
 	case DKIOCGGEOM:
@@ -2697,11 +3426,80 @@ lofi_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *credp,
 		    sizeof (dkstate), flag) != 0)
 			return (EFAULT);
 		return (0);
+	case USCSICMD: {
+		struct uscsi_cmd uscmd;
+		union scsi_cdb cdb;
+
+		if (uscsi_is_inquiry(arg, flag, &cdb, &uscmd) == 0) {
+			struct scsi_inquiry inq = {0};
+
+			lofi_create_inquiry(lsp, &inq);
+			if (ddi_copyout(&inq, uscmd.uscsi_bufaddr,
+			    uscmd.uscsi_buflen, flag) != 0)
+				return (EFAULT);
+			return (0);
+		} else if (cdb.scc_cmd == SCMD_READ_CAPACITY) {
+			struct scsi_capacity capacity;
+
+			capacity.capacity =
+			    BE_32((lsp->ls_vp_size - lsp->ls_crypto_offset) >>
+			    lsp->ls_lbshift);
+			capacity.lbasize = BE_32(1 << lsp->ls_lbshift);
+			if (ddi_copyout(&capacity, uscmd.uscsi_bufaddr,
+			    uscmd.uscsi_buflen, flag) != 0)
+				return (EFAULT);
+			return (0);
+		}
+
+		uscmd.uscsi_rqstatus = 0xff;
+#ifdef	_MULTI_DATAMODEL
+		switch (ddi_model_convert_from(flag & FMODELS)) {
+		case DDI_MODEL_ILP32: {
+			struct uscsi_cmd32 ucmd32;
+			uscsi_cmdtouscsi_cmd32((&uscmd), (&ucmd32));
+			if (ddi_copyout(&ucmd32, (void *)arg, sizeof (ucmd32),
+			    flag) != 0)
+				return (EFAULT);
+			break;
+		}
+		case DDI_MODEL_NONE:
+			if (ddi_copyout(&uscmd, (void *)arg, sizeof (uscmd),
+			    flag) != 0)
+				return (EFAULT);
+			break;
+		default:
+			return (EFAULT);
+		}
+#else
+		if (ddi_copyout(&uscmd, (void *)arg, sizeof (uscmd), flag) != 0)
+			return (EFAULT);
+#endif	/* _MULTI_DATAMODEL */
+		return (0);
+	}
 	default:
+#ifdef DEBUG
+		cmn_err(CE_WARN, "lofi_ioctl: %d is not implemented\n", cmd);
+#endif	/* DEBUG */
 		return (ENOTTY);
 	}
 }
 
+static int
+lofi_prop_op(dev_t dev, dev_info_t *dip, ddi_prop_op_t prop_op, int mod_flags,
+    char *name, caddr_t valuep, int *lengthp)
+{
+	struct lofi_state *lsp;
+
+	lsp = ddi_get_soft_state(lofi_statep, ddi_get_instance(dip));
+	if (lsp == NULL) {
+		return (ddi_prop_op(dev, dip, prop_op, mod_flags,
+		    name, valuep, lengthp));
+	}
+
+	return (cmlb_prop_op(lsp->ls_cmlbhandle, dev, dip, prop_op, mod_flags,
+	    name, valuep, lengthp, LOFI_PART(getminor(dev)), NULL));
+}
+
 static struct cb_ops lofi_cb_ops = {
 	lofi_open,		/* open */
 	lofi_close,		/* close */
@@ -2715,7 +3513,7 @@ static struct cb_ops lofi_cb_ops = {
 	nodev,			/* mmap */
 	nodev,			/* segmap */
 	nochpoll,		/* poll */
-	ddi_prop_op,		/* prop_op */
+	lofi_prop_op,		/* prop_op */
 	0,			/* streamtab  */
 	D_64BIT | D_NEW | D_MP,	/* Driver compatibility flag */
 	CB_REV,
@@ -2758,17 +3556,43 @@ _init(void)
 	list_create(&lofi_list, sizeof (struct lofi_state),
 	    offsetof(struct lofi_state, ls_list));
 
-	error = ddi_soft_state_init(&lofi_statep,
+	error = ddi_soft_state_init((void **)&lofi_statep,
 	    sizeof (struct lofi_state), 0);
-	if (error)
+	if (error) {
+		list_destroy(&lofi_list);
 		return (error);
+	}
+
+	/*
+	 * The minor number is stored as id << LOFI_CMLB_SHIFT as
+	 * we need to reserve space for cmlb minor numbers.
+	 * This will leave out 4096 id values on 32bit kernel, which should
+	 * still suffice.
+	 */
+	lofi_id = id_space_create("lofi_id", 1,
+	    (1 << (L_BITSMINOR - LOFI_CMLB_SHIFT)));
+
+	if (lofi_id == NULL) {
+		ddi_soft_state_fini((void **)&lofi_statep);
+		list_destroy(&lofi_list);
+		return (DDI_FAILURE);
+	}
 
 	mutex_init(&lofi_lock, NULL, MUTEX_DRIVER, NULL);
+	mutex_init(&lofi_chan_lock, NULL, MUTEX_DRIVER, NULL);
+	cv_init(&lofi_chan_cv, NULL, CV_DRIVER, NULL);
+	error = nvlist_alloc(&lofi_devlink_cache, NV_UNIQUE_NAME, KM_SLEEP);
 
-	error = mod_install(&modlinkage);
+	if (error == 0)
+		error = mod_install(&modlinkage);
 	if (error) {
+		id_space_destroy(lofi_id);
+		if (lofi_devlink_cache != NULL)
+			nvlist_free(lofi_devlink_cache);
+		mutex_destroy(&lofi_chan_lock);
+		cv_destroy(&lofi_chan_cv);
 		mutex_destroy(&lofi_lock);
-		ddi_soft_state_fini(&lofi_statep);
+		ddi_soft_state_fini((void **)&lofi_statep);
 		list_destroy(&lofi_list);
 	}
 
@@ -2793,8 +3617,16 @@ _fini(void)
 	if (error)
 		return (error);
 
+	mutex_enter(&lofi_chan_lock);
+	nvlist_free(lofi_devlink_cache);
+	lofi_devlink_cache = NULL;
+	mutex_exit(&lofi_chan_lock);
+
+	mutex_destroy(&lofi_chan_lock);
+	cv_destroy(&lofi_chan_cv);
 	mutex_destroy(&lofi_lock);
-	ddi_soft_state_fini(&lofi_statep);
+	id_space_destroy(lofi_id);
+	ddi_soft_state_fini((void **)&lofi_statep);
 	list_destroy(&lofi_list);
 
 	return (error);
diff --git a/usr/src/uts/common/os/log_sysevent.c b/usr/src/uts/common/os/log_sysevent.c
index 51cfa7f817..9739d4dbdf 100644
--- a/usr/src/uts/common/os/log_sysevent.c
+++ b/usr/src/uts/common/os/log_sysevent.c
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  */
 
 #include <sys/types.h>
@@ -34,6 +35,7 @@
 #include <sys/callb.h>
 #include <sys/sysevent.h>
 #include <sys/sysevent_impl.h>
+#include <sys/sysevent/dev.h>
 #include <sys/modctl.h>
 #include <sys/sysmacros.h>
 #include <sys/disp.h>
@@ -568,7 +570,7 @@ free_packed_event(sysevent_t *ev)
  */
 int
 sysevent_add_attr(sysevent_attr_list_t **ev_attr_list, char *name,
-	sysevent_value_t *se_value, int flag)
+    sysevent_value_t *se_value, int flag)
 {
 	int error;
 	nvlist_t **nvlp = (nvlist_t **)ev_attr_list;
@@ -1092,7 +1094,7 @@ find_subclass(class_lst_t *c_list, char *subclass)
 
 static void
 insert_subclass(class_lst_t *c_list, char **subclass_names,
-	int subclass_num, uint32_t sub_id)
+    int subclass_num, uint32_t sub_id)
 {
 	int i, subclass_sz;
 	subclass_lst_t *sc_list;
@@ -1156,7 +1158,7 @@ remove_all_class(sysevent_channel_descriptor_t *chan, uint32_t sub_id)
 
 static void
 remove_class(sysevent_channel_descriptor_t *chan, uint32_t sub_id,
-	char *class_name)
+    char *class_name)
 {
 	class_lst_t *c_list;
 	subclass_lst_t *sc_list;
@@ -1179,7 +1181,7 @@ remove_class(sysevent_channel_descriptor_t *chan, uint32_t sub_id,
 
 static int
 insert_class(sysevent_channel_descriptor_t *chan, char *event_class,
-	char **event_subclass_lst, int subclass_num, uint32_t sub_id)
+    char **event_subclass_lst, int subclass_num, uint32_t sub_id)
 {
 	class_lst_t *c_list;
 
@@ -1206,7 +1208,7 @@ insert_class(sysevent_channel_descriptor_t *chan, char *event_class,
 
 static int
 add_registration(sysevent_channel_descriptor_t *chan, uint32_t sub_id,
-	char *nvlbuf, size_t nvlsize)
+    char *nvlbuf, size_t nvlsize)
 {
 	uint_t num_elem;
 	char *event_class;
@@ -1247,7 +1249,7 @@ add_registration(sysevent_channel_descriptor_t *chan, uint32_t sub_id,
  */
 static int
 get_registration(sysevent_channel_descriptor_t *chan, char *databuf,
-	uint32_t *bufsz, uint32_t class_index)
+    uint32_t *bufsz, uint32_t class_index)
 {
 	int num_classes = 0;
 	char *nvlbuf = NULL;
@@ -1733,6 +1735,49 @@ log_sysevent(sysevent_t *ev, int flag, sysevent_id_t *eid)
 }
 
 /*
+ * Publish EC_DEV_ADD and EC_DEV_REMOVE events from devfsadm to lofi.
+ * This interface is needed to pass device link names to the lofi driver,
+ * to be returned via ioctl() to the lofiadm command.
+ * The problem is, if lofiadm is executed in local zone, there is no
+ * mechanism to announce the device name from the /dev tree back to lofiadm,
+ * as sysevents are not accessible from local zone and devfsadmd is only
+ * running in global zone.
+ *
+ * Delayed/missed events are not fatal for lofi, as the device name returned
+ * to lofiadm is for information and can be re-queried with listing
+ * mappings with lofiadm command.
+ *
+ * Once we have a better method, this interface should be reworked.
+ */
+static void
+notify_lofi(sysevent_t *ev)
+{
+	static evchan_t *devfs_chan = NULL;
+	nvlist_t *nvlist;
+	int ret;
+
+	if ((strcmp(EC_DEV_ADD, sysevent_get_class_name(ev)) != 0) &&
+	    (strcmp(EC_DEV_REMOVE, sysevent_get_class_name(ev)) != 0))
+		return;
+
+	/* only bind once to avoid bind/unbind storm on busy system */
+	if (devfs_chan == NULL) {
+		if ((ret = sysevent_evc_bind("devfsadm_event_channel",
+		    &devfs_chan, EVCH_CREAT | EVCH_HOLD_PEND)) != 0) {
+			cmn_err(CE_CONT, "sysevent_evc_bind failed: %d\n", ret);
+			return;
+		}
+	}
+
+	(void) sysevent_get_attr_list(ev, &nvlist);
+	(void) sysevent_evc_publish(devfs_chan, sysevent_get_class_name(ev),
+	    sysevent_get_subclass_name(ev), "illumos", EC_DEVFS, nvlist,
+	    EVCH_SLEEP);
+
+	nvlist_free(nvlist);
+}
+
+/*
  * log_usr_sysevent - user system event logger
  *			Private to devfsadm and accessible only via
  *			modctl(MODEVENTS, MODEVENTS_POST_EVENT)
@@ -1758,6 +1803,8 @@ log_usr_sysevent(sysevent_t *ev, int ev_size, sysevent_id_t *eid)
 		return (EFAULT);
 	}
 
+	notify_lofi(ev_copy);
+
 	if ((ret = queue_sysevent(ev_copy, &new_eid, SE_NOSLEEP)) != 0) {
 		if (ret == SE_ENOMEM || ret == SE_EQSIZE)
 			return (EAGAIN);
diff --git a/usr/src/uts/common/sys/cmlb.h b/usr/src/uts/common/sys/cmlb.h
index 81e9c060f4..a1013c9fed 100644
--- a/usr/src/uts/common/sys/cmlb.h
+++ b/usr/src/uts/common/sys/cmlb.h
@@ -19,6 +19,7 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -61,6 +62,7 @@ typedef struct tg_attribute {
 #define	CMLB_OFF_BY_ONE					0x00000004
 #define	CMLB_FAKE_LABEL_ONE_PARTITION			0x00000008
 #define	CMLB_INTERNAL_MINOR_NODES			0x00000010
+#define	CMLB_CREATE_P0_MINOR_NODE			0x00000020
 
 /* bit definitions of flag passed to cmlb_validate */
 #define	CMLB_SILENT					0x00000001
@@ -80,6 +82,22 @@ typedef struct tg_attribute {
 #define	TG_GETBLOCKSIZE		4
 #define	TG_GETATTR		5
 
+#if defined(_SUNOS_VTOC_8)
+
+#define	CMLBUNIT_DFT_SHIFT	3
+/* This will support p0 node on sparc */
+#define	CMLBUNIT_FORCE_P0_SHIFT	(CMLBUNIT_DFT_SHIFT + 1)
+
+#elif defined(_SUNOS_VTOC_16)
+
+#define	CMLBUNIT_DFT_SHIFT	6
+#define	CMLBUNIT_FORCE_P0_SHIFT	(CMLBUNIT_DFT_SHIFT)
+
+#else	/* defined(_SUNOS_VTOC_16) */
+
+#error "No VTOC format defined."
+
+#endif	/* defined(_SUNOS_VTOC_8) */
 
 /*
  * Ops vector including utility functions into target driver that cmlb uses.
diff --git a/usr/src/uts/common/sys/cmlb_impl.h b/usr/src/uts/common/sys/cmlb_impl.h
index 47ee3ab7bd..b64c4aa64b 100644
--- a/usr/src/uts/common/sys/cmlb_impl.h
+++ b/usr/src/uts/common/sys/cmlb_impl.h
@@ -20,6 +20,7 @@
  */
 
 /*
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -42,7 +43,11 @@ extern "C" {
 #define	FDISK_PARTS		(FD_NUMPART + MAX_EXT_PARTS)
 
 #if defined(_SUNOS_VTOC_8)
-#define	NSDMAP			NDKMAP
+/*
+ * As lofi needs to support p0 on sparc in case of labeled virtual disks,
+ * define NDSMAP to support one extra entrie.
+ */
+#define	NSDMAP			(NDKMAP + 1)
 #elif defined(_SUNOS_VTOC_16)
 #define	NSDMAP			(NDKMAP + FDISK_PARTS + 1)
 #else
@@ -51,11 +56,10 @@ extern "C" {
 
 #define	MAXPART			(NSDMAP + 1)
 #define	WD_NODE			7
-
+#define	P0_RAW_DISK		(NDKMAP)
 
 #if defined(__i386) || defined(__amd64)
 
-#define	P0_RAW_DISK		(NDKMAP)
 #define	FDISK_P1		(NDKMAP+1)
 #define	FDISK_P2		(NDKMAP+2)
 #define	FDISK_P3		(NDKMAP+3)
@@ -82,21 +86,10 @@ extern "C" {
 #define	ISCD(cl)		(cl->cl_device_type == DTYPE_RODIRECT)
 #define	ISHOTPLUGGABLE(cl)	(cl->cl_is_hotpluggable)
 
-#if defined(_SUNOS_VTOC_8)
-
-#define	CMLBUNIT_SHIFT		3
-#define	CMLBPART_MASK		7
-
-#elif defined(_SUNOS_VTOC_16)
-
-#define	CMLBUNIT_SHIFT		6
-#define	CMLBPART_MASK		63
-
-#else
-#error "No VTOC format defined."
-#endif
+#define	CMLBUNIT_SHIFT		(CMLBUNIT_DFT_SHIFT)
+#define	CMLBPART_MASK		((1 << CMLBUNIT_SHIFT) - 1)
 
-#define	CMLBUNIT(dev)		(getminor((dev)) >> CMLBUNIT_SHIFT)
+#define	CMLBUNIT(dev, shift)	(getminor((dev)) >> (shift))
 #define	CMLBPART(dev)		(getminor((dev)) &  CMLBPART_MASK)
 
 /*
diff --git a/usr/src/uts/common/sys/lofi.h b/usr/src/uts/common/sys/lofi.h
index e4716c96af..f57388a098 100644
--- a/usr/src/uts/common/sys/lofi.h
+++ b/usr/src/uts/common/sys/lofi.h
@@ -23,6 +23,7 @@
  *
  * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2016 Andrey Sokolov
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  */
 
 #ifndef	_SYS_LOFI_H
@@ -31,12 +32,15 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/taskq.h>
-#include <sys/vtoc.h>
 #include <sys/dkio.h>
 #include <sys/vnode.h>
 #include <sys/list.h>
 #include <sys/crypto/api.h>
 #include <sys/zone.h>
+#ifdef _KERNEL
+#include <sys/cmlb.h>
+#include <sys/open.h>
+#endif	/* _KERNEL */
 
 #ifdef	__cplusplus
 extern "C" {
@@ -51,6 +55,8 @@ extern "C" {
 #define	LOFI_DRIVER_NAME	"lofi"
 #define	LOFI_CTL_NODE		"ctl"
 #define	LOFI_CTL_NAME		LOFI_DRIVER_NAME LOFI_CTL_NODE
+#define	LOFI_BLOCK_NODE		"disk"
+#define	LOFI_CHAR_NODE		LOFI_BLOCK_NODE ",raw"
 #define	LOFI_BLOCK_NAME		LOFI_DRIVER_NAME
 #define	LOFI_CHAR_NAME		"r" LOFI_DRIVER_NAME
 
@@ -59,6 +65,20 @@ extern "C" {
 #define	UNCOMPRESSED	0
 #define	MAXALGLEN	36
 
+#define	LOFI_CMLB_SHIFT		CMLBUNIT_FORCE_P0_SHIFT
+#define	LOFI_PART_MASK		((1 << LOFI_CMLB_SHIFT) - 1)
+#define	LOFI_PART_MAX		(1 << LOFI_CMLB_SHIFT)
+#define	LOFI_PART(x)		((x) & LOFI_PART_MASK)
+
+/*
+ * The cmlb is using its own range of minor numbers for partitions, for
+ * unlabeled lofi devices, we need to use another range.
+ */
+/* unlabeled lofi device id to minor number. */
+#define	LOFI_ID2MINOR(x)	((x) << LOFI_CMLB_SHIFT)
+/* lofi id from minor number. */
+#define	LOFI_MINOR2ID(x)	((x) >> LOFI_CMLB_SHIFT)
+
 /*
  *
  * Use is:
@@ -127,11 +147,13 @@ typedef enum	iv_method {
 } iv_method_t;
 
 struct lofi_ioctl {
-	uint32_t 	li_minor;
+	uint32_t	li_id;			/* lofi ID */
 	boolean_t	li_force;
 	boolean_t	li_cleanup;
 	boolean_t	li_readonly;
+	boolean_t	li_labeled;
 	char	li_filename[MAXPATHLEN];
+	char	li_devpath[MAXPATHLEN];
 
 	/* the following fields are required for compression support */
 	char	li_algorithm[MAXALGLEN];
@@ -230,10 +252,11 @@ struct lofi_state {
 	kcondvar_t	ls_vp_cv;	/* signal changes to ls_vp */
 	uint32_t	ls_vp_iocount;	/* # pending I/O requests */
 	boolean_t	ls_vp_closereq;	/* force close requested */
+	boolean_t	ls_vp_ready;	/* is vp ready for use? */
 	u_offset_t	ls_vp_size;
-	uint32_t	ls_blk_open;
-	uint32_t	ls_chr_open;
-	uint32_t	ls_lyr_open_count;
+	uint32_t	ls_open_lyr[LOFI_PART_MAX];	/* open count */
+	uint64_t	ls_open_reg[OTYPCNT];		/* bitmask */
+	uint64_t	ls_open_excl;			/* bitmask */
 	int		ls_openflag;
 	boolean_t	ls_cleanup;	/* cleanup on close */
 	boolean_t	ls_readonly;
@@ -241,12 +264,15 @@ struct lofi_state {
 	kstat_t		*ls_kstat;
 	kmutex_t	ls_kstat_lock;
 	struct dk_geom	ls_dkg;
-	struct vtoc	ls_vtoc;
-	struct dk_cinfo	ls_ci;
 	zone_ref_t	ls_zone;
 	list_node_t	ls_list;	/* all lofis */
+	dev_info_t	*ls_dip;
 	dev_t		ls_dev;		/* this node's dev_t */
 
+	cmlb_handle_t	ls_cmlbhandle;
+	uint32_t	ls_lbshift;	/* logical block shift */
+	uint32_t	ls_pbshift;	/* physical block shift */
+
 	/* the following fields are required for compression support */
 	int		ls_comp_algorithm_index; /* idx into compress_table */
 	char		ls_comp_algorithm[MAXALGLEN];
@@ -280,7 +306,6 @@ struct lofi_state {
 	iv_method_t		ls_iv_type;	/* for iv derivation */
 	kmutex_t		ls_crypto_lock;
 	crypto_ctx_template_t	ls_ctx_tmpl;
-
 };
 
 #endif	/* _KERNEL */
diff --git a/usr/src/uts/common/sys/vfs.h b/usr/src/uts/common/sys/vfs.h
index 38c1fded4a..fc6e22b3a2 100644
--- a/usr/src/uts/common/sys/vfs.h
+++ b/usr/src/uts/common/sys/vfs.h
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  */
 
 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
@@ -227,7 +228,7 @@ typedef struct vfs {
 	struct vfs	*vfs_zone_prev;		/* prev VFS visible in zone */
 
 	struct fem_head	*vfs_femhead;		/* fs monitoring */
-	minor_t		vfs_lofi_minor;		/* minor if lofi mount */
+	uint32_t	vfs_lofi_id;		/* ID if lofi mount */
 } vfs_t;
 
 #define	vfs_featureset	vfs_implp->vi_featureset
diff --git a/usr/src/uts/common/sys/vtoc.h b/usr/src/uts/common/sys/vtoc.h
index adaf7df5b9..2bfe68ba96 100644
--- a/usr/src/uts/common/sys/vtoc.h
+++ b/usr/src/uts/common/sys/vtoc.h
@@ -25,6 +25,7 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2016 Toomas Soome <tsoome@me.com>
  */
 
 
@@ -272,15 +273,15 @@ struct vtoc32 {
 #define	vtoctovtoc32(v, v32)				\
 	{						\
 	int i;						\
-	v32.v_bootinfo[0]	= v.v_bootinfo[0];	\
-	v32.v_bootinfo[1]	= v.v_bootinfo[1];	\
-	v32.v_bootinfo[2]	= v.v_bootinfo[2];	\
-	v32.v_sanity		= v.v_sanity;		\
-	v32.v_version		= v.v_version;		\
+	v32.v_bootinfo[0]	= (uint32_t)v.v_bootinfo[0];	\
+	v32.v_bootinfo[1]	= (uint32_t)v.v_bootinfo[1];	\
+	v32.v_bootinfo[2]	= (uint32_t)v.v_bootinfo[2];	\
+	v32.v_sanity		= (uint32_t)v.v_sanity;		\
+	v32.v_version		= (uint32_t)v.v_version;		\
 	bcopy(v.v_volume, v32.v_volume, LEN_DKL_VVOL);	\
 	v32.v_sectorsz		= v.v_sectorsz;		\
 	v32.v_nparts		= v.v_nparts;		\
-	v32.v_version		= v.v_version;		\
+	v32.v_version		= (uint32_t)v.v_version;		\
 	for (i = 0; i < 10; i++)			\
 		v32.v_reserved[i] = v.v_reserved[i];	\
 	for (i = 0; i < V_NUMPAR; i++) {		\
diff --git a/usr/src/uts/intel/lofi/Makefile b/usr/src/uts/intel/lofi/Makefile
index deef4ab1b2..13b0bef650 100644
--- a/usr/src/uts/intel/lofi/Makefile
+++ b/usr/src/uts/intel/lofi/Makefile
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-#
+# Copyright 2016 Toomas Soome <tsoome@me.com>
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -58,6 +58,8 @@ ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
+LDFLAGS += -dy -Nmisc/cmlb
+
 #
 #	Default build targets.
 #
diff --git a/usr/src/uts/sparc/lofi/Makefile b/usr/src/uts/sparc/lofi/Makefile
index 9a98791817..3b9a1e5703 100644
--- a/usr/src/uts/sparc/lofi/Makefile
+++ b/usr/src/uts/sparc/lofi/Makefile
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-#
+# Copyright 2016 Toomas Soome <tsoome@me.com>
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -51,6 +51,8 @@ ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
 LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
+LDFLAGS += -dy -Nmisc/cmlb
+
 #
 #	Overrides.
 #