8547 update mandoc to 1.14.3

Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

9 files changed, 115 insertions, 136 deletions

diff --git a/usr/src/man/man1m/automount.1m b/usr/src/man/man1m/automount.1m
index 717d4fafe1..111e1a512c 100644
--- a/usr/src/man/man1m/automount.1m
+++ b/usr/src/man/man1m/automount.1m
@@ -17,7 +17,7 @@
 .\"
 .\" Copyright 1989 AT&T
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
-.\" Copyright 2016 Nexenta Systems, Inc.
+.\" Copyright 2017 Nexenta Systems, Inc.
 .\"
 .Dd February 25, 2017
 .Dt AUTOMOUNT 1M
@@ -205,7 +205,7 @@ and
 .Ar location
 takes the form:
 .Pp
-.Dl Ar host Ns : Ns Ar pathname
+.Dl Ar host Ns \&: Ns Ar pathname
 .Pp
 .Ar host
 is the name of the host from which to mount the file system, and
@@ -259,7 +259,7 @@ then a single
 .Ar location
 may be used with a comma-separated list of hostnames:
 .Bd -literal -offset indent
-.Ar hostname Ns , Ns Ar hostname Ns ...: Ns Ar pathname
+.Ar hostname Ns \&, Ns Ar hostname Ns ...: Ns Ar pathname
 .Ed
 .Pp
 Requests for a server may be weighted, with the weighting factor appended to
@@ -338,7 +338,7 @@ this would allow automatic mounts in
 .Pa /config
 of any remote file system whose location could be specified as:
 .Bd -literal -offset indent
-.Ar hostname Ns : Ns Pa /export/config/ Ns Ar hostname
+.Ar hostname Ns \&: Ns Pa /export/config/ Ns Ar hostname
 .Ed
 .Pp
 Note that the wildcard key does not work in conjunction with the
@@ -356,42 +356,19 @@ would expand it to its current value for the client's host name.
 Supported variables are:
 .Bl -column "PLATFORM" "arch -k or uname -m"
 .It Sy NAME Ta Sy OUTPUT OF Ta Sy DESCRIPTION (EXAMPLE)
-.It Ev ARCH
-.Ta Nm arch
-.Ta architecture name
-.Pq Qq Sy sun4
-.It Ev CPU
-.Ta Nm uname Fl p
-.Ta processor type
-.Pq Qq Sy sparc
-.It Ev HOST
-.Ta Nm uname Fl n
-.Ta host name
-.Pq Qq Sy myhost
-.It Ev KARCH
-.Ta Nm arch Fl k No or Nm uname Fl m
-.Ta kernel architecture name or machine hardware name
+.It Ev ARCH Ta Nm arch Ta architecture name Pq Qq Sy sun4
+.It Ev CPU Ta Nm uname Fl p Ta processor type Pq Qq Sy sparc
+.It Ev HOST Ta Nm uname Fl n Ta host name Pq Qq Sy myhost
+.It Ev KARCH Ta Nm arch Fl k No or Nm uname Fl m Ta kernel architecture name or
+machine hardware name
 .Pq Qq Sy sun4u
-.It Ev OSNAME
-.Ta Nm uname Fl s
-.Ta OS name
-.Pq Qq Sy SunOS
-.It Ev OSREL
-.Ta Nm name Fl r
-.Ta OS release name
-.Pq Qq Sy 5.3
-.It Ev OSVERS
-.Ta Nm uname Fl v
-.Ta OS version
-.Pq Qq Sy beta1.0
-.It Ev NATISA
-.Ta Nm isainfo Fl n
-.Ta native instruction set architecture for the system
+.It Ev OSNAME Ta Nm uname Fl s Ta OS name Pq Qq Sy SunOS
+.It Ev OSREL Ta Nm name Fl r Ta OS release name Pq Qq Sy 5.3
+.It Ev OSVERS Ta Nm uname Fl v Ta OS version Pq Qq Sy beta1.0
+.It Ev NATISA Ta Nm isainfo Fl n Ta native instruction set architecture for the
+system
 .Pq Qq Sy sparcv9
-.It Ev PLATFORM
-.Ta Nm uname Fl i
-.Ta platform name
-.Pq Qq Sy SUNW,Sun-Fire-V240
+.It Ev PLATFORM Ta Nm uname Fl i Ta platform name Pq Qq Sy SUNW,Sun-Fire-V240
 .El
 .Pp
 If a reference needs to be protected from affixed characters, you can surround
diff --git a/usr/src/man/man1m/ipadm.1m b/usr/src/man/man1m/ipadm.1m
index dc3ea104c9..1a8ea8a54d 100644
--- a/usr/src/man/man1m/ipadm.1m
+++ b/usr/src/man/man1m/ipadm.1m
@@ -176,7 +176,7 @@ this can be one of the following values:
 .Cm tcp ,
 .Cm sctp
 or
-.Cm udp.
+.Cm udp .
 .Sh SUBCOMMANDS
 The following subcommands are supported:
 .Bl -tag -width ""
@@ -191,7 +191,7 @@ 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 address ::.
 .Bl -tag -width ""
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -202,7 +202,7 @@ Temporary, not persistent across reboots.
 .Xc
 Disable an IP interface.
 .Bl -tag -width ""
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -213,7 +213,7 @@ Temporary, not persistent across reboots.
 .Xc
 Enable an IP interface.
 .Bl -tag -width ""
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -230,7 +230,7 @@ Permanently delete an IP interface.
 .Xc
 Show the current IP interface configuration.
 .Bl -tag -width ""
-.It Fl o Ns , Ns Fl -output
+.It Fl o Ns \&, Ns Fl -output
 Select which fields will be shown.
 The field value can be one of the following names:
 .Bl -tag -compact -width "PERSISTENT"
@@ -292,7 +292,7 @@ IPv4
 IPv6
 .El
 .El
-.It Fl p Ns , Ns Fl -parsable
+.It Fl p Ns \&, Ns Fl -parsable
 Print the output in a parsable format.
 .El
 .It Xo
@@ -305,9 +305,9 @@ Print the output in a parsable format.
 .Xc
 Set a property's value(s) on the IP interface.
 .Bl -tag -width ""
-.It Fl m Ns , Ns Fl -module
+.It Fl m Ns \&, Ns Fl -module
 Specify which protocol the setting applies to.
-.It Fl p Ns , Ns Fl -prop
+.It Fl p Ns \&, Ns Fl -prop
 Specify the property name and value(s).
 The property name can be one of the following:
 .Bl -tag -compact -width "exchange_routes"
@@ -334,7 +334,7 @@ A value
 .Cm none
 may also be used.
 .El
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -347,14 +347,14 @@ Temporary, not persistent across reboots.
 .Xc
 Reset an IP interface's property value to the default.
 .Bl -tag -width ""
-.It Fl m Ns , Ns Fl -module
+.It Fl m Ns \&, Ns Fl -module
 Specify which protocol the setting applies to.
-.It Fl p Ns , Ns Fl -prop
+.It Fl p Ns \&, Ns Fl -prop
 Specify the property name.
 See the
 .Nm ipadm Ic set-ifprop
 subcommand for the list of property names.
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -367,11 +367,11 @@ Temporary, not persistent across reboots.
 .Xc
 Display the property values for one or all of the IP interfaces.
 .Bl -tag -width ""
-.It Fl c Ns , Ns Fl -parsable
+.It Fl c Ns \&, Ns Fl -parsable
 Print the output in a parsable format.
-.It Fl m Ns , Ns Fl -module
+.It Fl m Ns \&, Ns Fl -module
 Specify which protocol to display.
-.It Fl o Ns , Ns Fl -output
+.It Fl o Ns \&, Ns Fl -output
 Select which fields will be shown.
 The field value can be one of the following names:
 .Bl -tag -compact -width "PERSISTENT"
@@ -397,7 +397,7 @@ The default value of the property.
 .It Cm POSSIBLE
 The possible values for the property.
 .El
-.It Fl p Ns , Ns Fl -prop
+.It Fl p Ns \&, Ns Fl -prop
 Specify which properties to display.
 See the
 .Nm ipadm Ic set-ifprop
@@ -446,7 +446,7 @@ address configured on an interface is required to configure
 IPv6 address on the same interface.
 This takes the following options:
 .Bl -tag -width ""
-.It Fl a Ns , Ns Fl -address
+.It Fl a Ns \&, Ns Fl -address
 Specify the address.
 The
 .Cm local
@@ -458,26 +458,26 @@ Otherwise, the equal sign
 .Pq Qq =
 should be omitted and the address should be provided by itself without second
 address.
-.It Fl d Ns , Ns Fl -down
+.It Fl d Ns \&, Ns Fl -down
 The address is down.
 .El
 .It Fl T Cm dhcp
 Obtain the address via DHCP.
 This takes the following options:
 .Bl -tag -width ""
-.It Fl w Ns , Ns Fl -wait
+.It Fl w Ns \&, Ns Fl -wait
 Specify the time, in seconds, that the command should wait to obtain an address.
 .El
 .It Fl T Cm addrconf
 Create an auto-configured address.
 This takes the following options:
 .Bl -tag -width ""
-.It Fl i Ns , Ns Fl -interface-id
+.It Fl i Ns \&, Ns Fl -interface-id
 Specify the interface ID to be used.
-.It Fl p Ns , Ns Fl -prop
+.It Fl p Ns \&, Ns Fl -prop
 Specify which method of auto-configuration should be used.
 .El
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -489,7 +489,7 @@ Temporary, not persistent across reboots.
 Down the address.
 This will stop packets from being sent or received.
 .Bl -tag -width ""
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -501,7 +501,7 @@ Temporary, not persistent across reboots.
 Up the address.
 This will enable packets to be sent and received.
 .Bl -tag -width ""
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -512,7 +512,7 @@ Temporary, not persistent across reboots.
 .Xc
 Disable the address.
 .Bl -tag -width ""
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -523,7 +523,7 @@ Temporary, not persistent across reboots.
 .Xc
 Enable the address.
 .Bl -tag -width ""
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -539,7 +539,7 @@ It also restarts duplicate address detection for
 .Cm static
 addresses.
 .Bl -tag -width ""
-.It Fl i Ns , Ns Fl -inform
+.It Fl i Ns \&, Ns Fl -inform
 Obtain network configuration from DHCP without taking a lease on the address.
 .El
 .It Xo
@@ -550,7 +550,7 @@ Obtain network configuration from DHCP without taking a lease on the address.
 .Xc
 Delete the given address.
 .Bl -tag -width ""
-.It Fl r Ns , Ns Fl -release
+.It Fl r Ns \&, Ns Fl -release
 Indicate that the DHCP-assigned address should be released.
 .El
 .It Xo
@@ -561,7 +561,7 @@ Indicate that the DHCP-assigned address should be released.
 .Xc
 Show the current address properties.
 .Bl -tag -width ""
-.It Fl o Ns , Ns Fl -output
+.It Fl o Ns \&, Ns Fl -output
 Select which fields will be shown.
 The field value can be one of the following names:
 .Bl -tag -compact -width "PERSISTENT"
@@ -624,7 +624,7 @@ deprecated
 .It Cm ADDR
 The address.
 .El
-.It Fl p Ns , Ns Fl -parsable
+.It Fl p Ns \&, Ns Fl -parsable
 Print the output in a parsable format.
 .El
 .It Xo
@@ -636,7 +636,7 @@ Print the output in a parsable format.
 .Xc
 Set a property's value(s) on the addrobj.
 .Bl -tag -width ""
-.It Fl p Ns , Ns Fl -prop
+.It Fl p Ns \&, Ns Fl -prop
 Specify the property name and value(s).
 The property name can be one of the following:
 .Bl -tag -compact -width "deprecated"
@@ -656,7 +656,7 @@ Packets can be transmitted
 .It Cm zone
 The zone the addrobj is in.
 .El
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -668,12 +668,12 @@ Temporary, not persistent across reboots.
 .Xc
 Reset an addrobj's property value to the default.
 .Bl -tag -width ""
-.It Fl p Ns , Ns Fl -prop
+.It Fl p Ns \&, Ns Fl -prop
 Specify the property name.
 See the
 .Nm ipadm Ic set-addrprop
 subcommand for the list of property names.
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -685,9 +685,9 @@ Temporary, not persistent across reboots.
 .Xc
 Display the property values for one or all of the addrobjs.
 .Bl -tag -width ""
-.It Fl c Ns , Ns Fl -parsable
+.It Fl c Ns \&, Ns Fl -parsable
 Print the output in a parsable format.
-.It Fl o Ns , Ns Fl -output
+.It Fl o Ns \&, Ns Fl -output
 Select which fields will be shown.
 The field value can be one of the following names:
 .Bl -tag -compact -width "PERSISTENT"
@@ -711,7 +711,7 @@ The default value of the property.
 .It Cm POSSIBLE
 The possible values for the property.
 .El
-.It Fl p Ns , Ns Fl -prop
+.It Fl p Ns \&, Ns Fl -prop
 Specify which properties to display.
 See the
 .Nm ipadm Ic set-addrprop
@@ -726,7 +726,7 @@ subcommand for the list of property names.
 .Xc
 Set a property's value(s) on the protocol.
 .Bl -tag -width ""
-.It Fl p Ns , Ns Fl -prop
+.It Fl p Ns \&, Ns Fl -prop
 Specify the property name and value(s).
 The optional
 .Sy + Ns | Ns Sy -
@@ -782,7 +782,7 @@ Smallest non-privileged port
 .It Cm ttl
 The IPv4 time-to-live.
 .El
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -794,12 +794,12 @@ Temporary, not persistent across reboots.
 .Xc
 Reset a protocol's property value to the default.
 .Bl -tag -width ""
-.It Fl p Ns , Ns Fl -prop
+.It Fl p Ns \&, Ns Fl -prop
 Specify the property name.
 See the
 .Nm ipadm Ic set-prop
 subcommand for the list of property names.
-.It Fl t Ns , Ns Fl -temporary
+.It Fl t Ns \&, Ns Fl -temporary
 Temporary, not persistent across reboots.
 .El
 .It Xo
@@ -811,9 +811,9 @@ Temporary, not persistent across reboots.
 .Xc
 Display the property values for one or all of the protocols.
 .Bl -tag -width ""
-.It Fl c Ns , Ns Fl -parsable
+.It Fl c Ns \&, Ns Fl -parsable
 Print the output in a parsable format.
-.It Fl o Ns , Ns Fl -output
+.It Fl o Ns \&, Ns Fl -output
 Select which fields will be shown.
 The field value can be one of the following names:
 .Bl -tag -compact -width "PERSISTENT"
@@ -837,7 +837,7 @@ The default value of the property.
 .It Cm POSSIBLE
 The possible values for the property.
 .El
-.It Fl p Ns , Ns Fl -prop
+.It Fl p Ns \&, Ns Fl -prop
 Specify which properties to display.
 See the
 .Nm ipadm Ic set-prop
diff --git a/usr/src/man/man1m/lofiadm.1m b/usr/src/man/man1m/lofiadm.1m
index 750e2c732a..079caf2502 100644
--- a/usr/src/man/man1m/lofiadm.1m
+++ b/usr/src/man/man1m/lofiadm.1m
@@ -264,14 +264,14 @@ encryption key.
 .It Ar token_key
 PKCS#11 token object in the format:
 .Pp
-.Ar token_name Ns : Ns Ar manufacturer_id Ns : Ns Ar serial_number Ns : Ns Ar key_label
+.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
 .Sy MylofiKey ,
-use:
-.Pp
-.Fl T Ar ::: Ns Ar MylofiKey
+use
+.Fl T Sy :::MylofiKey .
 .It Ar wrapped_key_file
 Path to file containing a symmetric encryption key wrapped by the RSA private
 key specified by
diff --git a/usr/src/man/man1m/mount_nfs.1m b/usr/src/man/man1m/mount_nfs.1m
index 4992fa1b7b..caf5d86175 100644
--- a/usr/src/man/man1m/mount_nfs.1m
+++ b/usr/src/man/man1m/mount_nfs.1m
@@ -17,7 +17,7 @@
 .\"
 .\" Copyright 1989 AT&T
 .\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved
-.\" Copyright 2016 Nexenta Systems, Inc.
+.\" Copyright 2017 Nexenta Systems, Inc.
 .\"
 .Dd March 12, 2016
 .Dt MOUNT_NFS 1M
@@ -102,7 +102,7 @@ See
 and
 .Xr inet6 7P .
 .Bl -tag -width Ds
-.It Ar host Ns : Ns Ar pathname
+.It Ar host Ns \&: Ns Ar pathname
 Where
 .Ar host
 is the name of the NFS server host, and
@@ -122,12 +122,12 @@ See the discussion of URLs and the public option under
 .Sx NFS FILE SYSTEMS
 for a more detailed discussion.
 .It Xo
-.Ar host Ns : Ns Ar pathname
+.Ar host Ns \&: Ns Ar pathname
 .No nfs:// Ns Ar host Ns Oo : Ns Ar port Oc Ns / Ns Ar pathname
 .Xc
-.Ar host Ns : Ns Ar pathname
+.Ar host Ns \&: Ns Ar pathname
 is a comma-separated list of
-.Ar host Ns : Ns Ar pathname .
+.Ar host Ns \&: Ns Ar pathname .
 See the discussion of replicated file systems and failover under
 .Sx NFS FILE SYSTEMS
 for a more detailed discussion.
diff --git a/usr/src/man/man1m/share_nfs.1m b/usr/src/man/man1m/share_nfs.1m
index 8a2770cb79..c79b6b9438 100644
--- a/usr/src/man/man1m/share_nfs.1m
+++ b/usr/src/man/man1m/share_nfs.1m
@@ -109,9 +109,9 @@ some other local user.
 For clients where the gid in the incoming request is
 .Ar clnt
 and the client matches the
-.Ar access_list Ns
-, change the group ID to
-.Ar srv Ns .
+.Ar access_list ,
+change the group ID to
+.Ar srv .
 If
 .Ar clnt
 is asterisk (*), all groups are mapped by this rule.
@@ -329,9 +329,9 @@ some other local user.
 For clients where the uid in the incoming request is
 .Ar clnt
 and the client matches the
-.Ar access_list Ns
-, change the user ID to
-.Ar srv Ns .
+.Ar access_list ,
+change the user ID to
+.Ar srv .
 If
 .Ar clnt
 is asterisk (*), all users are mapped by this rule.
@@ -553,7 +553,7 @@ The following example remaps the user with uid
 at client
 .Sy 10.0.0.1
 to user
-.Sy joe Ns :
+.Sy joe :
 .Bd -literal -offset indent
 share -o uidmap=100:joe:@10.0.0.1 /export
 .Ed
diff --git a/usr/src/man/man1m/stmfadm.1m b/usr/src/man/man1m/stmfadm.1m
index d99c31c3b3..1444e35832 100644
--- a/usr/src/man/man1m/stmfadm.1m
+++ b/usr/src/man/man1m/stmfadm.1m
@@ -16,7 +16,7 @@
 .\"
 .\"
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
-.\" Copyright 2016 Nexenta Systems, Inc.
+.\" Copyright 2017 Nexenta Systems, Inc.
 .\"
 .Dd March 1, 2016
 .Dt STMFADM 1M
@@ -247,7 +247,7 @@ Add a host group member to a host group.
 .Pp
 An initiator cannot be a member of more than one host group.
 .Bl -tag -width Ds
-.It Fl g Ns , Ns Fl -group-name Ar host-group
+.It Fl g Ns \&, Ns Fl -group-name Ar host-group
 Specifies group name.
 .Ar host-group
 must be an existing group created using the
@@ -264,7 +264,7 @@ Add a target group member to a target group.
 .Pp
 A target cannot be a member of more than one target group.
 .Bl -tag -width Ds
-.It Fl g Ns , Ns Fl -group-name Ar target-group
+.It Fl g Ns \&, Ns Fl -group-name Ar target-group
 Specifies group name.
 .Ar target-group
 must be an existing group created using the
@@ -300,20 +300,20 @@ and
 .Cm remove-view
 subcommands.
 .Bl -tag -width Ds
-.It Fl h Ns , Ns Fl -host-group Ar host-group
+.It Fl h Ns \&, Ns Fl -host-group Ar host-group
 .Ar host-group
 is the name of an host group previously created using
 .Cm create-hg
 subcommand.
 If this option is not specified, the logical unit will be available to all
 initiators that log in to the STMF framework.
-.It Fl n Ns , Ns Fl -lun Ar lu-number
+.It Fl n Ns \&, Ns Fl -lun Ar lu-number
 .Ar lu-number
 is an integer in the range 0-16383 to be assigned to the logical unit for this
 view entry.
 If this option is not specified, a logical unit number will be assigned by the
 STMF framework.
-.It Fl t Ns , Ns Fl -target-group Ar target-group
+.It Fl t Ns \&, Ns Fl -target-group Ar target-group
 .Ar target-group
 is the name of a target group previously created using
 .Cm create-tg
@@ -365,12 +365,12 @@ subcommand to specify an alternate file to contain the metadata.
 It is advisable to use a file that can provide sufficient storage of the logical
 unit metadata, preferably 64k.
 .Bl -tag -width Ds
-.It Fl p Ns , Ns Fl -lu-prop Ar property Ns = Ns Ar value
+.It Fl p Ns \&, Ns Fl -lu-prop Ar property Ns = Ns Ar value
 Set specified logical unit property.
 Check
 .Sx Logical Unit Properties
 for the list of available properties.
-.It Fl s Ns , Ns Fl -size Ar size
+.It Fl s Ns \&, Ns Fl -size Ar size
 .Ar size
 is an integer followed by one of the following letters, to indicate a unit of
 size:
@@ -407,7 +407,7 @@ subcommand.
 This effectively unloads the logical unit from the STMF framework.
 Any existing data on the logical unit remains intact.
 .Bl -tag -width Ds
-.It Fl k Ns , Ns Fl -keep-views
+.It Fl k Ns \&, Ns Fl -keep-views
 Keep view entries for this logical unit.
 .El
 .It Xo
@@ -449,7 +449,7 @@ If
 .Ar host-group
 is not specified, all host groups in the system will be listed.
 .Bl -tag -width Ds
-.It Fl v Ns , Ns Fl -verbose
+.It Fl v Ns \&, Ns Fl -verbose
 Display all host group members.
 .El
 .It Xo
@@ -464,7 +464,7 @@ If
 .Ar lu-name
 is not specified, all logical units in the system will be listed.
 .Bl -tag -width Ds
-.It Fl v Ns , Ns Fl -verbose
+.It Fl v Ns \&, Ns Fl -verbose
 Display verbose information about the logical unit.
 .El
 .It Xo
@@ -482,7 +482,7 @@ List information for the target port in the system referenced by
 .Ar target .
 If target name is not specified, all target ports in the system will be listed.
 .Bl -tag -width Ds
-.It Fl v Ns , Ns Fl -verbose
+.It Fl v Ns \&, Ns Fl -verbose
 Display verbose information about the target along with SCSI session information
 for logged-in initiators.
 .El
@@ -498,7 +498,7 @@ If
 .Ar target-group
 is not specified, all target groups in the system will be listed.
 .Bl -tag -width Ds
-.It Fl v Ns , Ns Fl -verbose
+.It Fl v Ns \&, Ns Fl -verbose
 Display all group members.
 .El
 .It Xo
@@ -514,7 +514,7 @@ If
 is not specified, all view entries for the specified logical unit will be
 listed.
 .Bl -tag -width Ds
-.It Fl l Ns , Ns Fl -lu-name Ar lu-name
+.It Fl l Ns \&, Ns Fl -lu-name Ar lu-name
 Specify logical unit.
 .El
 .It Xo
@@ -535,18 +535,18 @@ is not specified,
 is interpreted as
 .Ar lu-name.
 .Bl -tag -width Ds
-.It Fl f Ns , Ns Fl -file
+.It Fl f Ns \&, Ns Fl -file
 If specified,
 .Ar lu-arg
 is interpreted as file name.
 This provides the ability to modify a logical unit that is not currently
 imported into the STMF.
-.It Fl p Ns , Ns Fl -lu-prop Ar property
+.It Fl p Ns \&, Ns Fl -lu-prop Ar property
 Modify specified logical unit property.
 See
 .Sx Logical Unit Properties
 for the list of available properties.
-.It Fl s Ns , Ns Fl -size Ar size
+.It Fl s Ns \&, Ns Fl -size Ar size
 .Ar size
 is an integer followed by one of the following letters, to indicate a unit of
 size:
@@ -588,7 +588,7 @@ Remove specified
 .Ar initiator
 from host group
 .Bl -tag -width Ds
-.It Fl g Ns , Ns Fl -group-name Ar host-group
+.It Fl g Ns \&, Ns Fl -group-name Ar host-group
 Specifies group name.
 .Ar host-group
 must be an existing group created using the
@@ -605,7 +605,7 @@ Remove specified
 .Ar target
 from target group.
 .Bl -tag -width Ds
-.It Fl g Ns , Ns Fl -group-name Ar taget-group
+.It Fl g Ns \&, Ns Fl -group-name Ar taget-group
 Specifies group name.
 .Ar target-group
 must be an existing group created using the
@@ -621,9 +621,9 @@ subcommand.
 .Xc
 Remove one or more view entries from a logical unit.
 .Bl -tag -width Ds
-.It Fl a Ns , Ns Fl -all
+.It Fl a Ns \&, Ns Fl -all
 Remove all view entries for this logical unit.
-.It Fl l Ns , Ns Fl -lu-name
+.It Fl l Ns \&, Ns Fl -lu-name
 Specify logical unit.
 .El
 .El
diff --git a/usr/src/man/man1m/zdb.1m b/usr/src/man/man1m/zdb.1m
index f341df4e20..c740628f4f 100644
--- a/usr/src/man/man1m/zdb.1m
+++ b/usr/src/man/man1m/zdb.1m
@@ -41,7 +41,7 @@
 .Nm
 .Fl E
 .Op Fl A
-.Ar word0 Ns : Ns Ar word1 Ns :...: Ns Ar word15
+.Ar word0 Ns \&: Ns Ar word1 Ns :...: Ns Ar word15
 .Nm
 .Fl l
 .Op Fl Aqu
@@ -61,7 +61,7 @@
 .Op Fl A
 .Op Fl e Oo Fl V Oc Op Fl p Ar path ...
 .Op Fl U Ar cache
-.Ar poolname vdev Ns : Ns Ar offset Ns : Ns Ar size Ns Op : Ns Ar flags
+.Ar poolname vdev Ns \&: Ns Ar offset Ns \&: Ns Ar size Ns Op : Ns Ar flags
 .Nm
 .Fl S
 .Op Fl AP
@@ -157,7 +157,7 @@ Display the statistics independently for each deduplication table.
 Dump the contents of the deduplication tables describing duplicate blocks.
 .It Fl DDDDD
 Also dump the contents of the deduplication tables describing unique blocks.
-.It Fl E Ar word0 Ns : Ns Ar word1 Ns :...: Ns Ar word15
+.It Fl E Ar word0 Ns \&: Ns Ar word1 Ns :...: Ns Ar word15
 Decode and display block from an embedded block pointer specified by the
 .Ar word
 arguments.
@@ -218,7 +218,9 @@ must be relative to the root of
 This option can be combined with
 .Fl v
 for increasing verbosity.
-.It Fl R Ar poolname vdev Ns : Ns Ar offset Ns : Ns Ar size Ns Op : Ns Ar flags
+.It Xo
+.Fl R Ar poolname vdev Ns \&: Ns Ar offset Ns \&: Ns Ar size Ns Op : Ns Ar flags
+.Xc
 Read and display a block from the specified device.
 By default the block is displayed as a hex dump, but see the description of the
 .Sy r
diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m
index 926d61cbf0..995b36cb38 100644
--- a/usr/src/man/man1m/zfs.1m
+++ b/usr/src/man/man1m/zfs.1m
@@ -26,7 +26,7 @@
 .\" Copyright (c) 2014, Joyent, Inc. All rights reserved.
 .\" Copyright (c) 2014 by Adam Stevko. All rights reserved.
 .\" Copyright (c) 2014 Integros [integros.com]
-.\" Copyright 2016 Nexenta Systems, Inc.
+.\" Copyright 2017 Nexenta Systems, Inc.
 .\"
 .Dd September 16, 2016
 .Dt ZFS 1M
@@ -1715,7 +1715,7 @@ dataset.
 The
 .Sy nosuid
 option is an alias for
-.Sy nodevices Ns , Ns Sy nosetuid .
+.Sy nodevices Ns \&, Ns Sy nosetuid .
 These properties are reported as
 .Qq temporary
 by the
@@ -1744,7 +1744,7 @@ and underscore
 .Pq Qq Sy _ .
 The expected convention is that the property name is divided into two portions
 such as
-.Em module Ns : Ns Em property ,
+.Em module Ns \&: Ns Em property ,
 but this namespace is not enforced by ZFS.
 User property names can be at most 256 characters, and cannot begin with a dash
 .Pq Qq Sy - .
@@ -2171,7 +2171,7 @@ property is
 .Sy off
 .Pc .
 The following fields are displayed,
-.Sy name Ns , Ns Sy used Ns , Ns Sy available Ns , Ns Sy referenced Ns , Ns
+.Sy name Ns \&, Ns Sy used Ns \&, Ns Sy available Ns \&, Ns Sy referenced Ns \&, Ns
 .Sy mountpoint .
 .Bl -tag -width "-H"
 .It Fl H
@@ -2209,9 +2209,9 @@ The value
 .Sy space
 to display space usage properties on file systems and volumes.
 This is a shortcut for specifying
-.Fl o Sy name Ns , Ns Sy avail Ns , Ns Sy used Ns , Ns Sy usedsnap Ns , Ns
-.Sy usedds Ns , Ns Sy usedrefreserv Ns , Ns Sy usedchild Fl t
-.Sy filesystem Ns , Ns Sy volume
+.Fl o Sy name Ns \&, Ns Sy avail Ns \&, Ns Sy used Ns \&, Ns Sy usedsnap Ns \&, Ns
+.Sy usedds Ns \&, Ns Sy usedrefreserv Ns \&, Ns Sy usedchild Fl t
+.Sy filesystem Ns \&, Ns Sy volume
 syntax.
 .El
 .It Fl p
@@ -2333,7 +2333,7 @@ A depth of
 will display only the dataset and its direct children.
 .It Fl o Ar field
 A comma-separated list of columns to display.
-.Sy name Ns , Ns Sy property Ns , Ns Sy value Ns , Ns Sy source
+.Sy name Ns \&, Ns Sy property Ns \&, Ns Sy value Ns \&, Ns Sy source
 is the default value.
 .It Fl p
 Display numbers in parsable
@@ -2515,7 +2515,7 @@ Print only the specified types from the following set:
 .Sy posixgroup ,
 .Sy smbgroup .
 The default is
-.Fl t Sy posixuser Ns , Ns Sy smbuser .
+.Fl t Sy posixuser Ns \&, Ns Sy smbuser .
 The default can be changed to include group types.
 .El
 .It Xo
@@ -2533,7 +2533,7 @@ filesystem or snapshot.
 This subcommand is identical to
 .Nm zfs Cm userspace ,
 except that the default types to display are
-.Fl t Sy posixgroup Ns , Ns Sy smbgroup .
+.Fl t Sy posixgroup Ns \&, Ns Sy smbgroup .
 .It Xo
 .Nm
 .Cm mount
@@ -2673,7 +2673,7 @@ snapshot to the second snapshot.
 For example,
 .Fl I Em @a Em fs@d
 is similar to
-.Fl i Em @a Em fs@b Ns ; Fl i Em @b Em fs@c Ns ; Fl i Em @c Em fs@d .
+.Fl i Em @a Em fs@b Ns \&; Fl i Em @b Em fs@c Ns \&; Fl i Em @c Em fs@d .
 The incremental source may be specified as with the
 .Fl i
 option.
diff --git a/usr/src/man/man1m/zpool.1m b/usr/src/man/man1m/zpool.1m
index 61e456ad04..3efb9930af 100644
--- a/usr/src/man/man1m/zpool.1m
+++ b/usr/src/man/man1m/zpool.1m
@@ -21,7 +21,7 @@
 .\"
 .\" Copyright (c) 2007, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright (c) 2013 by Delphix. All rights reserved.
-.\" Copyright 2016 Nexenta Systems, Inc.
+.\" Copyright 2017 Nexenta Systems, Inc.
 .\"
 .Dd Oct 2, 2016
 .Dt ZPOOL 1M
@@ -985,7 +985,7 @@ Do not display headers, and separate fields by a single tab instead of arbitrary
 space.
 .It Fl o Ar field
 A comma-separated list of columns to display.
-.Sy name Ns , Ns Sy property Ns , Ns Sy value Ns , Ns Sy source
+.Sy name Ns \&, Ns Sy property Ns \&, Ns Sy value Ns \&, Ns Sy source
 is the default value.
 .It Fl p
 Display numbers in parsable (exact) values.