Skip to content

Commit 1b37cc1

Browse files
nabijaczlewelibehlendorf
authored andcommitted
Consistentify miscellaneous style on remaining manpages
Most notably this fixes the vdev_id(8) non-.Xrs in vdev_id.conf.5 Reviewed-by: Richard Laager <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #12212
1 parent 2badb34 commit 1b37cc1

File tree

8 files changed

+65
-64
lines changed

8 files changed

+65
-64
lines changed

man/man1/arcstat.1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
.Sh SYNOPSIS
2323
.Nm
2424
.Op Fl havxp
25-
.Op Fl f Ar field Ns Op , Ns Ar field Ns ...
25+
.Op Fl f Ar field Ns Op , Ns Ar field Ns
2626
.Op Fl o Ar file
2727
.Op Fl s Ar string
2828
.Op Ar interval
@@ -31,7 +31,7 @@
3131
.Sh DESCRIPTION
3232
.Nm
3333
prints various ZFS ARC and L2ARC statistics in vmstat-like fashion:
34-
.Bl -tag -width "l2asize"
34+
.Bl -tag -compact -offset Ds -width "l2asize"
3535
.It Sy c
3636
ARC target size
3737
.It Sy dh%
@@ -155,7 +155,7 @@ Print all possible stats.
155155
.It Fl f
156156
Display only specific fields.
157157
See
158-
.Sy DESCRIPTION
158+
.Sx DESCRIPTION
159159
for supported statistics.
160160
.It Fl h
161161
Display help message.
@@ -166,17 +166,19 @@ Disable auto-scaling of numerical fields (for raw, machine-parsable values).
166166
.It Fl s
167167
Display data with a specified separator (default: 2 spaces).
168168
.It Fl x
169-
Print extended stats (same as
170-
.Fl f Ar time,mfu,mru,mfug,mrug,eskip,mtxmis,dread,pread,read Ns No ).
169+
Print extended stats
170+
.Pq same as Fl f Sy time , Ns Sy mfu , Ns Sy mru , Ns Sy mfug , Ns Sy mrug , Ns Sy eskip , Ns Sy mtxmis , Ns Sy dread , Ns Sy pread , Ns Sy read .
171171
.It Fl v
172172
Show field headers and definitions
173173
.El
174174
.
175175
.Sh OPERANDS
176176
The following operands are supported:
177-
.Bl -tag -width "interval"
177+
.Bl -tag -compact -offset Ds -width "interval"
178178
.It Ar interval
179179
Specify the sampling interval in seconds.
180180
.It Ar count
181-
Display only \fIcount\fR reports.
181+
Display only
182+
.Ar count
183+
reports.
182184
.El

man/man1/cstyle.1

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
.Nm
3232
.Op Fl chpvCP
3333
.Op Fl o Ar construct Ns Op , Ns Ar construct Ns
34-
.Op Ar file…
34+
.Oo Ar file Oc Ns
3535
.Sh DESCRIPTION
3636
.Nm
3737
inspects C source files (*.c and *.h) for common stylistic errors.
@@ -99,7 +99,7 @@ Allow doxygen-style block comments
9999
.Pq Sy /** No and Sy /*!\& .
100100
.It Sy splint
101101
Allow splint-style lint comments
102-
.Pq Sy /*@...@*/ .
102+
.Pq Sy /*@ Ns ... Ns Sy @*/ .
103103
.El
104104
.El
105105
.
@@ -118,43 +118,42 @@ statement has balanced parenthesis.
118118
.It
119119
Some
120120
.Xr cpp 1
121-
macros do not require \fB;\fPs after them.
121+
macros do not require
122+
.Sy ;\& Ns s after them.
122123
Any such macros
123124
.Em must
124125
be ALL_CAPS; any lower case letters will cause bad output.
125126
.Pp
126-
The bad output will generally be corrected after the next \fB;\fP,
127-
.Sy { ,
128-
or
129-
.Sy } .
127+
The bad output will generally be corrected after the next
128+
.Sy ;\& , { , No or Sy } .
130129
.El
131130
Some continuation error messages deserve some additional explanation:
132131
.Bl -tag -width Ds
133132
.It Sy multiple statements continued over multiple lines
134133
A multi-line statement which is not broken at statement boundaries.
135134
For example:
136-
.Bd -literal
135+
.Bd -literal -compact -offset Ds
137136
if (this_is_a_long_variable == another_variable) a =
138137
b + c;
139138
.Ed
140139
.Pp
141140
Will trigger this error.
142141
Instead, do:
143-
.Bd -literal
142+
.Bd -literal -compact -offset Ds
144143
if (this_is_a_long_variable == another_variable)
145144
a = b + c;
146145
.Ed
147146
.It Sy empty if/for/while body not on its own line
148147
For visibility, empty bodies for if, for, and while statements should be
149148
on their own line.
150149
For example:
151-
.Bd -literal
150+
.Bd -literal -compact -offset Ds
152151
while (do_something(&x) == 0);
153152
.Ed
154153
.Pp
155154
Will trigger this error.
156155
Instead, do:
157-
.Bd -literal
156+
.Bd -literal -compact -offset Ds
158157
while (do_something(&x) == 0)
159158
;
160159
.Ed

man/man1/raidz_test.1

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,44 +50,44 @@ option.
5050
.Bl -tag -width "-B(enchmark)"
5151
.It Fl h
5252
Print a help summary.
53-
.It Fl a Ar ashift No (default: Sy 9 )
53+
.It Fl a Ar ashift Pq default: Sy 9
5454
Ashift value.
55-
.It Fl o Ar zio_off_shift No (default: Sy 0 )
55+
.It Fl o Ar zio_off_shift Pq default: Sy 0
5656
ZIO offset for each raidz block.
5757
The offset's value is
58-
.Sy 1 << zio_off_shift .
59-
.It Fl d Ar raidz_data_disks No (default: Sy 8 )
58+
.Em 2^zio_off_shift .
59+
.It Fl d Ar raidz_data_disks Pq default: Sy 8
6060
Number of raidz data disks to use.
6161
Additional disks will be used for parity.
62-
.It Fl s Ar zio_size_shift No (default: Sy 19 )
62+
.It Fl s Ar zio_size_shift Pq default: Sy 19
6363
Size of data for raidz block.
6464
The real size is
65-
.Sy 1 << zio_size_shift .
66-
.It Fl r Ar reflow_offset No (default: Sy uint max )
65+
.Em 2^zio_size_shift .
66+
.It Fl r Ar reflow_offset Pq default: Sy uint max
6767
Set raidz expansion offset.
6868
The expanded raidz map allocation function will
6969
produce different map configurations depending on this value.
70-
.It Fl S Ns No (weep)
70+
.It Fl S Ns Pq weep
7171
Sweep parameter space while verifying the raidz implementations.
7272
This option
7373
will exhaust all most of valid values for the
7474
.Fl aods
7575
options.
7676
Runtime using this option will be long.
77-
.It Fl t Ns No (imeout)
77+
.It Fl t Ns Pq imeout
7878
Wall time for sweep test in seconds.
7979
The actual runtime could be longer.
80-
.It Fl B Ns No (enchmark)
80+
.It Fl B Ns Pq enchmark
8181
All implementations are benchmarked using increasing per disk data size.
8282
Results are given as throughput per disk, measured in MiB/s.
83-
.It Fl e Ns No (xpansion)
83+
.It Fl e Ns Pq xpansion
8484
Use expanded raidz map allocation function.
85-
.It Fl v Ns No (erbose)
85+
.It Fl v Ns Pq erbose
8686
Increase verbosity.
87-
.It Fl T Ns No (est the test)
87+
.It Fl T Ns Pq est the test
8888
Debugging option: fail all tests.
8989
This is to check if tests would properly verify bit-exactness.
90-
.It Fl D Ns No (ebug)
90+
.It Fl D Ns Pq ebug
9191
Debugging option: attach
9292
.Xr gdb 1
9393
when

man/man1/zhack.1

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Can be specified more than once.
119119
.
120120
.Sh EXAMPLES
121121
.Bd -literal
122-
# zhack feature stat tank
122+
.No # Nm zhack Cm feature stat Ar tank
123123
for_read_obj:
124124
org.illumos:lz4_compress = 0
125125
for_write_obj:
@@ -130,10 +130,8 @@ descriptions_obj:
130130
com.delphix:empty_bpobj = Snapshots use less space.
131131
org.illumos:lz4_compress = LZ4 compression algorithm support.
132132

133-
# zhack feature enable -d 'Predict future disk failures.' \\
134-
tank com.example:clairvoyance
135-
136-
# zhack feature ref tank com.example:clairvoyance
133+
.No # Nm zhack Cm feature enable Fl d No 'Predict future disk failures.' Ar tank com.example:clairvoyance
134+
.No # Nm zhack Cm feature ref Ar tank com.example:clairvoyance
137135
.Ed
138136
.
139137
.Sh SEE ALSO

man/man5/vdev_id.conf.5

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
.
1515
.Sh NAME
1616
.Nm vdev_id.conf
17-
.Nd Configuration file for vdev_id
17+
.Nd configuration file for vdev_id(8)
1818
.Sh DESCRIPTION
1919
.Nm
2020
is the configuration file for
21-
.Nm vdev_id Ns Sy (8) .
21+
.Xr vdev_id 8 .
2222
It controls the default behavior of
23-
.Nm vdev_id Ns Sy (8)
23+
.Xr vdev_id 8
2424
while it is mapping a disk device name to an alias.
2525
.Pp
2626
The
@@ -37,7 +37,7 @@ Maps a device link in the
3737
.Pa /dev
3838
directory hierarchy to a new device name.
3939
The udev rule defining the device link must have run prior to
40-
.Nm vdev_id Ns Sy (8) .
40+
.Xr vdev_id 8 .
4141
A defined alias takes precedence over a topology-derived name, but the
4242
two naming methods can otherwise coexist.
4343
For example, one might name drives in a JBOD with the
@@ -94,12 +94,12 @@ and a default mapping applied to the others.
9494
.
9595
.It Sy multipath Sy yes Ns | Ns Sy no
9696
Specifies whether
97-
.Nm vdev_id Ns Sy (8)
97+
.Xr vdev_id 8
9898
will handle only dm-multipath devices.
9999
If set to
100100
.Sy yes
101101
then
102-
.Nm vdev_id Ns Sy (8)
102+
.Xr vdev_id 8
103103
will examine the first running component disk of a dm-multipath
104104
device as provided by the driver command to determine the physical path.
105105
.
@@ -116,7 +116,7 @@ channels are uniquely identified by a SAS switch port number
116116
.It Sy phys_per_port Ar num
117117
Specifies the number of PHY devices associated with a SAS HBA port or SAS
118118
switch port.
119-
.Nm vdev_id Ns Sy (8)
119+
.Xr vdev_id 8
120120
internally uses this value to determine which HBA or switch port a
121121
device is connected to.
122122
The default is
@@ -157,13 +157,13 @@ may be unstable across disk replacement.
157157
.Bl -tag -width "-v v"
158158
.It Pa /etc/zfs/vdev_id.conf
159159
The configuration file for
160-
.Nm vdev_id Ns Sy (8) .
160+
.Xr vdev_id 8 .
161161
.El
162162
.
163163
.Sh EXAMPLES
164164
A non-multipath configuration with direct-attached SAS enclosures and an
165165
arbitrary slot re-mapping:
166-
.Bd -literal -offset Ds
166+
.Bd -literal -compact -offset Ds
167167
multipath no
168168
topology sas_direct
169169
phys_per_port 4
@@ -195,8 +195,8 @@ slot 4 3
195195
A SAS-switch topology.
196196
Note, that the
197197
.Ar channel
198-
keyword takes only two arguments in this example.
199-
.Bd -literal -offset Ds
198+
keyword takes only two arguments in this example:
199+
.Bd -literal -compact -offset Ds
200200
topology sas_switch
201201

202202
# SWITCH PORT CHANNEL NAME
@@ -207,9 +207,8 @@ channel 4 D
207207
.Ed
208208
.Pp
209209
A multipath configuration.
210-
Note that channel names have multiple
211-
definitions - one per physical path.
212-
.Bd -literal -offset Ds
210+
Note that channel names have multiple definitions - one per physical path:
211+
.Bd -literal -compact -offset Ds
213212
multipath yes
214213

215214
# PCI_SLOT HBA PORT CHANNEL NAME
@@ -219,8 +218,8 @@ channel 86:00.0 1 A
219218
channel 86:00.0 0 B
220219
.Ed
221220
.Pp
222-
A configuration with enclosure_symlinks enabled.
223-
.Bd -literal -offset Ds
221+
A configuration with enclosure_symlinks enabled:
222+
.Bd -literal -compact -offset Ds
224223
multipath yes
225224
enclosure_symlinks yes
226225

@@ -230,17 +229,16 @@ channel 05:00.0 0 L
230229
channel 06:00.0 1 U
231230
channel 06:00.0 0 L
232231
.Ed
233-
.Pp
234232
In addition to the disks symlinks, this configuration will create:
235-
.Bd -literal -offset Ds
233+
.Bd -literal -compact -offset Ds
236234
/dev/by-enclosure/enc-L0
237235
/dev/by-enclosure/enc-L1
238236
/dev/by-enclosure/enc-U0
239237
/dev/by-enclosure/enc-U1
240238
.Ed
241239
.Pp
242-
A configuration using device link aliases.
243-
.Bd -literal -offset Ds
240+
A configuration using device link aliases:
241+
.Bd -literal -compact -offset Ds
244242
# by-vdev
245243
# name fully qualified or base name of device link
246244
alias d1 /dev/disk/by-id/wwn-0x5000c5002de3b9ca

man/man8/fsck.zfs.8

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,19 @@ interface still allows it to communicate some errors: if the
5858
.Ar dataset
5959
is in a degraded pool, then
6060
.Nm
61-
will return exit code 4 to indicate an uncorrected filesystem error.
61+
will return exit code
62+
.Sy 4
63+
to indicate an uncorrected filesystem error.
6264
.Pp
6365
Similarly, if the
6466
.Ar dataset
6567
is in a faulted pool and has a legacy
6668
.Pa /etc/fstab
6769
record, then
6870
.Nm
69-
will return exit code 8 to indicate a fatal operational error.
71+
will return exit code
72+
.Sy 8
73+
to indicate a fatal operational error.
7074
.Sh SEE ALSO
7175
.Xr fstab 5 ,
7276
.Xr fsck 8 ,

man/man8/zed.8.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ is sourced by scripts; these variables should be prefixed with
147147
The zevent nvpairs are passed to ZEDLETs as environment variables.
148148
Each nvpair name is converted to an environment variable in the following
149149
manner:
150-
.Bl -enum
150+
.Bl -enum -compact
151151
.It
152152
it is prefixed with
153153
.Sy ZEVENT_ ,
@@ -160,7 +160,7 @@ each non-alphanumeric character is converted to an underscore.
160160
Some additional environment variables have been defined to present certain
161161
nvpair values in a more convenient form.
162162
An incomplete list of zevent environment variables is as follows:
163-
.Bl -tag -width "ZEVENT_TIME_STRING"
163+
.Bl -tag -compact -width "ZEVENT_TIME_STRING"
164164
.It Sy ZEVENT_EID
165165
The Event IDentifier.
166166
.It Sy ZEVENT_CLASS
@@ -187,7 +187,7 @@ An almost-RFC3339-compliant string for
187187
.El
188188
.Pp
189189
Additionally, the following ZED & ZFS variables are defined:
190-
.Bl -tag -width "ZEVENT_TIME_STRING"
190+
.Bl -tag -compact -width "ZEVENT_TIME_STRING"
191191
.It Sy ZED_PID
192192
The daemon's process ID.
193193
.It Sy ZED_ZEDLET_DIR

man/man8/zpool_influxdb.8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
.Op Fl e Ns | Ns Fl -execd
3333
.Op Fl n Ns | Ns Fl -no-histogram
3434
.Op Fl s Ns | Ns Fl -sum-histogram-buckets
35-
.Op Fl t Ns | Ns Fl -tags Ar key Ns = Ns Ar value Ns Op , Ns Ar key Ns = Ns Ar value Ns
35+
.Op Fl t Ns | Ns Fl -tags Ar key Ns = Ns Ar value Ns Oo , Ns Ar key Ns = Ns Ar value Oc Ns
3636
.Op Ar pool
3737
.
3838
.Sh DESCRIPTION
@@ -80,7 +80,7 @@ By default, the values are not accumulated and the raw data appears as shown by
8080
.Nm zpool Cm iostat .
8181
This works well for Grafana's heatmap plugin.
8282
Summing the buckets produces output similar to Prometheus histograms.
83-
.It Fl t , Fl -tags Ar key Ns = Ns Ar value Ns Op , Ns Ar key Ns = Ns Ar value Ns
83+
.It Fl t , Fl -tags Ar key Ns = Ns Ar value Ns Oo , Ns Ar key Ns = Ns Ar value Oc Ns
8484
Adds specified tags to the tag set.
8585
No sanity checking is performed.
8686
See the InfluxDB Line Protocol format documentation for details on escaping

0 commit comments

Comments
 (0)