Merge branch 'PR/libmount-utab-event' of github.com:karelzak/util-linux-work

[thirdparty/util-linux.git] / misc-utils / blkid.8.adoc

diff --git a/misc-utils/blkid.8.adoc b/misc-utils/blkid.8.adoc
index 819f03095dc9dc7bb81efa98b3e74c2c47da4f71..5e8002d73d317e86ed9abdc8a798dc6e2ebd1ed5 100644 (file)
--- a/misc-utils/blkid.8.adoc
+++ b/misc-utils/blkid.8.adoc
@@ -17,7 +17,7 @@ blkid - locate/print block device attributes
 
 *blkid* *--label* _label_ | *--uuid* _uuid_
 
-*blkid* [*--no-encoding* *--garbage-collect* *--list-one* *--cache-file* _file_] [*--output* _format_][*--match-tag* _tag_] [*--match-token* _NAME=value_] [_device_...]
+*blkid* [*--no-encoding* *--garbage-collect* *--list-one* *--cache-file* _file_] [*--output* _format_] [*--match-tag* _tag_] [*--match-token* _NAME=value_] [_device_...]
 
 *blkid* *--probe* [*--offset* _offset_] [*--output* _format_] [*--size* _size_] [*--match-tag* _tag_] [*--match-types* _list_] [*--usages* _list_] [*--no-part-details*] _device_...
 
@@ -44,7 +44,7 @@ For security reasons *blkid* silently ignores all devices where the probing resu
 The _size_ and _offset_ arguments may be followed by the multiplicative suffixes like KiB (=1024), MiB (=1024*1024), and so on for GiB, TiB, PiB, EiB, ZiB and YiB (the "iB" is optional, e.g., "K" has the same meaning as "KiB"), or the suffixes KB (=1000), MB (=1000*1000), and so on for GB, TB, PB, EB, ZB and YB.
 
 *-c*, *--cache-file* _cachefile_::
-Read from _cachefile_ instead of reading from the default cache file (see the CONFIGURATION FILE section for more details). If you want to start with a clean cache (i.e., don't report devices previously scanned but not necessarily available at this time), specify _/dev/null_.
+Read from _cachefile_ instead of reading from the default cache file (see the *CONFIGURATION FILE* section for more details). If you want to start with a clean cache (i.e., don't report devices previously scanned but not necessarily available at this time), specify _/dev/null_.
 
 *-d*, *--no-encoding*::
 Don't encode non-printing characters. The non-printing characters are encoded by ^ and M- notation by default. Note that the *--output udev* output format uses a different encoding which cannot be disabled.
@@ -55,8 +55,10 @@ Don't print information (PART_ENTRY_* tags) from partition table in low-level pr
 *-g*, *--garbage-collect*::
 Perform a garbage collection pass on the blkid cache to remove devices which no longer exist.
 
-*-h*, *--help*::
-Display a usage message and exit.
+*-H*, *--hint* _setting_::
+Set probing hint. The hints are an optional way to force probing functions to
+check, for example, another location. The currently supported is
+"session_offset=_number_" to set session offset on multi-session UDF.
 
 *-i*, *--info*::
 Display information about I/O Limits (aka I/O topology). The 'export' output format is automatically enabled. This option can be used together with the *--probe* option.
@@ -141,8 +143,7 @@ probes for all supported formats except RAIDs. This option is only useful togeth
 *-U*, *--uuid* _uuid_::
 Look up the device that uses this filesystem _uuid_. For more details see the *--label* option.
 
-*-V*, *--version*::
-Display version number and exit.
+include::man-common/help-version.adoc[]
 
 == EXIT STATUS
 
@@ -156,7 +157,7 @@ If an ambivalent probing result was detected by low-level probing mode (*-p*), a
 
 == CONFIGURATION FILE
 
-The standard location of the _/etc/blkid.conf_ config file can be overridden by the environment variable BLKID_CONF. The following options control the libblkid library:
+The standard location of the _/etc/blkid.conf_ config file can be overridden by the environment variable *BLKID_CONF*. The following options control the libblkid library:
 
 _SEND_UEVENT=<yes|not>_::
 Sends uevent when _/dev/disk/by-{label,uuid,partuuid,partlabel}/_ symlink does not match with LABEL, UUID, PARTUUID or PARTLABEL on the device. Default is "yes".
@@ -182,10 +183,10 @@ Setting _LIBBLKID_DEBUG=all_ enables debug output.
 *lsblk*(8),
 *wipefs*(8)
 
-include::../man-common/bugreports.adoc[]
+include::man-common/bugreports.adoc[]
 
-include::../man-common/footer.adoc[]
+include::man-common/footer.adoc[]
 
 ifdef::translation[]
-include::../man-common/translation.adoc[]
+include::man-common/translation.adoc[]
 endif::[]