aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2017-09-01 17:38:49 +0000
committerAndriy Gapon <avg@FreeBSD.org>2017-09-01 17:38:49 +0000
commit7d823d46e55ae8e45e1b2e2b4c6d2c6572d33374 (patch)
treeb897c60db720f5a4953903e00a29810429da27dc /man
parent1493f2aba32256a05805b46be5212fdf00d3258e (diff)
downloadsrc-7d823d46e55ae8e45e1b2e2b4c6d2c6572d33374.tar.gz
src-7d823d46e55ae8e45e1b2e2b4c6d2c6572d33374.zip
8547 update mandoc to 1.14.3
illumos/illumos-gate@c66b8046543352459a11a51501b628d1c98a8c44 https://github.com/illumos/illumos-gate/commit/c66b8046543352459a11a51501b628d1c98a8c44 https://www.illumos.org/issues/8547 update mandoc (now it's the official name) suite to new upstream version, which among a lot of fixes, brings in much improved eqn(5)/tbl(5) support. Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Richard Lowe <richlowe@richlowe.net> Author: Yuri Pankov <yuri.pankov@nexenta.com>
Notes
Notes: svn path=/vendor/illumos/dist/; revision=323106
Diffstat (limited to 'man')
-rw-r--r--man/man1m/zdb.1m10
-rw-r--r--man/man1m/zfs.1m22
-rw-r--r--man/man1m/zpool.1m4
3 files changed, 19 insertions, 17 deletions
diff --git a/man/man1m/zdb.1m b/man/man1m/zdb.1m
index f341df4e202a..c740628f4f9d 100644
--- a/man/man1m/zdb.1m
+++ b/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/man/man1m/zfs.1m b/man/man1m/zfs.1m
index 37df882728eb..aacb0b8fe2ee 100644
--- a/man/man1m/zfs.1m
+++ b/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
@@ -1709,7 +1709,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
@@ -1738,7 +1738,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 - .
@@ -2165,7 +2165,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
@@ -2203,9 +2203,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
@@ -2327,7 +2327,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
@@ -2509,7 +2509,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
@@ -2527,7 +2527,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
@@ -2667,7 +2667,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/man/man1m/zpool.1m b/man/man1m/zpool.1m
index 61e456ad0402..3efb9930af45 100644
--- a/man/man1m/zpool.1m
+++ b/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.