Resolve merge conflicts from develop

5 files changed, 16 insertions, 2 deletions

diff --git a/docs/aoa/diskio.rst b/docs/aoa/diskio.rst
index f6d03ffe..6ae77207 100644
--- a/docs/aoa/diskio.rst
+++ b/docs/aoa/diskio.rst
@@ -17,6 +17,7 @@ There is no alert on this information.
 
 It's possible to define:
 
+- a list of disk to show (white list)
 - a list of disks to hide
 - aliases for disk name
 
@@ -29,3 +30,10 @@ and the specific ``sda5`` partition:
 
     [diskio]
     hide=sda5,loop.*
+
+or another example:
+
+.. code-block:: ini
+
+    [diskio]
+    show=sda.*
diff --git a/docs/aoa/docker.rst b/docs/aoa/docker.rst
index c21dc850..2c5b951d 100644
--- a/docs/aoa/docker.rst
+++ b/docs/aoa/docker.rst
@@ -25,6 +25,8 @@ under the ``[docker]`` section:
     show=thiscontainer,andthisone,andthoseones.*
     # Hide some containers (comma separeted list of container name or regular expression)
     hide=donotshowthisone,andthose.*
+    # Show only specific containers (comma separeted list of container name or regular expression)
+    #show=showthisone,andthose.*
     # Define the maximum docker size name (default is 20 chars)
     max_name_size=20
     # Global containers' thresholds for CPU and MEM (in %)
diff --git a/docs/aoa/fs.rst b/docs/aoa/fs.rst
index 92428555..1b3b7155 100644
--- a/docs/aoa/fs.rst
+++ b/docs/aoa/fs.rst
@@ -46,9 +46,10 @@ To hide all mount points starting with /boot and /snap:
 
 Filtering are also applied on device name (Glances 3.1.4 or higher).
 
-Example to hide all /dev/sdb mount points:
+It is also possible to configure a white list of devices to display:
+Example to only show /dev/sdb mount points:
 
 .. code-block:: ini
 
      [fs]
-     hide=/dev/sdb.*
+     show=/dev/sdb.*
diff --git a/docs/aoa/network.rst b/docs/aoa/network.rst
index 2c5bd719..27ad1581 100644
--- a/docs/aoa/network.rst
+++ b/docs/aoa/network.rst
@@ -39,6 +39,8 @@ virtual docker interface (docker0, docker1, ...):
     tx_critical=90
     # Define the list of hidden network interfaces (comma-separated regexp)
     hide=docker.*,lo
+    # Define the list of network interfaces to show (comma-separated regexp)
+    #show=eth0,eth1
     # WLAN 0 alias
     wlan0_alias=Wireless IF
     # It is possible to overwrite the bitrate thresholds per interface
diff --git a/docs/aoa/wifi.rst b/docs/aoa/wifi.rst
index 3105a6b5..eb23c037 100644
--- a/docs/aoa/wifi.rst
+++ b/docs/aoa/wifi.rst
@@ -30,6 +30,7 @@ hide the loopback interface (lo) and all the virtual docker interfaces:
 
     [wifi]
     hide=lo,docker.*
+    #show=wlp2s0
     # Define SIGNAL thresholds in dBm (lower is better...)
     careful=-65
     warning=-75