New upstream version 3.1.00-1upstream/3.1.00-1

1 files changed, 317 insertions, 79 deletions

diff --git a/inxi.1 b/inxi.1
index 09dd819..6c48ca3 100644
--- a/inxi.1
+++ b/inxi.1
@@ -1,21 +1,24 @@
-.TH INXI 1 "2020\-03\-14" inxi "inxi manual"
+.TH INXI 1 "2020\-04\-22" inxi "inxi manual"
+
 .SH NAME
 inxi  \- Command line system information script for console and IRC
+
 .SH SYNOPSIS
 \fBinxi\fR
 
-\fBinxi\fR [\fB\-AbBCdDfFGhiIlmMnNopPrRsSuUVwzZ\fR]
+\fBinxi\fR [\fB\-AbBCdDfFGhijJIlmMnNopPrRsSuUVwzZ\fR]
 
 \fBinxi\fR [\fB\-c NUMBER\fR] [\fB\-t\fR 
 [\fBc\fR|\fBm\fR|\fBcm\fR|\fBmc\fR][\fBNUMBER\fR]] 
 [\fB\-v NUMBER\fR] [\fB\-W LOCATION\fR] 
 [\fB\-\-weather\-unit\fR {\fBm\fR|\fBi\fR|\fBmi\fR|\fBim\fR}] [\fB\-y WIDTH\fR] 
+
 \fBinxi\fR [\fB\-\-memory\-modules\fR] [\fB\-\-memory\-short\fR] 
-[\fB\-\-recommends\fR] [\fB\-\-slots\fR] [\fB\-\-usb\fR]
+[\fB\-\-recommends\fR] [\fB\-\-slots\fR]
 
-\fBinxi\fB [\fB\-x\fR|\fB\-xx\fR|\fB\-xxx\fR|\fB\-a\fR|\fB\-\-admin\fR] \fB\-OPTION(s)\fR
+\fBinxi\fB [\fB\-x\fR|\fB\-xx\fR|\fB\-xxx\fR|\fB\-a\fR] \fB\-OPTION(s)\fR
 
-All options have long form variants \- see below for these and more advanced options.
+All short form options have long form variants \- see below for these and more advanced options.
 
 .SH DESCRIPTION
 \fBinxi\fR is a command line system information script built for console
@@ -44,23 +47,28 @@ Options can be combined if they do not conflict. You can either group the letter
 together or separate them.
 
 Letters with numbers can have no gap or a gap at your discretion, except when
-using \fB \-t\fR.
+using \fB \-t\fR. Note that if you use an option that requires an additional
+argument, that must be last in the short form group of options. Otherwise
+you can use those separately as well.
 
 For example:
-.B inxi
-\fB\-AG\fR or \fBinxi \-A \-G\fR or \fBinxi \-c10\fR
+\fBinxi \-AG\fR | \fBinxi \-A \-G\fR | \fBinxi \-b\fR | \fBinxi \-c10\fR 
+| \fBinxi \-FxxzJy80\fR
 
 Note that all the short form options have long form equivalents, which are
 listed below. However, usually the short form is used in examples in order to
 keep things simple.
 
 .SH STANDARD OPTIONS
+
 .TP
 .B \-A\fR,\fB \-\-audio\fR
 Show Audio/sound card(s) information, including card driver.
+
 .TP
 .B \-b\fR,\fB \-\-basic\fR
 Show basic output, short form. Same as: \fBinxi \-v 2\fR
+
 .TP
 .B \-B\fR,\fB \-\-battery\fR
 Show system battery (\fBID\-x\fR) data, charge, condition, plus extra information 
@@ -99,27 +107,34 @@ piped or redirected. You must use the explicit runtime \fB\-c <color number>\fR
 if you want color codes to be present in the piped/redirected output.
 
 Color selectors for each type display (NOTE: IRC and global only show safe color set):
+
 .TP
 .B \-c 94\fR
 \- Console, out of X.
+
 .TP
 .B \-c 95\fR
 \- Terminal, running in X \- like xTerm.
+
 .TP
 .B \-c 96\fR
 \- GUI IRC, running in X \- like XChat, Quassel,
 Konversation etc.
+
 .TP
 .B \-c 97\fR
 \- Console IRC running in X \- like irssi in xTerm.
+
 .TP
 .B \-c 98\fR
 \- Console IRC not in  X.
+
 .TP
 .B \-c 99\fR
 \- Global \- Overrides/removes all settings.
 
 Setting a specific color type removes the global color selection.
+
 .TP
 .B \-C\fR,\fB \-\-cpu\fR
 Show full CPU output, including per CPU clock speed and CPU max speed (if available).
@@ -146,9 +161,10 @@ The details for each CPU include a technical description e.g. \fBtype: MT MCP\fR
 .B \-d\fR,\fB \-\-disk\-full\fR,\fB\-\-optical\fR
 Show optical drive data as well as \fB\-D\fR hard drive data. With \fB\-x\fR, adds a
 feature line to the output. Also shows floppy disks if present. Note that there is
-no current way to get any information about the floppy device that I am aware of,
+no current way to get any information about the floppy device that we are aware of,
 so it will simply show the floppy ID without any extra data. \fB\-xx\fR adds a
 few more features.
+
 .TP
 .B \-D\fR,\fB \-\-disk\fR
 Show Hard Disk info. Shows total disk space and used percentage. The disk used 
@@ -162,20 +178,39 @@ has no access to the used amount.
 Also shows per disk information: Disk ID, type (if present), vendor (if detected), 
 model, and size. See \fBExtra Data Options\fR (\fB\-x\fR options) and 
 \fBAdmin Extra Data Options\fR (\fB\-\-admin\fR options) for many more features.
+
+.TP
+.B \-\-filter\fR,\fB \-\-filter\-override\fR \- See \fB\-z\fR, \fB\-Z\fR.
+
+.TP
+.B \-\-filter\-label\fR
+Filter partition label names from \fB\-j\fR, \fB\-o\fR, \fB\-p\fR, 
+\fB\-P\fR, and \fB\-Sa\fR (root=LABEL=...). Generally only useful in 
+very specialized cases.
+
+.TP
+.B \-\-filter\-uuid\fR
+Filter partition UUIDs from \fB\-j\fR, \fB\-o\fR, \fB\-p\fR, 
+\fB\-P\fR, and \fB\-Sa\fR (root=UUID=...). Generally only useful in 
+very specialized cases.
+
 .TP
 .B \-f\fR,\fB \-\-flags\fR
 Show all CPU flags used, not just the short list. Not shown with \fB\-F\fR in order
 to avoid spamming. ARM CPUs: show \fBfeatures\fR items.
+
 .TP
 .B \-F\fR,\fB \-\-full\fR
 Show Full output for inxi. Includes all Upper Case line letters except \fB\-W\fR,
-plus \fB\-s\fR and \fB\-n\fR. Does not show extra verbose options such as
+plus \fB\-\-swap\fR, \fB\-s\fR and \fB\-n\fR. Does not show extra verbose options such as
 \fB\-d \-f \-i \-l \-m \-o \-p \-r \-t \-u \-x\fR unless you use those arguments in
 the command, e.g.: \fBinxi \-Frmxx\fR
+
 .TP
 .B \-G\fR,\fB \-\-graphics\fR
 Show Graphic card(s) information, including details of card and card driver,
-display protocol (if available), display server (vendor and version number), e.g.:
+display protocol (if available), display server (and/or Wayland compositor), 
+vendor and version number, e.g.:
 
 \fBDisplay: x11 server: Xorg 1.15.1\fR
 
@@ -183,15 +218,18 @@ If protocol is not detected, shows:
 
 \fBDisplay: server: Xorg 1.15.1\fR
 
-Also shows screen resolution(s), OpenGL renderer, OpenGL core profile version/OpenGL
-version.
+Also shows screen resolution(s) (per monitor/X screen), OpenGL renderer, 
+OpenGL core profile version/OpenGL version.
+
+Compositor information will show if detected using \fB\-xx\fR option
+or always if detected and Wayland.
 
-Compositor information will show if detected using \fB\-xx\fR option.
 .TP
 .B \-h\fR,\fB \-\-help\fR
 The help menu. Features dynamic sizing to fit into terminal window. Set script
 global \fBCOLS_MAX_CONSOLE\fR if you want a different default value, or
 use \fB\-y <width>\fR to temporarily override the defaults or actual window width.
+
 .TP
 .B \-i\fR,\fB \-\-ip\fR
 Show WAN IP address and local interfaces (latter requires \fBifconfig\fR or
@@ -211,10 +249,37 @@ Memory: report of \fB\-m\fR, not in \fB\Info:\fR.
 Rasberry Pi only: uses \fBvcgencmd get_mem gpu\fR to get gpu RAM amount, 
 if user is in video group and \fBvcgencmd\fR is installed. Uses 
 this result to increase the \fBMemory:\fR amount and \fBused:\fR amounts.
+
+.TP
+.B \-j\fR, \fB\-\-swap\fR
+Shows all active swap types (partition, file, zram). When this option is used,
+swap partition(s) will not show on the \fB\-P\fR line to avoid redundancy.
+
+.TP
+.B \-J\fR,\fB \-\-usb\fR
+Show USB data for attached Hubs and Devices. Hubs also show number of ports. 
+Be aware that a port is not always external, some may be internal, and either
+used or unused (for example, a motherboard USB header connector that is not used).
+
+Hubs and Devices are listed in order of BusID.
+
+BusID is generally in this format: BusID\-port[.port][.port]:DeviceID
+
+Device ID is a number created by the kernel, and has no necessary ordering
+or sequence connection, but can be used to match this output to lsusb
+values, which generally shows BusID / DeviceID (except for tree view, which
+shows ports).
+
+Examples: \fBDevice\-3: 4\-3.2.1:2\fR or \fBHub: 4\-0:1\fR
+
+The \fBrev: 2.0\fR item refers to the USB revision number, like \fB1.0\fR or
+\fB3.1\fR.
+
 .TP
 .B \-l\fR,\fB \-\-label\fR
 Show partition labels. Default: main partitions \fB\-P\fR. For full \fB\-p\fR output,
 use: \fB\-pl\fR.
+
 .TP
 .B \-m\fR,\fB \-\-memory\fR
 Memory (RAM) data. Does not display with  \fB\-b\fR or  \fB\-F\fR unless you use \fB\-m\fR
@@ -242,15 +307,18 @@ not dmi data. For most people, the data will be right, but a significant percent
 users will have either a wrong max module size, if present, or max capacity.
 
 See \fB\-\-memory\-modules\fR and \fB\-\-memory\-short\fR if you want a shorter report.
+
 .TP
 .B \-\-memory\-modules\fR
 Memory (RAM) data. Show only RAM arrays and modules in Memory report. 
 Skip empty slots. See \fB\-m\fR.
+
 .TP
 .B \-\-memory\-short\fR
-Memory (RAM) data. Show a one line RAM report in Memory, e.g. 
-\fBReport: arrays: 1 slots: 4 modules: 2 type: DDR4\fR
-See \fB\-m\fR.
+Memory (RAM) data. Show a one line RAM report in Memory. See \fB\-m\fR.
+
+Sample: \fBReport: arrays: 1 slots: 4 modules: 2 type: DDR4\fR
+
 .TP
 .B \-M\fR,\fB \-\-machine\fR
 Show machine data. Device, Motherboard, BIOS, and if present, System Builder (Like Lenovo).
@@ -269,14 +337,17 @@ post an issue and we'll get it fixed if possible.
 
 Due to unreliable vendor data, device type will show: desktop, laptop, notebook, server,
 blade, plus some obscure stuff that inxi is unlikely to ever run on.
+
 .TP
 .B \-n\fR,\fB \-\-network\-advanced\fR
 Show Advanced Network card information in addition to that produced by \fB\-N\fR.
 Shows interface, speed, MAC ID, state, etc.
+
 .TP
 .B \-N\fR,\fB \-\-network\fR
 Show Network card(s) information, including card driver. With \fB\-x\fR, shows PCI BusID, 
 Port number.
+
 .TP
 .B \-o\fR,\fB \-\-unmounted\fR
 Show unmounted partition information (includes UUID and LABEL if available).
@@ -287,14 +358,22 @@ if you have added to \fB/etc/sudoers\fR (sudo v. 1.7 or newer):
 .B <username> ALL = NOPASSWD: /usr/bin/file (sample)
 
 Does not show components (partitions that create the md\-raid array) of md\-raid arrays.
+
 .TP
 .B \-p\fR,\fB \-\-partitions\-full\fR
 Show full Partition information (\fB\-P\fR plus all other detected mounted partitions).
+
 .TP
 .B \-P\fR,\fB \-\-partitions\fR
 Show basic Partition information.
 Shows, if detected: \fB/ /boot /home /opt /tmp /usr /usr/home /var /var/tmp /var/log\fR.
+If \fB\-\-swap\fR is not used, shows active swap partitions (never shows file or 
+zram type swap).
 Use \fB\-p\fR to see all mounted partitions.
+
+.TP
+.B \-\-processes\fR \- See \fB\-t\fR
+
 .TP
 .B \-r\fR,\fB \-\-repos\fR
 Show distro repository data. Currently supported repo types:
@@ -302,7 +381,7 @@ Show distro repository data. Currently supported repo types:
 \fBAPK\fR (Alpine Linux + derived versions)
 
 \fBAPT\fR (Debian, Ubuntu + derived versions, as well as RPM based 
-APT distros like PCLinuxOS or Alt-Linux)
+APT distros like PCLinuxOS or Alt\-Linux)
 
 \fBCARDS\fR (NuTyX + derived versions)
 
@@ -330,6 +409,7 @@ APT distros like PCLinuxOS or Alt-Linux)
 
 More will be added as distro data is collected. If yours is missing please
 show us how to get this information and we'll try to add it.
+
 .TP
 .B \-R\fR,\fB \-\-raid\fR
 Show RAID data. Shows RAID devices, states, levels and components, and
@@ -349,6 +429,7 @@ if there is demand, and reasonable reporting tools.
 .B \-\-recommends\fR
 Checks inxi application dependencies and recommends, as well as directories,
 then shows what package(s) you need to install to add support for each feature.
+
 .TP
 .B \-s\fR,\fB \-\-sensors\fR
 Show output from sensors if sensors installed/configured: Motherboard/CPU/GPU
@@ -359,12 +440,17 @@ if present.
 .TP
 .B \-\-slots\fR
 Show PCI slots with type, speed, and status information.
+
+.TP
+.B \-\-swap\fR \- See \fB\-j\fR
+
 .TP
 .B \-S\fR,\fB \-\-system\fR
 Show System information: host name, kernel, desktop environment (if in X),
 distro. With \fB\-xx\fR show dm \- or startx \- (only shows if present and
 running if out of X), and if in X, with \fB\-xxx\fR show more desktop info,
 e.g. taskbar or panel.
+
 .TP
 .B \-t\fR,\fB \-\-processes\fR
 [\fBc\fR|\fBm\fR|\fBcm\fR|\fBmc NUMBER\fR] Show processes. If no arguments, defaults to \fBcm\fR.
@@ -372,43 +458,27 @@ If followed by a number, shows that number of processes for each type
 (default: \fB5\fR; if in IRC, max: \fB5\fR)
 
 Make sure that there is no space between letters and numbers (e.g. write as \fB\-t cm10\fR).
+
 .TP
 .B \-t c\fR
 \- CPU only. With \fB\-x\fR, also shows memory for that process on same line.
+
 .TP
 .B \-t m\fR
 \- memory only. With \fB\-x\fR, also shows CPU for that process on same line.
 If the \-I line is not triggered, will also show the system RAM used/total
 information.
+
 .TP
 .B \-t cm\fR
 \- CPU+memory. With \fB\-x\fR, shows also CPU or memory for that process on
 same line.
 
 .TP
-.B \-\-usb\fR
-Show USB data for attached Hubs and Devices. Hubs also show number of ports. 
-Be aware that a port is not always external, some may be internal, and either
-used or unused (for example, a motherboard USB header connector that is not used).
-
-Hubs and Devices are listed in order of BusID.
-
-BusID is generally in this format: BusID-port[.port][.port]:DeviceID
-
-Device ID is a number created by the kernel, and has no necessary ordering
-or sequence connection, but can be used to match this output to lsusb
-values, which generally shows BusID / DeviceID (except for tree view, which
-shows ports).
-
-Examples: \fBDevice-3: 4-3.2.1:2\fR or \fBHub: 4-0:1\fR
-
-The \fBrev: 2.0\fR item refers to the USB revision number, like \fB1.0\fR or
-\fB3.1\fR.
-
-.TP
 .B \-u\fR,\fB \-\-uuid\fR
 Show partition UUIDs. Default: main partitions \fB\-P\fR. For full \fB\-p\fR
 output, use: \fB\-pu\fR.
+
 .TP
 .B \-U\fR,\fB \-\-update\fR
 Note \- Maintainer may have disabled this function.
@@ -424,51 +494,65 @@ to that directory. See \fB\-\-man\fR or \fB\-\-no\-man\fR to force or disable
 man install.
 
 .TP
-.B \-V\fR,\fB \-\-version\fR
+.B \-\-usb\fR \- See \fB\-J\fR
+
+.TP
+.B  \-V\fR, \fB\-\-version\fR
 inxi version information. Prints information then exits.
+
 .TP
 .B \-v\fR,\fB \-\-verbosity\fR
 Script verbosity levels. If no verbosity level number is given, 0 is assumed.
 Should not be used with \fB\-b\fR or \fB\-F\fR.
 
 Supported levels: \fB0\-8\fR Examples :\fB inxi \-v 4 \fR or \fB inxi \-v4\fR
+
 .TP
 .B \-v 0
 \- Short output, same as: \fBinxi\fR
+
 .TP
 .B \-v 1
 \- Basic verbose, \fB\-S\fR + basic CPU (cores, type, clock speed, and min/max
 speeds, if available) + \fB\-G\fR + basic Disk + \fB\-I\fR.
+
 .TP
 .B \-v 2
 \- Adds networking card (\fB\-N\fR), Machine (\fB\-M\fR) data, Battery (\fB\-B\fR)
 (if available). Same as: \fBinxi \-b\fR
+
 .TP
 .B \-v 3
 \- Adds advanced CPU (\fB\-C\fR) and network (\fB\-n\fR) data; triggers \fB\-x\fR
 advanced data option.
+
 .TP
 .B \-v 4
 \- Adds partition size/used data (\fB\-P\fR) for (if present):
 \fB/ /home /var/ /boot\fR. Shows full disk data (\fB\-D\fR)
+
 .TP
 .B \-v 5
 \- Adds audio card (\fB\-A\fR), memory/RAM (\fB\-m\fR), sensors (\fB\-s\fR),
-partition label (\fB\-l\fR), UUID (\fB\-u\fR), and short form of
-optical drives.
+partition label (\fB\-l\fR), UUID (\fB\-u\fR), full swap data (\fB\-j\fR), 
+and short form of optical drives.
+
 .TP
 .B \-v 6
-\- Adds full mounted partition data (\fB\-p\fR), unmounted partition data (\fB\-o\fR),
-optical drive data (\fB\-d\fR), USB (\fB\-\-usb\fR); triggers \fB\-xx\fR extra data 
-option.
+\- Adds full mounted partition data (\fB\-p\fR), 
+unmounted partition data (\fB\-o\fR), optical drive data (\fB\-d\fR), 
+USB (\fB\-J\fR); triggers \fB\-xx\fR extra data option.
+
 .TP
 .B \-v 7
 \- Adds network IP data (\fB\-i\fR); triggers \fB\-xxx\fR
+
 .TP
 .B \-v 8
 \- All system data available. Adds Repos (\fB\-r\fR), PCI slots (\fB\-\-slots\fR), 
 processes (\fB\-tcm\fR), admin (\fB\-\-admin\fR). Useful for testing output and to 
 see what data you can get from your system.
+
 .TP
 .B \-w\fR,\fB \-\-weather\fR
 Adds weather line. To get weather for an alternate location, use
@@ -479,6 +563,7 @@ DO NOT USE THIS FEATURE FOR AUTOMATED WEATHER UPDATES! You will be blocked
 from any further access. This feature is not meant for widget type 
 weather monitoring, or Conky type use. It is meant to get weather when you need to 
 see it, for example, on a remote server.
+
 .TP
 .B \-W\fR, \fB\-\-weather\-location <location_string>\fR
 Get weather/time for an alternate location. Accepts postal/zip code[, country],
@@ -489,7 +574,7 @@ Try postal codes with and without country code added. Note that City,State appli
 only to USA, otherwise it's City,Country. If country name (english) does not work,
 try 2 character country code (e.g. Spain: es; Great Britain: gb). 
 
-See \fIhttps://en.wikipedia.org/wiki/ISO_3166-1_alpha-2\fR for current 2 letter 
+See \fIhttps://en.wikipedia.org/wiki/ISO_3166\-1_alpha\-2\fR for current 2 letter 
 country codes.
 
 Use only ASCII letters in city/state/country names.
@@ -500,6 +585,7 @@ Examples: \fB\-W 95623,us\fR OR \fB\-W Boston,MA\fR OR
 DO NOT USE THIS FEATURE FOR AUTOMATED WEATHER UPDATES! Use of automated queries, 
 will result in your access being blocked. If you try to work around the ban, you 
 will be permanently banned from this service.
+
 .TP
 .B \-\-weather\-source\fR, \fB\-\-ws <unit>\fR
 [\fB1\-9\fR] Switches weather data source. Possible values are \fB1\-9\fR. \fB1\-4\fR
@@ -513,26 +599,31 @@ or be removed, so always test to verify which source is being used for each valu
 if that is important to you. Data sources may be added or removed on occasions, so 
 try each one and see which you prefer. If you get unsupported source message, it means 
 that number has not been implemented.
+
 .TP
 .B \-\-weather\-unit <unit>\fR
 [\fBm\fR|\fBi\fR|\fBmi\fR|\fBim\fR] Sets weather units to metric (\fBm\fR), imperial (\fBi\fR), 
 metric (imperial) (\fBmi\fR, default), imperial (metric) (\fBim\fR). If metric or imperial 
 not found,sets to default value, or \fBN/A\fR.
+
 .TP
 .B \-y\fR,\fB \-\-width <integer>\fR
 This is an absolute width override which sets the output line width max.
 Overrides \fBCOLS_MAX_IRC\fR / \fBCOLS_MAX_CONSOLE\fR globals, or the
 actual widths of the terminal. \fB80\fR is the minimum width supported. 
 \fB\-1\fR removes width limits. Example: \fBinxi \-Fxx\ \-y 130\fR
+
 .TP
 .B \-z\fR,\fB \-\-filter\fR
 Adds security filters for IP addresses, serial numbers, MAC, 
 location (\fB\-w\fR), and user home directory name. Removes Host:.
 On by default for IRC clients.
+
 .TP
 .B \-Z\fR,\fB \-\-filter\-override\fR
 Absolute override for output filters. Useful for debugging networking
 issues in IRC for example.
+
 .SH EXTRA DATA OPTIONS
 These options can be triggered by one or more \fB\-x\fR.
 Alternatively, the \fB\-v\fR options trigger them in the following
@@ -553,6 +644,7 @@ OR
 
 The following details show which lines / items display extra information for each
 extra data level.
+
 .TP
 .B \-x \-A\fR
 \- Adds (if available and/or relevant) \fBvendor:\fR item, which shows 
@@ -562,12 +654,14 @@ specific vendor [product] information.
 device.
 
 \- Adds PCI Bus ID/USB ID number of each Audio device.
+
 .TP
 .B \-x \-B\fR
 \- Adds vendor/model, battery status (if battery present).
 
 \- Adds attached battery powered peripherals (\fBDevice\-[number]:\fR) if 
 detected (keyboard, mouse, etc.).
+
 .TP
 .B \-x \-C\fR
 \- Adds bogomips on CPU (if available)
@@ -579,16 +673,19 @@ etc.). Only shows data if detected. Newer microarchitectures will have
 to be added as they appear, and require the CPU family ID and model ID.
 
 Examples: \fBarch: Sandy Bridge rev: 2\fR, \fBarch: K8 rev.F+ rev: 2\fR
+
 .TP
 .B \-x \-d\fR
 \- Adds more items to \fBFeatures\fR line of optical drive; 
 dds rev version to optical drive.
+
 .TP
 .B \-x \-D\fR
 \- Adds HDD temperature with disk data if you have hddtemp installed, if you are root
 or if you have added to \fB/etc/sudoers\fR (sudo v. 1.7 or newer):
 
 .B <username> ALL = NOPASSWD: /usr/sbin/hddtemp (sample)
+
 .TP
 .B \-x \-G\fR
 \- Adds (if available and/or relevant) \fBvendor:\fR item, which shows 
@@ -599,12 +696,13 @@ specific vendor [product] information.
 \- Adds (for single GPU, nvidia driver) screen number that GPU is running on.
 
 \- Adds PCI Bus ID/USB ID number of each Graphics card.
+
 .TP
 .B \-x \-i\fR
 \- Adds IP v6 additional scope data, like Global, Site, Temporary for
 each interface.
 
-Note that there is no way I am aware of to filter out the deprecated
+Note that there is no way we are aware of to filter out the deprecated
 IP v6 scope site/global temporary addresses from the output of
 \fBifconfig\fR. The \fBip\fR tool shows that clearly.
 
@@ -635,6 +733,11 @@ versions.
 \- Adds current runlevel (not available with all init systems).
 
 \- If in shell (i.e. not in IRC client), adds shell version number, if available.
+
+.TP
+.B \-x \-J\fR (\fB\-\-usb\fR)
+\- For Devices, adds driver(s).
+
 .TP
 .B \-x \-m\fR, \fB\-\-memory\-modules\fR
 \- If present, adds maximum memory module/device size in the Array line.
@@ -642,6 +745,7 @@ Only some systems will have this data available. Shows estimate if it can
 generate one.
 
 \- Adds device type in the Device line.
+
 .TP
 .B \-x \-N\fR
 \- Adds (if available and/or relevant) \fBvendor:\fR item, which shows 
@@ -650,15 +754,18 @@ specific vendor [product] information.
 \- Adds version/port(s)/driver version (if available) for each Network card;
 
 \- Adds PCI Bus ID/USB ID number of each Network card.
+
 .TP
 .B \-x \-R\fR
 \- md\-raid: Adds second RAID Info line with extra data: blocks, chunk size,
 bitmap (if present). Resync line, shows blocks synced/total blocks.
 
 \- Hardware RAID: Adds driver version, bus ID.
+
 .TP
 .B \-x \-s\fR
 \- Adds basic voltages: 12v, 5v, 3.3v, vbat (\fBipmi\fR, \fBlm-sensors\fR if present).
+
 .TP
 .B \-x \-S\fR
 \- Adds Kernel gcc version.
@@ -668,29 +775,32 @@ a subset of distributions. The distro must be both derived from a parent distro
 Ubuntu), and explicitly added to the supported distributions for this feature. Due to 
 the complexity of distribution identification, these will only be added as relatively solid
 methods are found for each distribution system base detection.
+
 .TP
-.B \-x \-t\fR
+.B \-x \-t\fR (\fB\-\-processes\fR)
 \- Adds memory use output to CPU (\fB\-xt c\fR), and CPU use to memory
 (\fB\-xt m\fR).
-.TP
-.B \-x \-\-usb\fR
-\- For Devices, adds driver(s).
+
 .TP
 .B \-x \-w\fR,\fB \-W\fR
 \- Adds humidity and barometric pressure.
 
 \- Adds wind speed and direction.
+
 .TP
 .B \-xx \-A\fR
 \- Adds vendor:product ID for each Audio device.
+
 .TP
 .B \-xx \-B\fR
 \- Adds serial number, voltage (if available). Note that \fBvolts\fR shows the 
 data (if available) as the voltage now / minimum design voltage.
+
 .TP
 .B \-xx \-C\fR
 \- Adds \fBL1 cache:\fR and \fBL3 cache:\fR if either are available. Requires 
 dmidecode and sudo/root.
+
 .TP
 .B \-xx \-D\fR
 \- Adds disk serial number.
@@ -711,11 +821,12 @@ For a PCIe 3 NVMe drive, with speed of \fB8 GT/s\fR and \fB4\fR lanes
 (\fB8GT/s * 128/130 * 4 = 31.6 Gb/s\fR): 
 
 \fBspeed: 31.6 Gb/s lanes: 4\fR
+
 .TP
 .B \-xx \-G\fR
 \- Adds vendor:product ID of each Graphics card.
 
-\- Adds compositor, if found (experimental).
+\- Adds Xorg compositor, if found (always shows for Wayland systems).
 
 \- For free drivers, adds OpenGL compatibility version number if  available.
 For nonfree drivers, the core version and compatibility versions are usually
@@ -732,6 +843,10 @@ and loaded when checking the card. This can let you know there are other driver
 Note that if you have explicitly set the driver in \fBxorg.conf\fR, Xorg will not 
 create this automatic check driver list.
 
+\- If available, shows Xorg dpi (\fBs-dpi:\fR) for the active Xorg \fBScreen\fR
+(not physical monitor). Note that the physical monitor dpi and the Xorg 
+dpi are not necessarily the same thing, and can vary widely.
+
 .TP
 .B \-xx \-I\fR
 \- Adds init type version number (and rc if present).
@@ -742,6 +857,16 @@ create this automatic check driver list.
 type defaults.
 
 \- Adds parent program (or tty) that started shell, if not IRC client.
+
+.TP
+.B \-xx \-j\fR (\fB\-\-swap\fR), \fB\-xx \-p\fR, \fB\-xx \-P\fR
+\- Adds swap priority to each swap partition (for \fB\-P\fR) used, and for all
+swap types (for \fB\-j\fR).
+
+.TP
+.B \-xx \-J\fR (\fB\-\-usb\fR)
+\- Adds vendor:chip id.
+
 .TP
 .B \-xx \-m\fR, \fB\-\-memory\-modules\fR
 \- Adds memory device Manufacturer.
@@ -754,22 +879,27 @@ also shows serial number.
 \- Adds single/double bank memory, if data is found. Note, this may not be 100% right
 all of the time since it depends on the order that data is found in \fBdmidecode\fR
 output for \fBtype 6\fR and \fBtype 17\fR.
+
 .TP
 .B \-xx \-M\fR
 \- Adds chassis information, if data is available. Also shows BIOS
 ROM size if using \fBdmidecode\fR.
+
 .TP
 .B \-xx \-N\fR
 \- Adds vendor:product ID for each Network card.
+
 .TP
 .B \-xx \-R\fR
 \- md\-raid: Adds superblock (if present) and algorithm. If resync,
 shows progress bar.
 
 \- Hardware RAID: Adds Chip vendor:product ID.
+
 .TP
 .B \-xx \-s\fR
 \- Adds DIMM/SOC voltages, if present (\fBipmi\fR only).
+
 .TP
 .B \-xx \-S\fR
 \- Adds display manager (\fBdm\fR) type, if present. If none, shows N/A. 
@@ -783,21 +913,22 @@ If none found, shows nothing. Uses a less accurate fallback tool \fBwmctrl\fR
 if \fBps\fR tests fail to find data.
 
 \- Adds desktop toolkit (\fBtk\fR), if available (Xfce/KDE/Trinity).
+
 .TP
 .B \-xx \-\-slots\fR
 \- Adds slot length.
-.TP
-.B \-xx \-\-usb\fR
-\- Adds vendor:chip id.
+
 .TP
 .B \-xx \-w\fR,\fB \-W\fR
 \- Adds wind chill, heat index, and dew point, if available.
 
 \- Adds cloud cover, rain, snow, or precipitation (amount in previous hour 
 to observation time), if available.
+
 .TP
 .B \-xxx \-A\fR
 \- Adds, if present, serial number.
+
 .TP
 .B \-xxx \-B\fR
 \- Adds battery chemistry (e.g. \fBLi\-ion\fR), cycles (NOTE: there appears to
@@ -807,10 +938,12 @@ data is simply not available as of 2018\-04\-03), location (only available from
 \fBdmidecode\fR derived output).
 
 \- Adds attached device \fBrechargeable: [yes|no]\fR information. 
+
 .TP
 .B \-xxx \-C\fR
 \- Adds \fBboost: [enabled|disabled]\fR if detected, aka \fBturbo\fR. Not all CPUs 
 have this feature.
+
 .TP
 .B \-xxx \-D\fR
 \- Adds disk firmware revision number (if available).
@@ -822,15 +955,27 @@ able to detect all schemes, but handles the most common, e.g. \fBGPT\fR or \fBMB
 Only appears if detected (SSD drives do not have rotation speeds, for example). If none 
 found, nothing shows. Not all disks report this speed, so even if they are spinnning,
 no data will show.
+
 .TP
 .B \-xxx \-G\fR
-\- Adds (if available) \fBcompositor:\fR version \fBv:\fR.
+\- Adds (if available) Xorg \fBcompositor:\fR version \fBv:\fR (always shows if 
+found for Wayland systems).
+
 .TP
 .B \-xxx \-I\fR
 \- For \fBShell:\fR adds \fB(su|sudo|login)\fR to shell name if present.
 
 \- For \fBrunning in:\fR adds \fB(SSH)\fR to parent, if present. SSH detection
 uses the \fBwho am i\fR test.
+
+.TP
+.B \-xxx \-J\fR (\fB\-\-usb\fR)
+\- Adds, if present, serial number for non hub devices.
+
+\- Adds \fBinterfaces:\fR for non hub devices.
+
+\- Adds, if available, USB speed in \fBMbits/s\fR or \fBGbits/s\fR.
+
 .TP
 .B \-xxx \-m\fR, \fB\-\-memory\-modules\fR
 \- Adds memory bus width: primary bus width, and if present, total width. e.g.
@@ -844,9 +989,11 @@ present. If no total width data is found, then inxi will not show that item.
 data available.
 
 \- Adds device serial number.
+
 .TP
 .B \-xxx \-N\fR
 \- Adds, if present, serial number.
+
 .TP
 .B \-xxx \-R\fR
 \- md\-raid: Adds system mdraid support types (kernel support, read ahead, RAID events)
@@ -855,6 +1002,7 @@ data available.
 
 \- Hardware RAID: Adds rev, ports, and (if available and/or relevant) 
 \fBvendor:\fR item, which shows specific vendor [product] information.
+
 .TP
 .B \-xxx \-S\fR
 \- Adds, if in X, or with \fB--display\fR, bar/dock/panel/tray items 
@@ -864,13 +1012,7 @@ lxpanel, xfce4\-panel, lxqt\-panel, tint2, cairo-dock, trayer, and many others.
 \- Adds (if present), window manager (\fBwm\fR) version number.
 
 \- Adds (if present), display manager (\fBdm\fR) version number.
-.TP
-.B \-xxx \-\-usb\fR
-\- Adds, if present, serial number for non hub devices.
 
-\- Adds \fBinterfaces:\fR for non hub devices.
-
-\- Adds, if available, USB speed in \fBMbits/s\fR or \fBGbits/s\fR.
 .TP
 .B \-xxx \-w\fR,\fB \-W\fR
 \- Adds location (city state country), observation altitude (if available), 
@@ -906,7 +1048,7 @@ Using \fBsmartctl\fR (requires sudo/root privileges).
 \- Adds SATA type (eg 1.0, 2.6, 3.0) if a SATA device.
 
 \- Adds SMART report line: status, enabled/disabled, health, powered on,
-cycles, and some error cases if out of range values. Note that for Pre-fail items,
+cycles, and some error cases if out of range values. Note that for Pre\-fail items,
 it will show the VALUE and THRESHOLD numbers. It will also fall back for unknown
 attributes that are or have been failing and print out the Attribute name, value,
 threshold, and failing message. This way even for unhandled Attribute names,
@@ -921,6 +1063,88 @@ sizes if necessary. Adds in drive temperature for some drives as well,
 and other useful data.
 
 .TP
+.B \-a \-G\fR
+Triggers a much more complete Screen/Monitor output on the 
+\fBDisplay:\fR line of \fB\-G\fR. Note that the 
+basic feature requires \fBxdpyinfo\fR, and the advanced per monitor 
+feature requires \fBxrandr\fR. 
+
+No support currently exists for \fBWayland\fR since we so far can find 
+no documentation or easy methods to extract this information from \fBWayland\fR 
+compositors. This unfortunate situation may change in the future, hopefully. 
+However, most \fBWayland\fR systems also come with \fBxwayland\fR, 
+which should supply the tools necessary for the time being.
+
+Further note that all references to \fBDisplays\fR, \fBScreens\fR, 
+and \fBMonitors\fR are referring to the \fBX\fR technical terms, 
+not normal consumer usage. 1 \fBDisplay\fR runs 1 or more 
+\fBScreens\fR, and a \fBScreen\fR runs 1 or more \fBMonitors\fR.
+
+\- Adds \fBDisplay\fR ID, for the Display running the Screen that runs the Monitors.
+
+\- Adds total number of \fBScreens\fR listed for the current \fBDisplay\fR.
+
+\- Adds default \fBScreen\fR ID if Screen (not monitor!) total is greater than 1.
+
+\- Adds \fBScreen\fR line, which includes the ID (\fBScreen: 0\fR) then \fBs-res\fR 
+(Screen resolution), \fBs\-dpi\fR, \fBs\-size\fR and \fBs\-diag\fR. Remember, this is an 
+Xorg \fBScreen\fR, NOT a monitor screen, and the information listed is about
+the Xorg Screen! It may at times be the same as a single monitor system, 
+but usually it's different in some ways.
+
+\- Adds \fBMonitor\fR ID(s). Monitors are a subset of a Screen, each of which
+can have one or more monitors. Normally a dual monitor setup is 2 monitors 
+run by one Xorg Screen. Each monitor has the following data, if available:
+
+\- \fBres:\fR resolution in pixels. This is the individual monitor's 
+reported pixel dimensions.
+
+\- \fBhz:\fR frequency in Herz, as reported to Xorg. Note that there have been
+and may continue to be bugs with how Xorg treats > 1 monitor frequencies.
+
+\- \fBdpi:\fR dpi (dots per inch), aka, ppi (pixels per inch). This is the 
+physical screen dpi, which is calculated using the screen dimensions and its
+resolution. 
+
+\- \fBsize:\fR size in mm (inches). Note that this is the real monitor size,
+not the Xorg Screen size, which can be quite different (1 Xorg Screen can 
+for instance contain two or more monitors). 
+
+\- \fBdiag:\fR monitor screen diagonal in mm (inches). Note that this is 
+the real monitor size, not the Xorg full Screen diagonal size, which 
+can be quite different. 
+
+Sample (with both \fBxdpyinfo\fR and \fBxrandr\fR data available):
+.nf
+\fBinxi \-aG
+Graphics:
+ ....
+Display: x11 server: X.Org 1.20.6 driver: modesetting 
+display ID: :0.0 screens: 1 
+Screen\-1: 0 s\-res: 2560x1024 s\-dpi: 96 s\-size: 677x271mm (26.7x10.7") 
+s\-diag: 729mm (28.7") 
+Monitor\-1: DVI\-I\-0 res: 1280x1024 hz: 60 dpi: 96 
+size: 338x270mm (13.3x10.6") diag: 433mm (17") 
+Monitor\-2: VGA\-0 res: 1280x1024 hz: 60 dpi: 86 
+size: 376x301mm (14.8x11.9") diag: 482mm (19")
+ ....
+.fi
+
+.TP
+.B \-a \-j\fR, \fB\-a \-P\fR , \fB\-a \-P\fR
+\- Adds swappiness and vfs cache pressure, and a message to indicate 
+if the value is the default value or not (Linux only, and only if available). 
+If not the default value, shows default value as well, e.g. 
+
+For \fB\-P\fR per swap physical partition:
+
+\fBswappiness: 60 (default) cache pressure: 90 (default 100)\fR
+
+For \fB\-j\fR row 1 output:
+
+\fBKernel: swappiness: 60 (default) cache pressure: 90 (default 100)\fR
+
+.TP
 .B \-a \-p\fR,\fB\-a \-P\fR
 \- Adds raw partition size, including file system overhead, partition table, e.g.  
 
@@ -935,12 +1159,6 @@ not the raw size.
 
 \- Adds partition filesystem block size if found (requires root and blockdev). 
 
-\- For swap, adds swappiness and vfs cache pressure, and a message to indicate 
-if it is the default value or not (Linux only, and only if available). If not, 
-shows default value as well, e.g. 
-
-\fBswappiness: 60 (default) cache pressure: 90 (default 100)\fR.
-
 .TP
 .B \-a \-S\fR
 \- Adds kernel boot parameters to \fBKernel\fR section (if detected). Support 
@@ -976,6 +1194,11 @@ which is generally slower than \fBCurl\fR or \fBWget\fR but it may help bypass
 issues with downloading.
 
 .TP
+.B \-\-dig\fR
+Temporary override of \fBNO_DIG\fR configuration item. Only use to test w/wo dig.
+Restores default behavior for WAN IP, which is use dig if present.
+
+.TP
 .B \-\-display [:<integer>]\fR
 Will try to get display data out of X (does not usually work as root user).
 Default gets display info from display \fB:0\fR. If you use the format
@@ -1028,6 +1251,12 @@ Updates / installs man page with \fB\-U\fR if \fBpinxi\fR or using \fB\-U 3\fR d
 (Only active if \fB\-U\fR is is not disabled by maintainers).
 
 .TP
+.B \-\-no\-dig\fR
+Overrides default use of \fBdig\fR to get WAN IP address. Allows use of normal 
+downloader tool to get IP addresses. Only use if dig is failing, since dig is much
+faster and more reliable in general than other methods.
+
+.TP
 .B \-\-no\-host\fR
 Turns off hostname in System line. This is default when using \fB\-z\fR,
 for anonymizing inxi output for posting on forums or IRC. Overrides
@@ -1048,7 +1277,7 @@ Disables man page install with \fB\-U\fR for master and active development branc
 Skip SSL certificate checks for all downloader actions (\fB\-U\fR, \fB\-w\fR,
 \fB\-W\fR, \fB\-i\fR). Use if your system does not have current SSL certificate
 lists, or if you have problems making a connection for any reason. Works with
-\fBWget\fR, \fBCurl\fR, and \fBFetch\fR only.
+\fBWget\fR, \fBCurl\fR, \fBPerl HTTP::Tiny\fRand \fBFetch\fR.
 
 .TP
 .B \-\-no\-sudo\fR
@@ -1076,21 +1305,21 @@ configuration item. These are the available sort options:
 \fBdev\-base\fR - \fB/dev\fR partition identifier, like \fB/dev/sda1\fR. 
 Note that it's an alphabetic sort, so \fBsda12\fR is before \fBsda2\fR.
 
-\fBfs\fR - Partition filesystem. Note that sorts will be somewhat random if all 
+\fBfs\fR \- Partition filesystem. Note that sorts will be somewhat random if all 
 filesystems are the same.
 
-\fBid\fR - Mount point of partition (default).
+\fBid\fR \- Mount point of partition (default).
 
-\fBlabel\fR - Label of partition. If partitions have no labels, 
+\fBlabel\fR \- Label of partition. If partitions have no labels, 
 sort will be random.
 
 \fBpercent\-used\fR - Percentage of partition size used.
 
-\fBsize\fR - KiB size of partition.
+\fBsize\fR \- KiB size of partition.
 
-\fBuuid\fR - UUID of the partition.
+\fBuuid\fR \- UUID of the partition.
 
-\fBused\fR - KiB used of partition.
+\fBused\fR \- KiB used of partition.
 
 .TP
 .B \-\-pm\-type [package manager name]\fR
@@ -1141,7 +1370,7 @@ Forces the USB data generator to use \fBlsusb\fR as data source. Overrides
 Force \fB\-i\fR to use supplied URL as WAN IP source. Overrides dig or 
 default IP source urls. URL must start with http[s] or ftp.
 
-The IP address from the URL must be the last item on the last (non-empty) line 
+The IP address from the URL must be the last item on the last (non\-empty) line 
 of the page content source code.
 
 Same as configuration value (example):
@@ -1162,6 +1391,12 @@ fetch. Shows more downloader action information. Shows some more information
 for Perl downloader.
 
 .TP
+.B \-\-dbg [2\-xx]\fR
+\- See github \fBinxi-perl/docs/inxi-values.txt\fR for specific specialized debugging
+options. These can vary but tend to not change much, though they are added as
+needed.
+
+.TP
 .B \-\-debug [1\-3]\fR
 \- On screen debugger output. Output varies depending on current needs
 Usually nothing changes.
@@ -1338,6 +1573,9 @@ Overrides default. See \fB\-\-indent\-min\fR. If \fB80\fR or less, wrap will nev
 \fBLIMIT\fR Overrides default of \fB10\fR IP addresses per IF. This is only of interest
 to sys admins running servers with many IP addresses.
 
+\fBNO_DIG\fR Set to \fB1\fR or \fBtrue\fR to disable WAN IP use of \fBdig\fR and force
+use of alternate downloaders.
+
 \fBNO_SUDO\fR Set to \fB1\fR or \fBtrue\fR to disable internal use of \fBsudo\fR.
 
 \fBPARTITION_SORT\fR Overrides default partition output sort. See 
@@ -1359,13 +1597,13 @@ generally much faster). URL must begin with http or ftp. Note that if you use th
 the downloader set tests will run each time you start inxi whether a downloader feature
 is going to be used or not. 
 
-The IP address from the URL must be the last item on the last (non-empty) line of 
+The IP address from the URL must be the last item on the last (non\-empty) line of 
 the URL's page content source code.
 
 Same as \fB\-\-wan\-ip\-url [URL]\fR
 
 \fBWEATHER_SOURCE\fR Values: [\fB0-9\fR]. Same as \fB\-\-weather\-source\fR. Values
-4-9 are not currently supported, but this can change at any time.
+4\-9 are not currently supported, but this can change at any time.
 
 \fBWEATHER_UNIT\fR Values: [\fBc\fR|\fBf\fR|\fBcf\fR|\fBfc\fR]. Same as \fB\-\-weather\-unit\fR.
 
@@ -1428,7 +1666,7 @@ is a fork of \fBlocsmif\fR's very clever \fBinfobash\fR script.
 Original infobash author and copyright holder:
 Copyright (C) 2005\-2007  Michiel de Boer aka locsmif
 
-inxi version: Copyright (C) 2008\-18 Harald Hope
+inxi version: Copyright (C) 2008\-20 Harald Hope
 
 This man page was originally created by Gordon Spencer (aka aus9) and is
 maintained by Harald Hope (aka h2 or TechAdmin).