diff --git a/plugins/apache/apache_cache_disk_count b/plugins/apache/apache_cache_disk_count
index 586df9d4..21cd42a7 100755
--- a/plugins/apache/apache_cache_disk_count
+++ b/plugins/apache/apache_cache_disk_count
@@ -8,14 +8,14 @@ Munin plugin to monitor apache mod_cache_disk usage.
 
 =head1 CONFIGURATION
 
-[apache_cache_disk_count]
-	user www-data
-	env.cache_path /var/cache/apache2/mod_cache_disk
-	env.strings css js
-	env.label_cs CSS
-	env.colour_css FFFF00
-	env.label_js JS
-	env.colour_js FF0000
+ [apache_cache_disk_count]
+ user www-data
+ env.cache_path /var/cache/apache2/mod_cache_disk
+ env.strings css js
+ env.label_cs CSS
+ env.colour_css FFFF00
+ env.label_js JS
+ env.colour_js FF0000
 
 =head1 AUTHOR
 
diff --git a/plugins/apache/apache_memory b/plugins/apache/apache_memory
index 4e5f84bb..b01f84d6 100755
--- a/plugins/apache/apache_memory
+++ b/plugins/apache/apache_memory
@@ -9,9 +9,9 @@ apache_memory - Indicate the medium size of all the apache child process
 
 =head1 CONFIGURATION
 
-[apache_*]
-env.apuser user_running_apache (default: "www-data")
-env.binname apache_binary_name (default: "apache2")
+ [apache_*]
+ env.apuser user_running_apache (default: "www-data")
+ env.binname apache_binary_name (default: "apache2")
 
 
 =head1 AUTHOR
diff --git a/plugins/apache/apache_servers b/plugins/apache/apache_servers
index 2ec1cdb1..6ab75070 100755
--- a/plugins/apache/apache_servers
+++ b/plugins/apache/apache_servers
@@ -9,9 +9,9 @@ apache_servers - Indicate the number of apache servers running (child process)
 
 =head1 CONFIGURATION
 
-[apache_*]
-env.apuser user_running_apache (default: "www-data")
-env.binname apache_binary_name (default: "apache2")
+ [apache_*]
+ env.apuser user_running_apache (default: "www-data")
+ env.binname apache_binary_name (default: "apache2")
 
 =head1 AUTHOR
 
diff --git a/plugins/apache/apache_threads b/plugins/apache/apache_threads
index f7c8fb6a..58b79e37 100755
--- a/plugins/apache/apache_threads
+++ b/plugins/apache/apache_threads
@@ -9,9 +9,9 @@ apache_threads -Indicate the memdium number of threads for all child process
 
 =head1 CONFIGURATION
 
-[apache_*]
-env.apuser user_runnin_apache
-env.binname apache_binary_name
+ [apache_*]
+ env.apuser user_runnin_apache
+ env.binname apache_binary_name
 
 =head1 AUTHOR
 
diff --git a/plugins/apache/apache_tmemmory b/plugins/apache/apache_tmemmory
index fcb26d4f..b9c76d23 100755
--- a/plugins/apache/apache_tmemmory
+++ b/plugins/apache/apache_tmemmory
@@ -9,9 +9,9 @@ apache_tmemmory - Indicate the total memory used by apache
 
 =head1 CONFIGURATION
 
-[apache_*]
-env.apuser user_running_apache (default: "www-data")
-env.binname apache_binary_name (default: "apache2")
+ [apache_*]
+ env.apuser user_running_apache (default: "www-data")
+ env.binname apache_binary_name (default: "apache2")
 
 =head1 AUTHOR
 
diff --git a/plugins/apache/apache_vhosts/apache_vhosts b/plugins/apache/apache_vhosts/apache_vhosts
index a13141ca..3d756d32 100755
--- a/plugins/apache/apache_vhosts/apache_vhosts
+++ b/plugins/apache/apache_vhosts/apache_vhosts
@@ -27,14 +27,20 @@ Be aware that a apache log CustomLog directive in the master config will only lo
 
 Install plugin conf (after [apache_*])
 
-[apache_vhosts]
-user root
-env.subgraphs requests bytes time
-env.checks requests bytes time
+  [apache_vhosts]
+  user root
+  env.subgraphs requests bytes time
+  env.checks requests bytes time
 
-# user		- probably necessary for shared memory IPC
-# subgraphs 	- create multigraph subgraphs (watch your graphing performance...), default 0
-# checks	- enable stats on bytes and response times per request, you have to log these in apache
+=over 4
+
+=item user - probably necessary for shared memory IPC
+
+=item subgraphs - create multigraph subgraphs (watch your graphing performance...), default 0
+
+=item checks - enable stats on bytes and response times per request, you have to log these in apache
+
+=back
 
 A word on performance:
 Requests/sec should not be much of a problem.  Pipelogger and Logparser should not have man performance problems, as the apply one regex per line and add some stats.
diff --git a/plugins/ceph/ceph_capacity b/plugins/ceph/ceph_capacity
index 05e45b38..90dbdfec 100755
--- a/plugins/ceph/ceph_capacity
+++ b/plugins/ceph/ceph_capacity
@@ -8,9 +8,9 @@ ceph_capacity - Shows ceph total storage capacity, used raw space and used data
 
 =head1 CONFIGURATION
 
-[ceph_capacity]
-env.warning_level Used raw space percentage above warning alert should be issued
-env.critical_level Used raw space percentage above critical alert should be issued
+ [ceph_capacity]
+ env.warning_level Used raw space percentage above warning alert should be issued
+ env.critical_level Used raw space percentage above critical alert should be issued
 
 =head1 AUTHOR
 
diff --git a/plugins/coturn/coturn_sessions b/plugins/coturn/coturn_sessions
index b34e8312..080887fa 100755
--- a/plugins/coturn/coturn_sessions
+++ b/plugins/coturn/coturn_sessions
@@ -14,9 +14,9 @@ This plugin requires a password set in /etc/turnserver.conf for telnet
 cli access. A telnet client has to be installed. Optionally you can 
 specify the port of the cli interface.
 
-[coturn_sessions]
-env.password VERYSECUREPASSWORD
-env.port PORT
+ [coturn_sessions]
+ env.password VERYSECUREPASSWORD
+ env.port PORT
 
 =head1 AUTHOR
 
diff --git a/plugins/currency/nanopool/nanopool_ b/plugins/currency/nanopool/nanopool_
index 7338734a..2b27e0ba 100755
--- a/plugins/currency/nanopool/nanopool_
+++ b/plugins/currency/nanopool/nanopool_
@@ -51,10 +51,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+SPDX-License-Identifier: GPL-3.0-or-later
+
 =head1 MAGIC MARKERS
 
-#%# family=contrib
-#%# capabilities=suggest
+ #%# family=contrib
+ #%# capabilities=suggest
 
 =cut
 """
diff --git a/plugins/disk/btrfs_device_stats b/plugins/disk/btrfs_device_stats
index 0959381e..f0f07216 100755
--- a/plugins/disk/btrfs_device_stats
+++ b/plugins/disk/btrfs_device_stats
@@ -13,8 +13,8 @@ btrfs_device_stats - Script to monitor btrfs device statistics
 Simply create a symlink in your plugins directory like with any other plugin.
 Must be run as root.
 
-[btrfs_device_stats]
-user root
+ [btrfs_device_stats]
+ user root
 
 =head2 DEFAULT CONFIGURATION
 
diff --git a/plugins/disk/btrfs_device_usage b/plugins/disk/btrfs_device_usage
index c5c7238f..1016605d 100755
--- a/plugins/disk/btrfs_device_usage
+++ b/plugins/disk/btrfs_device_usage
@@ -13,8 +13,8 @@ btrfs_device_usage - Script to monitor usage of btrfs devices
 Simply create a symlink in your plugins directory like with any other plugin.
 Must be run as root.
 
-[btrfs_device_usage]
-user root
+ [btrfs_device_usage]
+ user root
 
 =head2 DEFAULT CONFIGURATION
 
diff --git a/plugins/disk/btrfs_subvol_usage b/plugins/disk/btrfs_subvol_usage
index d58e0977..aeb632d7 100755
--- a/plugins/disk/btrfs_subvol_usage
+++ b/plugins/disk/btrfs_subvol_usage
@@ -8,9 +8,9 @@ btrfs_subvol_usage - Plugin to monitor usage of BTRFS subvolumes
 
 Must be run as root and you have to specify the path to the filesystem
 
-[btrfs_usage]
-user root
-env.fsroot /path/to/btrfs/filesystem
+ [btrfs_usage]
+ user root
+ env.fsroot /path/to/btrfs/filesystem
 
 =head1 MAGIC MARKERS
 
diff --git a/plugins/disk/e2 b/plugins/disk/e2
index c1377aa0..6ac9b4f1 100755
--- a/plugins/disk/e2
+++ b/plugins/disk/e2
@@ -8,8 +8,8 @@ ext2 - Wildcard plugin shows ext2/3/4 filesystem information (mount count, last
 
 =head1 CONFIGURATION
 
-[ext2_*]
-group disk,floppy
+ [ext2_*]
+ group disk,floppy
 
 =head1 AUTHOR
 
diff --git a/plugins/disk/file_age b/plugins/disk/file_age
index 52743de3..09e12634 100755
--- a/plugins/disk/file_age
+++ b/plugins/disk/file_age
@@ -88,7 +88,7 @@ file_age - Monitors the age of files.
 
 Since there is no way for the plugin to guess which files you want monitored, you're going to have to set each file up separately. Put the following in a file in your plugin-conf.d directory.
 
-[file_age]
+    [file_age]
     user root						# May not be necessary, depending on which files you want monitored.
 
     env.file1_path		/var/log/syslog		# Mandatory, complete path to file.
diff --git a/plugins/docker/docker_cpu b/plugins/docker/docker_cpu
index 62c5d080..1d769a41 100755
--- a/plugins/docker/docker_cpu
+++ b/plugins/docker/docker_cpu
@@ -16,22 +16,21 @@ Root privilege required to execute docker command.
 1. Create a new file named "docker" inside the folder /etc/munin/plugin-conf.d/
 2. Docker file content:
 
-[docker_cpu]
-user root
+ [docker_cpu]
+ user root
 
 =head1 MAGIC MARKERS
 
-  #%# family=auto
-  #%# capabilities=autoconf
+ #%# family=auto
+ #%# capabilities=autoconf
 
 =head1 VERSION
 
-  v.0.1
+ v.0.1
 
 =head1 AUTHOR
 
-Copyright (C) 2015 Samuel Cantero.
-Email: scanterog at gmail dot com
+Copyright (C) 2015 Samuel Cantero <scanterog at gmail dot com>
 
 =head1 LICENSE
 
diff --git a/plugins/docker/docker_memory b/plugins/docker/docker_memory
index 6fba71b4..e982b216 100755
--- a/plugins/docker/docker_memory
+++ b/plugins/docker/docker_memory
@@ -16,22 +16,21 @@ Root privilege required to execute docker command.
 1. Create a new file named "docker" inside the folder /etc/munin/plugin-conf.d/
 2. Docker file content:
 
-[docker_memory]
-user root
+ [docker_memory]
+ user root
 
 =head1 MAGIC MARKERS
 
-  #%# family=auto
-  #%# capabilities=autoconf
+ #%# family=auto
+ #%# capabilities=autoconf
 
 =head1 VERSION
 
-  v.0.1
+ v.0.1
 
 =head1 AUTHOR
 
-Copyright (C) 2015 Samuel Cantero.
-Email: scanterog at gmail dot com
+Copyright (C) 2015 Samuel Cantero <scanterog at gmail dot com>
 
 =head1 LICENSE
 
diff --git a/plugins/etherpadlite/etherpadlite_ b/plugins/etherpadlite/etherpadlite_
index fde764bb..e8ef194d 100755
--- a/plugins/etherpadlite/etherpadlite_
+++ b/plugins/etherpadlite/etherpadlite_
@@ -6,8 +6,7 @@ set -e
 
 =head1 NAME
 
-etherpadlite_ - Monitor number of pads with etherpad-lite plugin called 
-ep_pads_stats
+etherpadlite_ - Monitor number of pads with etherpad-lite plugin called ep_pads_stats
 
 =head1 APPLICABLE SYSTEMS
 
@@ -22,8 +21,8 @@ jq, a command-line json processor.
 This is a wildcard plugin. To monitor a etherpad-lite instance, link
 etherpadlite_<instancename> to this file.
 
-[etherpadlite_instancename]
-env.url http://127.0.0.1:9001/stats.json
+ [etherpadlite_instancename]
+ env.url http://127.0.0.1:9001/stats.json
 
 =head1 AUTHOR
 
diff --git a/plugins/git/git_commit_behind b/plugins/git/git_commit_behind
index bcd07319..e2c11a27 100755
--- a/plugins/git/git_commit_behind
+++ b/plugins/git/git_commit_behind
@@ -3,8 +3,7 @@
 """=cut
 =head1 NAME
 
-git_commit_behind - Munin plugin to monitor local git repositories and report
-how many commits behind their remote they are
+git_commit_behind - Munin plugin to monitor local git repositories and report how many commits behind their remote they are
 
 =head1 NOTES
 
@@ -19,13 +18,20 @@ separate cron job.
 
 =head1 REQUIREMENTS
 
- - Python3
- - Git
+=over 4
+
+=item Python3
+
+=item Git
+
+=back
+
 
 =head1 INSTALLATION
 
 Link this plugin, as usual.
 For example :
+
   ln -s /path/to/git_commit_behind /etc/munin/plugins/git_commit_behind
 
 If you wish to update the repositories via cron and not during the plugin
@@ -33,16 +39,17 @@ execution (cf CONFIGURATION section), you need a dedicated cron job.
 
 For example, you can use the following cron :
 
-# If the git_commit_behind plugin is enabled, fetch git repositories randomly
-# according to the plugin configuration.
-# By default : once an hour (12 invocations an hour, 1 in 12 chance that the
-# update will happen), but ensure that there will never be more than two hours
-# (7200 seconds) interval between updates.
-*/5 * * * * root if [ -x /etc/munin/plugins/git_commit_behind ]; then /usr/sbin/munin-run git_commit_behind update >/dev/null; fi
+ # If the git_commit_behind plugin is enabled, fetch git repositories randomly
+ # according to the plugin configuration.
+ # By default : once an hour (12 invocations an hour, 1 in 12 chance that the
+ # update will happen), but ensure that there will never be more than two hours
+ # (7200 seconds) interval between updates.
+ */5 * * * * root if [ -x /etc/munin/plugins/git_commit_behind ]; then /usr/sbin/munin-run git_commit_behind update >/dev/null; fi
 
 =head1 CONFIGURATION
 
 Use your "/etc/munin/plugin-conf.d/munin-node" to configure this plugin.
+
     [git_commit_behind]
     user [user]
     env.git_path /path/to/git
@@ -63,7 +70,8 @@ env.update.maxinterval : optional (default : 7200),
 
 
 Then, for each repository you want to check, you need the following
-configuration block under the git_commit_behind section
+configuration block under the git_commit_behind section:
+
     env.repo.[repoCode].path /path/to/local/repo
     env.repo.[repoCode].name Repo Name
     env.repo.[repoCode].user user
diff --git a/plugins/google/snmp__gsa_docs b/plugins/google/snmp__gsa_docs
index 5f61ccf8..1137cf1a 100755
--- a/plugins/google/snmp__gsa_docs
+++ b/plugins/google/snmp__gsa_docs
@@ -18,7 +18,7 @@ and the SHA authentication scheme.
 Create a "Munin" user on the GSA SNMP configuration, and then use
 something similar to the following:
 
-[snmpv3_gsa.host.name_*]
+  [snmpv3_gsa.host.name_*]
   env.v3username munin
   env.v3authprotocol sha
   env.v3authpassword your-auth-passwd
diff --git a/plugins/haproxy/haproxy_abort_backend b/plugins/haproxy/haproxy_abort_backend
index 0dfb9031..34f582c7 100755
--- a/plugins/haproxy/haproxy_abort_backend
+++ b/plugins/haproxy/haproxy_abort_backend
@@ -9,7 +9,7 @@ haproxy_aborts_backend -Haproxy Aborts Backend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_active_backend b/plugins/haproxy/haproxy_active_backend
index 47dc59fe..f9f1758c 100755
--- a/plugins/haproxy/haproxy_active_backend
+++ b/plugins/haproxy/haproxy_active_backend
@@ -9,7 +9,7 @@ haproxy_active_backend -Haproxy servers active backend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_bytes_backend b/plugins/haproxy/haproxy_bytes_backend
index 44cf244b..fcb7a5b3 100755
--- a/plugins/haproxy/haproxy_bytes_backend
+++ b/plugins/haproxy/haproxy_bytes_backend
@@ -9,7 +9,7 @@ haproxy_bytes_backend -Haproxy Bytes Backend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_bytes_compressor_backend b/plugins/haproxy/haproxy_bytes_compressor_backend
index 39da0bae..ac1c5816 100755
--- a/plugins/haproxy/haproxy_bytes_compressor_backend
+++ b/plugins/haproxy/haproxy_bytes_compressor_backend
@@ -9,7 +9,7 @@ haproxy_bytes_compressor_backend -Haproxy Bytes Compressor
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_bytes_compressor_frontend b/plugins/haproxy/haproxy_bytes_compressor_frontend
index 6ac80ede..bc3dc09f 100755
--- a/plugins/haproxy/haproxy_bytes_compressor_frontend
+++ b/plugins/haproxy/haproxy_bytes_compressor_frontend
@@ -9,7 +9,7 @@ haproxy_bytes_compressor_backend -Haproxy Bytes Compressor
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_bytes_frontend b/plugins/haproxy/haproxy_bytes_frontend
index fc1179e3..8a7a0ad4 100755
--- a/plugins/haproxy/haproxy_bytes_frontend
+++ b/plugins/haproxy/haproxy_bytes_frontend
@@ -9,7 +9,7 @@ haproxy_bytes_frontend -Haproxy Bytes Frontend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_denied_backend b/plugins/haproxy/haproxy_denied_backend
index 3c9b6960..e4355c79 100755
--- a/plugins/haproxy/haproxy_denied_backend
+++ b/plugins/haproxy/haproxy_denied_backend
@@ -9,7 +9,7 @@ haproxy_denied_backend -Haproxy Denied Backend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_denied_frontend b/plugins/haproxy/haproxy_denied_frontend
index 3d7da13c..8274d2f9 100755
--- a/plugins/haproxy/haproxy_denied_frontend
+++ b/plugins/haproxy/haproxy_denied_frontend
@@ -9,7 +9,7 @@ haproxy_denied_frontend -Haproxy Denied Frontend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_errors_backend b/plugins/haproxy/haproxy_errors_backend
index b6cc6d87..3a5fe1f6 100755
--- a/plugins/haproxy/haproxy_errors_backend
+++ b/plugins/haproxy/haproxy_errors_backend
@@ -9,7 +9,7 @@ haproxy_errors_backend -Haproxy Errors Backend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_errors_frontend b/plugins/haproxy/haproxy_errors_frontend
index 05f8f466..378c205d 100755
--- a/plugins/haproxy/haproxy_errors_frontend
+++ b/plugins/haproxy/haproxy_errors_frontend
@@ -9,7 +9,7 @@ haproxy_errors_frontend -Haproxy Errors Frontend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_queue_backend b/plugins/haproxy/haproxy_queue_backend
index 1f119542..08e6ca81 100755
--- a/plugins/haproxy/haproxy_queue_backend
+++ b/plugins/haproxy/haproxy_queue_backend
@@ -9,7 +9,7 @@ haproxy_queue_backend -Haproxy Queued Requests Backend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_rate_backend b/plugins/haproxy/haproxy_rate_backend
index d1041170..b31befd3 100755
--- a/plugins/haproxy/haproxy_rate_backend
+++ b/plugins/haproxy/haproxy_rate_backend
@@ -9,7 +9,7 @@ haproxy_rate_backend -Haproxy Sessions Per Second Backend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_rate_frontend b/plugins/haproxy/haproxy_rate_frontend
index 4b86d9a5..b77d3994 100755
--- a/plugins/haproxy/haproxy_rate_frontend
+++ b/plugins/haproxy/haproxy_rate_frontend
@@ -9,7 +9,7 @@ harpoxy_rate_frontend -Haproxy Sessions Per Second Frontend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_reqrate_frontend b/plugins/haproxy/haproxy_reqrate_frontend
index bc62592e..dacc36fa 100755
--- a/plugins/haproxy/haproxy_reqrate_frontend
+++ b/plugins/haproxy/haproxy_reqrate_frontend
@@ -9,7 +9,7 @@ haproxy_reqrate_frontend -Haproxy request rate frontend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_response_compressor_backend b/plugins/haproxy/haproxy_response_compressor_backend
index 7377b5ad..1319aa6e 100755
--- a/plugins/haproxy/haproxy_response_compressor_backend
+++ b/plugins/haproxy/haproxy_response_compressor_backend
@@ -9,7 +9,7 @@ haproxy_response_compressor_backend -Haproxy Response Compressed
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_response_compressor_frontend b/plugins/haproxy/haproxy_response_compressor_frontend
index 58c8ea91..8b667700 100755
--- a/plugins/haproxy/haproxy_response_compressor_frontend
+++ b/plugins/haproxy/haproxy_response_compressor_frontend
@@ -9,7 +9,7 @@ haproxy_response_compressor_backend -Haproxy Response Compressed
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_responses_backend b/plugins/haproxy/haproxy_responses_backend
index a19dea38..18bd1ae9 100755
--- a/plugins/haproxy/haproxy_responses_backend
+++ b/plugins/haproxy/haproxy_responses_backend
@@ -9,7 +9,7 @@ haproxy_responses_backend -Haproxy responses backend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_responses_frontend b/plugins/haproxy/haproxy_responses_frontend
index 3b6513bf..a6c05452 100755
--- a/plugins/haproxy/haproxy_responses_frontend
+++ b/plugins/haproxy/haproxy_responses_frontend
@@ -9,7 +9,7 @@ haproxy_responses_frontend -Haproxy responses frontend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_sessions_backend b/plugins/haproxy/haproxy_sessions_backend
index 4a750d52..17ac5976 100755
--- a/plugins/haproxy/haproxy_sessions_backend
+++ b/plugins/haproxy/haproxy_sessions_backend
@@ -9,7 +9,7 @@ haproxy_sessions_backend -Haproxy Sessions Backend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_sessions_frontend b/plugins/haproxy/haproxy_sessions_frontend
index 2c847385..b94f40b8 100755
--- a/plugins/haproxy/haproxy_sessions_frontend
+++ b/plugins/haproxy/haproxy_sessions_frontend
@@ -9,7 +9,7 @@ haproxy_sessions_frontend -Haproxy Sessions Frontend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_sessions_total_backend b/plugins/haproxy/haproxy_sessions_total_backend
index 01dc4591..101e4365 100755
--- a/plugins/haproxy/haproxy_sessions_total_backend
+++ b/plugins/haproxy/haproxy_sessions_total_backend
@@ -9,7 +9,7 @@ haproxy_sessions_total_frontend -Haproxy Sessions Total Frontend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_sessions_total_frontend b/plugins/haproxy/haproxy_sessions_total_frontend
index c6840984..1c948228 100755
--- a/plugins/haproxy/haproxy_sessions_total_frontend
+++ b/plugins/haproxy/haproxy_sessions_total_frontend
@@ -9,7 +9,7 @@ haprxoy_sessions_total_frontend -Haproxy Sessions Total Frontend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/haproxy/haproxy_warnings_backend b/plugins/haproxy/haproxy_warnings_backend
index a8904bb3..fe131d21 100755
--- a/plugins/haproxy/haproxy_warnings_backend
+++ b/plugins/haproxy/haproxy_warnings_backend
@@ -9,7 +9,7 @@ haproxy_warnings_backend -Haproxy Warnings Backend
 
 =head1 CONFIGURATION
 
-[haproxy*]
+  [haproxy*]
   user root
   env.backend backend_name_1 backend_name_2 backend_name_3
   env.frontend frontend_name_1 frontend_name_2 frontend_name_3
diff --git a/plugins/ipvs/ipvs_active b/plugins/ipvs/ipvs_active
index ded74d7a..f518ba4c 100755
--- a/plugins/ipvs/ipvs_active
+++ b/plugins/ipvs/ipvs_active
@@ -9,9 +9,9 @@ ipvs_conn -Indicate the number of active servers in ipvs
 
 =head1 CONFIGURATION
 
-[ipvs_*]
-user root
-env.ips IP1 IP2
+ [ipvs_*]
+ user root
+ env.ips IP1 IP2
 
 =head1 AUTHOR
 
diff --git a/plugins/ipvs/ipvs_bps b/plugins/ipvs/ipvs_bps
index c13c30d4..f3f74c68 100755
--- a/plugins/ipvs/ipvs_bps
+++ b/plugins/ipvs/ipvs_bps
@@ -9,9 +9,9 @@ ipvs_conn -Indicate the number of bytes per second in ipvs
 
 =head1 CONFIGURATION
 
-[ipvs_*]
-user root
-env.ips IP1 IP2
+ [ipvs_*]
+ user root
+ env.ips IP1 IP2
 
 =head1 AUTHOR
 
diff --git a/plugins/ipvs/ipvs_conn b/plugins/ipvs/ipvs_conn
index cec4e391..a39e0b78 100755
--- a/plugins/ipvs/ipvs_conn
+++ b/plugins/ipvs/ipvs_conn
@@ -9,9 +9,9 @@ ipvs_conn -Indicate the number of connections in ipvs
 
 =head1 CONFIGURATION
 
-[ipvs_*]
-user root
-env.ips IP1 IP2
+ [ipvs_*]
+ user root
+ env.ips IP1 IP2
 
 =head1 AUTHOR
 
diff --git a/plugins/ipvs/ipvs_cps b/plugins/ipvs/ipvs_cps
index 502ff9f0..59f5bdc3 100755
--- a/plugins/ipvs/ipvs_cps
+++ b/plugins/ipvs/ipvs_cps
@@ -9,9 +9,9 @@ ipvs_conn -Indicate the number of connections per second
 
 =head1 CONFIGURATION
 
-[ipvs_*]
-user root
-env.ips IP1 IP2
+ [ipvs_*]
+ user root
+ env.ips IP1 IP2
 
 =head1 AUTHOR
 
diff --git a/plugins/jenkins/jenkins_ b/plugins/jenkins/jenkins_
index 27fe1958..fb94576e 100755
--- a/plugins/jenkins/jenkins_
+++ b/plugins/jenkins/jenkins_
@@ -32,12 +32,12 @@ env.jobDepth    How far into job "folders" should the plugin check for jobs
 
 Example:
 
-[jenkins_*]
-env.url localhost
-env.port 4040
-env.context /jenkins
-env.user user
-env.apiToken aaaa0f6e48b92cbbbbddecdb72dc1dad
+ [jenkins_*]
+ env.url localhost
+ env.port 4040
+ env.context /jenkins
+ env.user user
+ env.apiToken aaaa0f6e48b92cbbbbddecdb72dc1dad
 
 
 =head1 AUTHOR
diff --git a/plugins/jitsi/jitsi_videobridge b/plugins/jitsi/jitsi_videobridge
index 51e434d5..1d32c0eb 100755
--- a/plugins/jitsi/jitsi_videobridge
+++ b/plugins/jitsi/jitsi_videobridge
@@ -6,8 +6,7 @@ set -e
 
 =head1 NAME
 
-jitsi_videobridge - Monitor sessions and conferences 
-on a jitsi-videobridge
+jitsi_videobridge - Monitor sessions and conferences on a jitsi-videobridge
 
 =head1 APPLICABLE SYSTEMS
 
@@ -20,8 +19,8 @@ installed jq, a command-line json processor.
 
 You may specify the URL where to get the statistics
 
-[jitsi_videobridge]
-env.url http://127.0.0.1:8080/colibri/stats
+ [jitsi_videobridge]
+ env.url http://127.0.0.1:8080/colibri/stats
 
 ... and you may disable the audiochannel when you don't use an
 audio gateway.
diff --git a/plugins/kamailio/kamailio_mysql_shared_memory b/plugins/kamailio/kamailio_mysql_shared_memory
index d163c947..c1c2bf73 100755
--- a/plugins/kamailio/kamailio_mysql_shared_memory
+++ b/plugins/kamailio/kamailio_mysql_shared_memory
@@ -12,7 +12,7 @@ http://siremis.asipto.com/install-charts-panel/
 
 =head1 CONFIGURATION
 
-[kamailio*]
+ [kamailio*]
  user root
  group root
  env.mysql <optional-override-of-mysqladmin-path>
@@ -49,7 +49,7 @@ Note: second parameter of sql_query(...) is a single line. Next version, based o
 
 You have to create a new table in Kamailio (OpenSER) database:
 
-CREATE TABLE `statistics` (
+ CREATE TABLE `statistics` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `time_stamp` int(10) unsigned NOT NULL default '0',
   `random` int(10) unsigned NOT NULL default '0',
@@ -60,7 +60,7 @@ CREATE TABLE `statistics` (
   `ul_users` int(10) unsigned NOT NULL default '0',
   `ul_contacts` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM;
+ ) ENGINE=MyISAM;
 
 Now all is ready for Kamailio (OpenSER), you can restart it.
 
diff --git a/plugins/kamailio/kamailio_transactions_users b/plugins/kamailio/kamailio_transactions_users
index 9af486ec..046f4a54 100755
--- a/plugins/kamailio/kamailio_transactions_users
+++ b/plugins/kamailio/kamailio_transactions_users
@@ -12,7 +12,7 @@ http://siremis.asipto.com/install-charts-panel/
 
 =head1 CONFIGURATION
 
-[kamailio*]
+ [kamailio*]
  user root
  group root
  env.mysql <optional-override-of-mysqladmin-path>
@@ -49,7 +49,7 @@ Note: second parameter of sql_query(...) is a single line. Next version, based o
 
 You have to create a new table in Kamailio (OpenSER) database:
 
-CREATE TABLE `statistics` (
+ CREATE TABLE `statistics` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `time_stamp` int(10) unsigned NOT NULL default '0',
   `random` int(10) unsigned NOT NULL default '0',
@@ -60,7 +60,7 @@ CREATE TABLE `statistics` (
   `ul_users` int(10) unsigned NOT NULL default '0',
   `ul_contacts` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM;
+ ) ENGINE=MyISAM;
 
 Now all is ready for Kamailio (OpenSER), you can restart it.
 
diff --git a/plugins/libreoffice/loolwsd b/plugins/libreoffice/loolwsd
index 81df86d6..cd814d8d 100755
--- a/plugins/libreoffice/loolwsd
+++ b/plugins/libreoffice/loolwsd
@@ -22,10 +22,10 @@ Set username, password of admin user and if required an url in your
 munin-node configuration. Default url is 
 http://127.0.0.1:9980/lool/getMetrics
 
-[loolwsd]
-env.username <lool_admin>
-env.password <lool_password>
-env.url <lool_getmetrics_url>
+ [loolwsd]
+ env.username <lool_admin>
+ env.password <lool_password>
+ env.url <lool_getmetrics_url>
 
 You can set an administative user for loolwsd by invoking
 
diff --git a/plugins/mail/nullmailer_queue b/plugins/mail/nullmailer_queue
index 04aceb3c..c281147d 100755
--- a/plugins/mail/nullmailer_queue
+++ b/plugins/mail/nullmailer_queue
@@ -23,11 +23,11 @@ failed_critical etc.
 
 Example:
 
-[nullmailer_queue]
-user nullmail
-env.queuedir /var/spool/nullmailer/queue
-env.errordir /var/spool/nullmailer/failed
-env.queue_warning 10
+  [nullmailer_queue]
+  user nullmail
+  env.queuedir /var/spool/nullmailer/queue
+  env.errordir /var/spool/nullmailer/failed
+  env.queue_warning 10
 
 =head1 INTERPRETATION
 
diff --git a/plugins/memcached/memcached_ext_bytes_ b/plugins/memcached/memcached_ext_bytes_
index 7b1606f8..31a9c391 100755
--- a/plugins/memcached/memcached_ext_bytes_
+++ b/plugins/memcached/memcached_ext_bytes_
@@ -11,13 +11,13 @@ use Cache::Memcached;
 
 =head1 example config for /plugin-conf.d/munin-node
 
-[memcached_bytes_1]
-env.server 127.0.0.1:11211
-env.label "first local server"
+ [memcached_bytes_1]
+ env.server 127.0.0.1:11211
+ env.label "first local server"
 
-[memcached_bytes_2]
-env.server /var/run/memcached/memcached.sock
-env.label "second local server"
+ [memcached_bytes_2]
+ env.server /var/run/memcached/memcached.sock
+ env.label "second local server"
 
 =cut
 
diff --git a/plugins/memcached/memcached_ext_connections_ b/plugins/memcached/memcached_ext_connections_
index f4b0d497..c654c7e5 100755
--- a/plugins/memcached/memcached_ext_connections_
+++ b/plugins/memcached/memcached_ext_connections_
@@ -11,13 +11,13 @@ use Cache::Memcached;
 
 =head1 example config for /plugin-conf.d/munin-node
 
-[memcached_connections_1]
-env.server 127.0.0.1:11211
-env.label "first local server"
+ [memcached_connections_1]
+ env.server 127.0.0.1:11211
+ env.label "first local server"
 
-[memcached_connections_2]
-env.server /var/run/memcached/memcached.sock
-env.label "second local server"
+ [memcached_connections_2]
+ env.server /var/run/memcached/memcached.sock
+ env.label "second local server"
 
 =cut
 
diff --git a/plugins/memcached/memcached_ext_hits_ b/plugins/memcached/memcached_ext_hits_
index 8e23ef98..3163e79a 100755
--- a/plugins/memcached/memcached_ext_hits_
+++ b/plugins/memcached/memcached_ext_hits_
@@ -11,13 +11,13 @@ use Cache::Memcached;
 
 =head1 example config for /plugin-conf.d/munin-node
 
-[memcached_hits_1]
-env.server 127.0.0.1:11211
-env.label "first local server"
+ [memcached_hits_1]
+ env.server 127.0.0.1:11211
+ env.label "first local server"
 
-[memcached_hits_2]
-env.server /var/run/memcached/memcached.sock
-env.label "second local server"
+ [memcached_hits_2]
+ env.server /var/run/memcached/memcached.sock
+ env.label "second local server"
 
 =cut
 
diff --git a/plugins/memcached/memcached_ext_items_ b/plugins/memcached/memcached_ext_items_
index 53904e53..607be4fd 100755
--- a/plugins/memcached/memcached_ext_items_
+++ b/plugins/memcached/memcached_ext_items_
@@ -11,13 +11,13 @@ use Cache::Memcached;
 
 =head1 example config for /plugin-conf.d/munin-node
 
-[memcached_items_1]
-env.server 127.0.0.1:11211
-env.label "first local server"
+ [memcached_items_1]
+ env.server 127.0.0.1:11211
+ env.label "first local server"
 
-[memcached_items_2]
-env.server /var/run/memcached/memcached.sock
-env.label "second local server"
+ [memcached_items_2]
+ env.server /var/run/memcached/memcached.sock
+ env.label "second local server"
 
 =cut
 
diff --git a/plugins/memcached/memcached_ext_requests_ b/plugins/memcached/memcached_ext_requests_
index 0172a2c2..659ebf17 100755
--- a/plugins/memcached/memcached_ext_requests_
+++ b/plugins/memcached/memcached_ext_requests_
@@ -11,13 +11,13 @@ use Cache::Memcached;
 
 =head1 example config for /plugin-conf.d/munin-node
 
-[memcached_requests_1]
-env.server 127.0.0.1:11211
-env.label "first local server"
+ [memcached_requests_1]
+ env.server 127.0.0.1:11211
+ env.label "first local server"
 
-[memcached_requests_2]
-env.server /var/run/memcached/memcached.sock
-env.label "second local server"
+ [memcached_requests_2]
+ env.server /var/run/memcached/memcached.sock
+ env.label "second local server"
 
 =cut
 
diff --git a/plugins/memcached/memcached_ext_traffic_ b/plugins/memcached/memcached_ext_traffic_
index f77e1d98..3ccf9e0f 100755
--- a/plugins/memcached/memcached_ext_traffic_
+++ b/plugins/memcached/memcached_ext_traffic_
@@ -11,13 +11,13 @@ use Cache::Memcached;
 
 =head1 example config for /plugin-conf.d/munin-node
 
-[memcached_traffic_1]
-env.server 127.0.0.1:11211
-env.label "first local server"
+ [memcached_traffic_1]
+ env.server 127.0.0.1:11211
+ env.label "first local server"
 
-[memcached_traffic_2]
-env.server /var/run/memcached/memcached.sock
-env.label "second local server"
+ [memcached_traffic_2]
+ env.server /var/run/memcached/memcached.sock
+ env.label "second local server"
 
 =cut
 
diff --git a/plugins/memcached/memcached_multi_ b/plugins/memcached/memcached_multi_
index 36048acc..6ed10241 100755
--- a/plugins/memcached/memcached_multi_
+++ b/plugins/memcached/memcached_multi_
@@ -14,7 +14,7 @@ Memcached Multi - A Plugin to monitor Memcached Servers (Multigraph)
 The following configuration information can be overridden by placing environment definitions
  like shown here, in a file located in /etc/munin/plugin-conf.d
 
-[memcached_multi_*]
+ [memcached_multi_*]
  env.host 127.0.0.1                             *default*
  env.port 11211                                 *default*
  env.timescale 3                                *default*
@@ -32,7 +32,7 @@ The following configuration information can be overridden by placing environment
 =head2 BASIC TROUBLESHOOTING
 
 Please make sure you can telnet to your memcache servers and issue the
- following commands: stats, stats settings, stats items and stats slabs.
+following commands: stats, stats settings, stats items and stats slabs.
 
 =head2 PLUGIN INFORMATION
 
@@ -88,8 +88,8 @@ GPLv2
 
 =head1 MAGIC MARKERS
 
-#%# family=auto
-#%# capabilities=autoconf suggest
+ #%# family=auto
+ #%# capabilities=autoconf suggest
 
 =cut
 
diff --git a/plugins/memcached/memcached_servers_ b/plugins/memcached/memcached_servers_
index fb80ee91..3ea5e57b 100755
--- a/plugins/memcached/memcached_servers_
+++ b/plugins/memcached/memcached_servers_
@@ -8,7 +8,7 @@ memcached_servers_ - Munin multigraph plugin to monitor multiple memcache server
 You need to configure the to-be-used servers and the corresponding labels separated
 by spaace in your environment. Example:
 
-[memcached_servers_*]
+  [memcached_servers_*]
   env.addresses cache1.server.com:11211 cache2.server.com:11211
   env.labels master slave
 
diff --git a/plugins/nagios/nagios_multi_ b/plugins/nagios/nagios_multi_
index cb45d85a..164fbf62 100755
--- a/plugins/nagios/nagios_multi_
+++ b/plugins/nagios/nagios_multi_
@@ -6,7 +6,7 @@ A Plugin to monitor Nagios Servers and their Performance (Multigraph)
 
 =head1 MUNIN CONFIGURATION
 
-[nagios_multi_*]
+ [nagios_multi_*]
  user root
  env.binary /usr/local/nagios/bin/nagiostats *default*
  env.passive off *default*
@@ -61,8 +61,8 @@ GPLv2
 
 =head1 MAGIC MARKERS
 
-#%# family=auto
-#%# capabilities=autoconf suggest
+ #%# family=auto
+ #%# capabilities=autoconf suggest
 
 =cut
 
diff --git a/plugins/netapp/snmp__netapp_cifs2 b/plugins/netapp/snmp__netapp_cifs2
index 140fa48f..48391653 100755
--- a/plugins/netapp/snmp__netapp_cifs2
+++ b/plugins/netapp/snmp__netapp_cifs2
@@ -19,8 +19,8 @@ insecure because it doesn't encrypt the community string.
 
 The following parameters will help you get this plugin working :
 
-[snmp_*]
-env.community MyCommunity
+ [snmp_*]
+ env.community MyCommunity
 
 If your community name is 'public', you should really worry about
 security and immediately reconfigure your appliance.
@@ -38,8 +38,8 @@ Network Appliance. It reports the content of the cifs OID.
 
 =head1 MAGIC MARKERS
 
-  #%# family=snmpauto
-  #%# capabilities=snmpconf
+ #%# family=snmpauto
+ #%# capabilities=snmpconf
 
 =head1 BUGS
 
@@ -48,6 +48,7 @@ This plugin wasn't tested on many hardware and only on Ontap 7.3.x.
 =head1 AUTHOR
 
 2013, Claudius Herder
+
 NetApp is a registered trademark and Network Appliance is a trademark
 of Network Appliance, Inc. in the U.S. and other countries.
 
diff --git a/plugins/netapp/snmp__netapp_cifscalls b/plugins/netapp/snmp__netapp_cifscalls
index a1d862b3..e70dd4d1 100755
--- a/plugins/netapp/snmp__netapp_cifscalls
+++ b/plugins/netapp/snmp__netapp_cifscalls
@@ -19,8 +19,8 @@ insecure because it doesn't encrypt the community string.
 
 The following parameters will help you get this plugin working :
 
-[snmp_*]
-env.community MyCommunity
+ [snmp_*]
+ env.community MyCommunity
 
 If your community name is 'public', you should really worry about
 security and immediately reconfigure your appliance.
@@ -40,8 +40,8 @@ Network Appliance. It reports the content of the cifs OID.
 
 =head1 MAGIC MARKERS
 
-    #%# family=snmpauto
-    #%# capabilities=snmpconf
+ #%# family=snmpauto
+ #%# capabilities=snmpconf
 
 =head1 BUGS
 
@@ -50,6 +50,7 @@ This plugin wasn't tested on many hardware and only on Ontap 7.3.x.
 =head1 AUTHOR
 
 2013, Claudius Herder
+
 NetApp is a registered trademark and Network Appliance is a trademark
 of Network Appliance, Inc. in the U.S. and other countries.
 
diff --git a/plugins/netapp/snmp__netapp_cpu2 b/plugins/netapp/snmp__netapp_cpu2
index b1a577af..63b4feea 100755
--- a/plugins/netapp/snmp__netapp_cpu2
+++ b/plugins/netapp/snmp__netapp_cpu2
@@ -19,8 +19,8 @@ insecure because it doesn't encrypt the community string.
 
 The following parameters will help you get this plugin working :
 
-[snmp_*]
-env.community MyCommunity
+ [snmp_*]
+ env.community MyCommunity
 
 If your community name is 'public', you should really worry about
 security and immediately reconfigure your appliance.
@@ -38,8 +38,8 @@ Network Appliance. It reports the content of the cpu OID.
 
 =head1 MAGIC MARKERS
 
-  #%# family=snmpauto
-  #%# capabilities=snmpconf
+ #%# family=snmpauto
+ #%# capabilities=snmpconf
 
 =head1 BUGS
 
@@ -48,6 +48,7 @@ This plugin wasn't tested on many hardware and only on Ontap 7.3.x.
 =head1 AUTHOR
 
 2013, Claudius Herder
+
 NetApp is a registered trademark and Network Appliance is a trademark
 of Network Appliance, Inc. in the U.S. and other countries.
 
diff --git a/plugins/netapp/snmp__netapp_diskusage2_ b/plugins/netapp/snmp__netapp_diskusage2_
index fe0e5312..3847c120 100755
--- a/plugins/netapp/snmp__netapp_diskusage2_
+++ b/plugins/netapp/snmp__netapp_diskusage2_
@@ -19,8 +19,8 @@ insecure because it doesn't encrypt the community string.
 
 The following parameters will help you get this plugin working :
 
-[snmp_*]
-env.community MyCommunity
+ [snmp_*]
+ env.community MyCommunity
 
 If your community name is 'public', you should really worry about
 security and immediately reconfigure your appliance.
@@ -38,8 +38,8 @@ Network Appliance. It reports the content of the cifs OID.
 
 =head1 MAGIC MARKERS
 
-  #%# family=snmpauto
-  #%# capabilities=snmpconf
+ #%# family=snmpauto
+ #%# capabilities=snmpconf
 
 =head1 BUGS
 
@@ -48,6 +48,7 @@ This plugin wasn't tested on many hardware and only on Ontap 7.3.x.
 =head1 AUTHOR
 
 2013, Claudius Herder
+
 NetApp is a registered trademark and Network Appliance is a trademark
 of Network Appliance, Inc. in the U.S. and other countries.
 
diff --git a/plugins/netapp/snmp__netapp_diskutil b/plugins/netapp/snmp__netapp_diskutil
index 4efada8b..c1202962 100755
--- a/plugins/netapp/snmp__netapp_diskutil
+++ b/plugins/netapp/snmp__netapp_diskutil
@@ -19,8 +19,8 @@ insecure because it doesn't encrypt the community string.
 
 The following parameters will help you get this plugin working :
 
-[snmp_*]
-env.community MyCommunity
+ [snmp_*]
+ env.community MyCommunity
 
 If your community name is 'public', you should really worry about
 security and immediately reconfigure your appliance.
@@ -38,8 +38,8 @@ Network Appliance. It reports the content of the cifs OID.
 
 =head1 MAGIC MARKERS
 
-  #%# family=snmpauto
-  #%# capabilities=snmpconf
+ #%# family=snmpauto
+ #%# capabilities=snmpconf
 
 =head1 BUGS
 
@@ -48,6 +48,7 @@ This plugin wasn't tested on many hardware and only on Ontap 7.3.x.
 =head1 AUTHOR
 
 2013, Claudius Herder
+
 NetApp is a registered trademark and Network Appliance is a trademark
 of Network Appliance, Inc. in the U.S. and other countries.
 
diff --git a/plugins/netapp/snmp__netapp_ndmp b/plugins/netapp/snmp__netapp_ndmp
index 24275f07..762982c6 100755
--- a/plugins/netapp/snmp__netapp_ndmp
+++ b/plugins/netapp/snmp__netapp_ndmp
@@ -19,8 +19,8 @@ insecure because it doesn't encrypt the community string.
 
 The following parameters will help you get this plugin working :
 
-[snmp_*]
-env.community MyCommunity
+ [snmp_*]
+ env.community MyCommunity
 
 If your community name is 'public', you should really worry about
 security and immediately reconfigure your appliance.
@@ -38,8 +38,8 @@ Network Appliance. It reports the content of the cifs OID.
 
 =head1 MAGIC MARKERS
 
-  #%# family=snmpauto
-  #%# capabilities=snmpconf
+ #%# family=snmpauto
+ #%# capabilities=snmpconf
 
 =head1 BUGS
 
@@ -48,6 +48,7 @@ This plugin wasn't tested on many hardware and only on Ontap 7.3.x.
 =head1 AUTHOR
 
 2013, Claudius Herder
+
 NetApp is a registered trademark and Network Appliance is a trademark
 of Network Appliance, Inc. in the U.S. and other countries.
 
diff --git a/plugins/netapp/snmp__netapp_net b/plugins/netapp/snmp__netapp_net
index 09935dcc..f3a3621f 100755
--- a/plugins/netapp/snmp__netapp_net
+++ b/plugins/netapp/snmp__netapp_net
@@ -19,8 +19,8 @@ insecure because it doesn't encrypt the community string.
 
 The following parameters will help you get this plugin working :
 
-[snmp_*]
-env.community MyCommunity
+ [snmp_*]
+ env.community MyCommunity
 
 If your community name is 'public', you should really worry about
 security and immediately reconfigure your appliance.
@@ -38,8 +38,8 @@ Network Appliance. It reports the content of the cifs OID.
 
 =head1 MAGIC MARKERS
 
-  #%# family=snmpauto
-  #%# capabilities=snmpconf
+ #%# family=snmpauto
+ #%# capabilities=snmpconf
 
 =head1 BUGS
 
@@ -48,6 +48,7 @@ This plugin wasn't tested on many hardware and only on Ontap 7.3.x.
 =head1 AUTHOR
 
 2013, Claudius Herder
+
 NetApp is a registered trademark and Network Appliance is a trademark
 of Network Appliance, Inc. in the U.S. and other countries.
 
diff --git a/plugins/netapp/snmp__netapp_nfs3calls b/plugins/netapp/snmp__netapp_nfs3calls
index c85130d9..d9e50853 100755
--- a/plugins/netapp/snmp__netapp_nfs3calls
+++ b/plugins/netapp/snmp__netapp_nfs3calls
@@ -18,8 +18,8 @@ insecure because it doesn't encrypt the community string.
 
 The following parameters will help you get this plugin working:
 
-[snmp_*]
-env.community MyCommunity
+ [snmp_*]
+ env.community MyCommunity
 
 If your community name is 'public', you should really worry about
 security and immediately reconfigure your appliance.
@@ -39,12 +39,13 @@ Network Appliance. It reports the content of the v3Calls OID.
 
 =head1 MAGIC MARKERS
 
-#%# family=snmpauto
-#%# capabilities=snmpconf
+ #%# family=snmpauto
+ #%# capabilities=snmpconf
 
 =head1 VERSION
 
 v1.0 - 06/19/2009 18:36:02 CEST
+
 Initial revision
 
 =head1 AUTHOR
@@ -63,6 +64,8 @@ please report any to Guillaume Blairon E<lt>L<g@yom.be>E<gt>.
 
 GPLv2 or (at your option) any later version.
 
+SPDX-License-Identifier: GPL-2.0-or-later
+
 =cut
 
 use strict;
diff --git a/plugins/netapp/snmp__netapp_ops b/plugins/netapp/snmp__netapp_ops
index 3ffd15d1..a917515f 100755
--- a/plugins/netapp/snmp__netapp_ops
+++ b/plugins/netapp/snmp__netapp_ops
@@ -19,8 +19,8 @@ insecure because it doesn't encrypt the community string.
 
 The following parameters will help you get this plugin working :
 
-[snmp_*]
-env.community MyCommunity
+ [snmp_*]
+ env.community MyCommunity
 
 If your community name is 'public', you should really worry about
 security and immediately reconfigure your appliance.
@@ -38,8 +38,8 @@ Network Appliance. It reports the content of the cifs OID.
 
 =head1 MAGIC MARKERS
 
-  #%# family=snmpauto
-  #%# capabilities=snmpconf
+ #%# family=snmpauto
+ #%# capabilities=snmpconf
 
 =head1 BUGS
 
@@ -48,6 +48,7 @@ This plugin wasn't tested on many hardware and only on Ontap 7.3.x.
 =head1 AUTHOR
 
 2013, Claudius Herder
+
 NetApp is a registered trademark and Network Appliance is a trademark
 of Network Appliance, Inc. in the U.S. and other countries.
 
diff --git a/plugins/netapp/snmp__netapp_sis b/plugins/netapp/snmp__netapp_sis
index 07dbff10..0b3c3032 100755
--- a/plugins/netapp/snmp__netapp_sis
+++ b/plugins/netapp/snmp__netapp_sis
@@ -19,8 +19,8 @@ insecure because it doesn't encrypt the community string.
 
 The following parameters will help you get this plugin working :
 
-[snmp_*]
-env.community MyCommunity
+ [snmp_*]
+ env.community MyCommunity
 
 If your community name is 'public', you should really worry about
 security and immediately reconfigure your appliance.
@@ -39,8 +39,8 @@ Network Appliance. It reports the content of the sis OID.
 
 =head1 MAGIC MARKERS
 
-  #%# family=snmpauto
-  #%# capabilities=snmpconf
+ #%# family=snmpauto
+ #%# capabilities=snmpconf
 
 =head1 BUGS
 
@@ -49,6 +49,7 @@ This plugin wasn't tested on many hardware and only on Ontap 7.3.x.
 =head1 AUTHOR
 
 2013, Claudius Herder
+
 NetApp is a registered trademark and Network Appliance is a trademark
 of Network Appliance, Inc. in the U.S. and other countries.
 
diff --git a/plugins/network/linux_if/linux_if b/plugins/network/linux_if/linux_if
index 19944008..3b158e18 100755
--- a/plugins/network/linux_if/linux_if
+++ b/plugins/network/linux_if/linux_if
@@ -1,19 +1,31 @@
 #!/usr/bin/env python
 
 """
+=head1 NAME
+
 linux_if - munin plugin monitoring Linux network interfaces
 
+
+=head1 DESCRIPTION
+
 This is not a wildcard plugin. Monitored interfaces are controlled
 by 'include', 'exclude' in config. By default, only statically
 configured interfaces (and their sub-interfaces) are monitored.
 
 Features:
-* bonding - group bonding slave interfaces with master
-* vlans - group vlan sub-interfaces with main (dot1q trunk) interface
 
-plugin configuration:
+=over
 
-[linux_if]
+=item bonding - group bonding slave interfaces with master
+
+=item vlans - group vlan sub-interfaces with main (dot1q trunk) interface
+
+=back
+
+
+=head1 CONFIGURATION
+
+  [linux_if]
   # run plugin as root (required if you have VLAN sub-interfaces)
   user = root
 
@@ -31,22 +43,44 @@ plugin configuration:
   # default: true
   env.include_configured_if = true
 
-Include/exclude logic in detail. Interface name is matched..
-1) if matched by any exclude pattern, then exclude. Otherwise next step.
-2) if matched by any include pattern, then include, Otherwise next step.
-3) if 'include_configured_if' is true and 'ifcfg-*' file exists then include
-4) default is not to include interface in monitoring
-5) automatically include sub-interface, if the parent interface is monitored
+Include/exclude logic in detail. Interface name is matched according to the following rules:
+
+=over 4
+
+=item 1. if matched by any exclude pattern, then exclude. Otherwise next step.
+
+=item 2. if matched by any include pattern, then include, Otherwise next step.
+
+=item 3. if 'include_configured_if' is true and 'ifcfg-*' file exists then include
+
+=item 4. default is not to include interface in monitoring
+
+=item 5. automatically include sub-interface, if the parent interface is monitored
+
+=back
 
 Tested on: RHEL 6.x and clones (with Python 2.6)
 
-TODO:
-* implement 'data loaning' between graphs, removes duplicit measures
-* add support for bridging
-* configurable graph max based on interface speed
 
-MUNIN MAGIC MARKER
-#%# family=manual
+=head1 TODO
+
+=over 4
+
+=item implement 'data loaning' between graphs, removes duplicit measures
+
+=item add support for bridging
+
+=item configurable graph max based on interface speed
+
+=back
+
+
+=head1 MAGIC MARKERS
+
+ #%# family=manual
+
+
+=cut
 """
 
 __author__ = 'Brano Zarnovican'
diff --git a/plugins/network/multibandwidth b/plugins/network/multibandwidth
index e1a763ac..1074032d 100755
--- a/plugins/network/multibandwidth
+++ b/plugins/network/multibandwidth
@@ -23,34 +23,39 @@ You can install bing by using (Ubuntu/Debian): apt-get install bing
 The following example configuration shows all settings. Only "hosts" is required for
 minimal configuration.
 
-[multibandwidth]
-user root
-env.hosts example.org example2.org example3.org
-env.samples 15
-env.small_packet_size 44
-env.big_packet_size 108
-env.max_valid_bps 15728640
+ [multibandwidth]
+ user root
+ env.hosts example.org example2.org example3.org
+ env.samples 15
+ env.small_packet_size 44
+ env.big_packet_size 108
+ env.max_valid_bps 15728640
 
-- env.hosts: space separated list of hostnames or IPs of the hosts to calculate the bandwidth.
+=over 4
+
+=item env.hosts: space separated list of hostnames or IPs of the hosts to calculate the bandwidth.
         This setting is required.
 
-- env.samples: Reset stats after sending this number of ECHO_REQUEST packets.
+=item env.samples: Reset stats after sending this number of ECHO_REQUEST packets.
         Defaults to 15 samples.
 
-- env.small_packet_size: Specifies the number of data bytes to be sent in the small
+=item env.small_packet_size: Specifies the number of data bytes to be sent in the small
         packets. The default and minimum value is 44.
 
-- env.big_packet_size: Specifies the number of data bytes to be sent in the big
+=item env.big_packet_size: Specifies the number of data bytes to be sent in the big
         packets. The default is 108. The size should be chosen so that big packet roundtrip times
         are long enough to be accurately measured.
 
-- env.max_valid_bps: bing have some random spikes. This variable is used to indicate
+=item env.max_valid_bps: bing have some random spikes. This variable is used to indicate
         the maximum value of mbps that can be recorded (in bps).
         Defaults to the empty string (no validity check).
 
+=back
+
+
 =head1 MAGIC MARKERS
 
-#%# capabilities=autoconf
+ #%# capabilities=autoconf
 
 =head1 VERSION
 
@@ -59,6 +64,7 @@ env.max_valid_bps 15728640
 =head1 AUTHOR
 
 Jose Manuel Febrer Cortés <https://www.linkedin.com/in/jfebrer/>
+
 Marco Bertola’s help <https://www.linkedin.com/in/bertolamarco/>
 
 =head1 LICENSE
diff --git a/plugins/newznab/nn_ b/plugins/newznab/nn_
index 41f13395..f81025a0 100755
--- a/plugins/newznab/nn_
+++ b/plugins/newznab/nn_
@@ -6,6 +6,7 @@
 
 nn_ - Munin plugin to display misc newznab stats.
 
+
 =head1 CONFIGURATION
 
 This script is used to generate data for several graphs. To generate
@@ -13,10 +14,13 @@ data for one specific graph, you need to create a symbolic link with a
 name like nn_<GRAPH> to this script.
 
 To get a graph over numbers of users use nn_users
+
+
 =head1 APPLICABLE SYSTEMS
 
 Any MySQL platform, tested by the author on MySQL 5.1.29 and 5.0.51
 
+
 =head1 CONFIGURATION
 
 This script is used to generate data for several graphs. To generate
@@ -25,10 +29,10 @@ name like nn_<GRAPH> to this script.
 
 connection parameters - use this in your plugin configuration file.
 
-[nn_*]
-env.mysqlconnection DBI:mysql:<yourdatabase>;host=127.0.0.1;port=3306
-env.mysqluser <user>
-env.mysqlpassword <password>
+ [nn_*]
+ env.mysqlconnection DBI:mysql:<yourdatabase>;host=127.0.0.1;port=3306
+ env.mysqluser <user>
+ env.mysqlpassword <password>
 
 
 =head1 DEPENDENCIES
@@ -39,10 +43,13 @@ env.mysqlpassword <password>
 
 =back
 
+
 =head1 THANKS
+
 A special thanks to Kjell-Magne Øierud for the mysql_ plugin in munin which
 gave me the inspiration and reusable code to create this plugin.
 
+
 =head1 LICENSE
 
 Copyright (C) 2012 Jan Astrup (cryzeck@synIRC)
@@ -61,6 +68,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 USA.
 
+SPDX-License-Identifier: GPL-2.0-only
+
 =cut
 
 use warnings;
diff --git a/plugins/nextcloud/nextcloud_ b/plugins/nextcloud/nextcloud_
index 85538dfd..de510feb 100755
--- a/plugins/nextcloud/nextcloud_
+++ b/plugins/nextcloud/nextcloud_
@@ -26,13 +26,13 @@ nextcloud_<nextcloud-domain> to this file. You can even append a port
 
 Set username and password in your munin-node configuration
 
-[nextcloud_cloud.domain.tld]
-env.username <nexcloud_user>
-env.password <nextcloud_password>
-env.api_path <default: /ocs/v2.php/apps/serverinfo/api/v1/info>
-env.scheme <default: https>
-env.timeout <default: 2s>
-env.updates_warning <default: 1>
+ [nextcloud_cloud.domain.tld]
+ env.username <nexcloud_user>
+ env.password <nextcloud_password>
+ env.api_path <default: /ocs/v2.php/apps/serverinfo/api/v1/info>
+ env.scheme <default: https>
+ env.timeout <default: 2s>
+ env.updates_warning <default: 1>
 
 It's advised to set an app password (for this plugin) in your nextcloud 
 instance and not to use the "real" password of your nextcloud user.
diff --git a/plugins/openfire/openfire_ b/plugins/openfire/openfire_
index 3e992f9e..1bc47acd 100755
--- a/plugins/openfire/openfire_
+++ b/plugins/openfire/openfire_
@@ -33,20 +33,19 @@ You need to have the Openfire "Load Statistic" Plugin-installed!
 
 This plugin is configurable environment variables.
 
-
-user root 		must be root user
-env.statsfile 	path to stats.txt file
+ user root 		must be root user
+ env.statsfile 	path to stats.txt file
 
 Example:
 
-[openfire_*]
-user root
-env.statsfile /var/log/openfire/stats.txt
+ [openfire_*]
+ user root
+ env.statsfile /var/log/openfire/stats.txt
 
 
 =head1 AUTHOR
 
-Philipp Haussleiter <philipp@haussleiter.de> (email)
+Philipp Haussleiter <philipp@haussleiter.de>
 
 =head1 LICENSE
 
diff --git a/plugins/other/opentracker_ b/plugins/other/opentracker_
index 2be0dc6d..d7165d4a 100755
--- a/plugins/other/opentracker_
+++ b/plugins/other/opentracker_
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 #
-=head1 OPENTRACKER PLUGIN
+=head1 NAME
 
 A Plugin to monitor OpenTracker Servers and their Performance
 
 =head1 MUNIN CONFIGURATION
 
-[opentracker*]
+ [opentracker*]
  env.host 127.0.0.1      *default*
  env.port 6969           *default*
  env.uri /stats          *default*
@@ -31,8 +31,8 @@ GPLv2
 
 =head1 MAGIC MARKERS
 
-#%# family=auto
-#%# capabilities=autoconf suggest
+ #%# family=auto
+ #%# capabilities=autoconf suggest
 
 =cut
 
diff --git a/plugins/pf/pf_tables_ b/plugins/pf/pf_tables_
index b0caf141..97687c3e 100755
--- a/plugins/pf/pf_tables_
+++ b/plugins/pf/pf_tables_
@@ -25,8 +25,8 @@ Examples:
 
 =head1 CONFIGURATION
 
-[pf_tables_*]
-user root
+  [pf_tables_*]
+  user root
 
 =head1 INTERPRETATION
 
diff --git a/plugins/php/php_fpm_process b/plugins/php/php_fpm_process
index d4ff5191..4eabc971 100755
--- a/plugins/php/php_fpm_process
+++ b/plugins/php/php_fpm_process
@@ -17,14 +17,17 @@ You will need the perl fastcgi::client on your host
 
 You have to put this in your plugin.conf.d folder
 
-# If your php process is listening on TCP
-[php_fpm_process]
+In case your php process is listening on TCP:
+
+   [php_fpm_process]
    env.serveraddr 127.0.0.1
    env.port 9000
    env.path /status
 
-# If your php process is listening on Unix Socket
-[php_fpm_process]
+
+In case your php process is listening on a Unix Socket:
+
+   [php_fpm_process]
    env.sock /var/run/php-fpm.sock
    env.path /status
 
@@ -40,6 +43,7 @@ You have to put this in your plugin.conf.d folder
 =head1 AUTHOR
 
 Minitux
+
 Olivier Mehani <shtrom+munin@ssji.net>
 
 =head1 LICENSE
diff --git a/plugins/router/arris-sb6183 b/plugins/router/arris-sb6183
index 7cd11787..258f09f7 100755
--- a/plugins/router/arris-sb6183
+++ b/plugins/router/arris-sb6183
@@ -24,10 +24,18 @@ arris-sb6183 - Health monitoring plugin for Arris SB6183 Cable Modem
 =head1 DESCRIPTION
 
 This provides the following multigraphs:
-* upstream and downstream power levels
-* downstream signal to noise ratio
-* downstream error counts
-* uptime
+
+=over 4
+
+=item upstream and downstream power levels
+
+=item downstream signal to noise ratio
+
+=item downstream error counts
+
+=item uptime
+
+=back
 
 The values are retrieved from the cable modem's status web pages at
 192.168.100.1. So, this plugin must be installed on a munin node
@@ -40,8 +48,8 @@ Make sure 192.168.100.1 is accessible through your firewall.
 To have this register with munin as it's own host set the "env.hostname" in config.
 Also ensure that the hostname set is listed in munin.conf.
 
-[arris*]
-env.hostname modem
+ [arris*]
+ env.hostname modem
 
 =head1 TESTING
 
diff --git a/plugins/router/arris-tg3442 b/plugins/router/arris-tg3442
index 604807e1..da6d69d3 100755
--- a/plugins/router/arris-tg3442
+++ b/plugins/router/arris-tg3442
@@ -12,20 +12,28 @@ downstream channels. (Signal Power, SNR, Lock Status)
 
 
 =head1 REQUIREMENTS
-- BeautifulSoup
-- pycryptodome
+
+=over 4
+
+=item BeautifulSoup
+
+=item pycryptodome
+
+=back
 
 
 =head1 CONFIGURATION
 
 =head2 Example
-[arris]
-env.url http://192.168.100.1
-env.username admin
-env.password yourpassword
+
+ [arris]
+ env.url http://192.168.100.1
+ env.username admin
+ env.password yourpassword
 
 
 =head2 Parameters
+
 url      - URL to web-frontend
 username - defaults to "admin"
 password - valid password
@@ -37,22 +45,25 @@ https://www.arris.com/products/touchstone-tg3442-cable-voice-gateway/
 
 =head1 AUTHOR
 
- Copyright (c) 2019 Daniel Hiepler <d-munin@coderdu.de>
- Copyright (c) 2004-2009 Nicolas Stransky <Nico@stransky.cx>
- Copyright (c) 2018 Lars Kruse <devel@sumpfralle.de>
+Copyright (c) 2019 Daniel Hiepler <d-munin@coderdu.de>
+
+Copyright (c) 2004-2009 Nicolas Stransky <Nico@stransky.cx>
+
+Copyright (c) 2018 Lars Kruse <devel@sumpfralle.de>
 
 
 =head1 LICENSE
- Permission to use, copy, and modify this software with or without fee
- is hereby granted, provided that this entire notice is included in
- all source code copies of any software which is or includes a copy or
- modification of this software.
 
- THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- PURPOSE.
+Permission to use, copy, and modify this software with or without fee
+is hereby granted, provided that this entire notice is included in
+all source code copies of any software which is or includes a copy or
+modification of this software.
+
+THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
+REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
+MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
+PURPOSE.
 
 
 =head1 MAGIC MARKERS
diff --git a/plugins/snmp/snmp__airport b/plugins/snmp/snmp__airport
index b6687ddc..7235d51f 100755
--- a/plugins/snmp/snmp__airport
+++ b/plugins/snmp/snmp__airport
@@ -1,43 +1,70 @@
 #!/usr/bin/python
 """
-Munin plugin to monitor various items of data from an Apple Airport
-Express/Extreme or a Time Capsule.
 
-v1.0 by Chris Jones <cmsj@tenshu.net>
-Copyright (C) 2011 Chris Jones
-This script is released under the GNU GPL v2 license.
+=head1 NAME
+
+Munin plugin to monitor various items of data from an Apple Airport Express/Extreme or a Time Capsule.
+
+
+=head1 INSTALLATION
 
 To use this plugin, use specially named symlinks:
 
-cd /etc/munin/plugins
-ln -s /path/to/snmp__airport snmp_myairport_airport_clients
-ln -s /path/to/snmp__airport snmp_myairport_airport_dhcpclients
-ln -s /path/to/snmp__airport snmp_myairport_airport_rate
-ln -s /path/to/snmp__airport snmp_myairport_airport_signal
-ln -s /path/to/snmp__airport snmp_myairport_airport_noise
+ cd /etc/munin/plugins
+ ln -s /path/to/snmp__airport snmp_myairport_airport_clients
+ ln -s /path/to/snmp__airport snmp_myairport_airport_dhcpclients
+ ln -s /path/to/snmp__airport snmp_myairport_airport_rate
+ ln -s /path/to/snmp__airport snmp_myairport_airport_signal
+ ln -s /path/to/snmp__airport snmp_myairport_airport_noise
 
 NOTE: the name 'myairport' should be a valid hostname or IP address for your
       Airport. It can be any value, but it must not include the character '_'.
 
 Now add a virtual host entry to your munin server's munin.conf:
 
-[myairport]
-    address 123.123.123.123
-    user_node_name no
+ [myairport]
+ address 123.123.123.123
+ user_node_name no
 
 (with the correct IP address, obviously)
 
 this will create a virtual host in munin for the airport named 'myairport' and
 produce graphs for:
-    * number of connected wireless clients
-    * number of active DHCP leases
-    * rate at which clients are connected (in Mb/s)
-    * signal quality of connected clients (in dB)
-    * noise level of connected clients (in dB)
 
-# Magic markers
-#%# capabilities=
-#%# family=contrib manual
+=over 4
+
+=item number of connected wireless clients
+
+=item number of active DHCP leases
+
+=item rate at which clients are connected (in Mb/s)
+
+=item signal quality of connected clients (in dB)
+
+=item noise level of connected clients (in dB)
+
+=back
+
+
+=head1 AUTHORS
+
+Copyright (C) 2011 Chris Jones <cmsj@tenshu.net>
+
+
+=head1 LICENSE
+
+This script is released under the GNU GPL v2 license.
+
+SPDX-License-Identifier: GPL-2.0-only
+
+
+=head1 MAGIC MARKERS
+
+ #%# capabilities=
+ #%# family=contrib manual
+
+
+=cut
 """
 import sys
 import os
diff --git a/plugins/ssl/certificate_file_expiry b/plugins/ssl/certificate_file_expiry
index 09f2b854..5626040c 100755
--- a/plugins/ssl/certificate_file_expiry
+++ b/plugins/ssl/certificate_file_expiry
@@ -9,22 +9,25 @@ certificate_file_expiry - check the certificate validity of your certificates
 Installing: Add list of your certificates prefixed by the type in munin plugin-conf.d
 
 For openvpn ca.crt and crl.pem
-[certificate_file_expiry]
-user root
-env.CERTS crl:/etc/openvpn/easy-rsa/keys/crl.pem x509:/etc/openvpn/easy-rsa/keys/ca.crt
+
+ [certificate_file_expiry]
+ user root
+ env.CERTS crl:/etc/openvpn/easy-rsa/keys/crl.pem x509:/etc/openvpn/easy-rsa/keys/ca.crt
 
 For letsencrypt certificates
-[certificate_file_expiry]
-user root
-env.CERTS x509:/etc/letsencrypt/live/domain1.example.com/cert.pem x509:/etc/letsencrypt/live/domain2.example.com/cert.pem
 
-Warning and Critical levels can also be configured with env variables like this
-[certificate_file_expiry]
-...
-# warn when certificate will be invalid within 5 days
-env.warning 5:
-# critical when certificate will be invalid within 1 day
-env.critical 1:
+ [certificate_file_expiry]
+ user root
+ env.CERTS x509:/etc/letsencrypt/live/domain1.example.com/cert.pem x509:/etc/letsencrypt/live/domain2.example.com/cert.pem
+
+Warning and Critical levels can also be configured with env variables like this:
+
+ [certificate_file_expiry]
+ ...
+ # warn when certificate will be invalid within 5 days
+ env.warning 5:
+ # critical when certificate will be invalid within 1 day
+ env.critical 1:
 
 =head1 Dependencies
 
@@ -32,8 +35,7 @@ Dependencies: openssl
 
 =head1 AUTHOR
 
-andreas perhab - andreas.perhab@wt-io-it.at
-https://www.wt-io-it.at/
+andreas perhab - andreas.perhab@wt-io-it.at (https://www.wt-io-it.at/)
 
 =head1 LICENSE
 
diff --git a/plugins/ssl/letsencrypt_weekly b/plugins/ssl/letsencrypt_weekly
index 96b905fd..aecae51c 100755
--- a/plugins/ssl/letsencrypt_weekly
+++ b/plugins/ssl/letsencrypt_weekly
@@ -10,11 +10,11 @@ see https://letsencrypt.org/docs/rate-limits/
 
 You can configure the warning and critical limits for this plugin:
 
-[letsencrypt_weekly]
-# warn when more than 40 certificates have been requested in the last week
-env.warning :40
-# critical when more than 50 certificates have been requested in the last week
-env.critical :50
+ [letsencrypt_weekly]
+ # warn when more than 40 certificates have been requested in the last week
+ env.warning :40
+ # critical when more than 50 certificates have been requested in the last week
+ env.critical :50
 
 =head1 Dependencies
 
@@ -22,8 +22,7 @@ Dependencies: openssl
 
 =head1 AUTHOR
 
-andreas perhab - andreas.perhab@wt-io-it.at
-https://www.wt-io-it.at/
+andreas perhab - andreas.perhab@wt-io-it.at (https://www.wt-io-it.at/)
 
 =head1 LICENSE
 
diff --git a/plugins/syncthing/strelaysrv_ b/plugins/syncthing/strelaysrv_
index a5a31927..68253a31 100755
--- a/plugins/syncthing/strelaysrv_
+++ b/plugins/syncthing/strelaysrv_
@@ -1,34 +1,52 @@
 #!/bin/sh
 : <<=cut
 =head1 NAME
+
 strelaysrv_ - Plugin to monitor Syncthing relay server
 
 =head1 DESCRIPTION
+
 This plugin gathers metrics from a Syncthing relay server.
 
 This plugin requires the jq utility : https://stedolan.github.io/jq/
 This plugin requires the curl utility : https://curl.haxx.se/
 
-Available plugins :
-strelaysrv_goroutine #
-strelaysrv_num       #
-strelaysrv_proxied   #
-strelaysrv_transfer  #
-strelaysrv_uptime    #
+Available wildcard plugin features:
+
+=over 4
+
+=item strelaysrv_goroutine
+
+=item strelaysrv_num
+
+=item strelaysrv_proxied
+
+=item strelaysrv_transfer
+
+=item strelaysrv_uptime
+
+=back
+
 
 =head1 CONFIGURATION
-To make the plugin connect to the Syncthing relay server one has to use this type of
-configuration
-[strelaysrv_*]
 
-env.syncthing_relaysrv_host 127.0.0.1
-env.syncthing_relaysrv_port 22070
+To make the plugin connect to the Syncthing relay server one has to use this type of
+configuration:
+
+ [strelaysrv_*]
+ env.syncthing_relaysrv_host 127.0.0.1
+ env.syncthing_relaysrv_port 22070
 
 =head1 AUTHOR
+
 Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
 
 =head1 LICENSE
+
 MIT
+
+SPDX-License-Identifier: MIT
+
 =cut
 
 syncthing_relaysrv_host=${syncthing_relaysrv_host:-}
diff --git a/plugins/syncthing/syncthing_ b/plugins/syncthing/syncthing_
index 05efc7dd..fe47e472 100755
--- a/plugins/syncthing/syncthing_
+++ b/plugins/syncthing/syncthing_
@@ -2,36 +2,56 @@
 # -*- sh -*-
 : <<=cut
 =head1 NAME
+
 syncthing_ - Plugin to monitor Syncthing server
 
+
 =head1 DESCRIPTION
+
 This plugin gathers metrics from a Syncthing server.
 
 This plugin requires the jq utility : https://stedolan.github.io/jq/
 This plugin requires the cURL utility : https://curl.haxx.se/
 
-Available plugins :
-syncthing_cpu       #
-syncthing_mem       #
-syncthing_goroutine #
-syncthing_transfer  #
-syncthing_uptime    #
+Available wildcard plugin features:
+
+=over 4
+
+=item syncthing_cpu
+
+=item syncthing_mem
+
+=item syncthing_goroutine
+
+=item syncthing_transfer
+
+=item syncthing_uptime
+
+=back
+
 
 =head1 CONFIGURATION
 To make the plugin connect to the Syncthing server one has to use this type of
-configuration
-[syncthing_*]
+configuration:
+
+ [syncthing_*]
+ env.syncthing_apikey myapikey0123456789
+ env.syncthing_host 127.0.0.1
+ env.syncthing_port 8384
+ env.syncthing_proto http
 
-env.syncthing_apikey myapikey0123456789
-env.syncthing_host 127.0.0.1
-env.syncthing_port 8384
-env.syncthing_proto http
 
 =head1 AUTHOR
+
 Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
 
+
 =head1 LICENSE
+
 MIT
+
+SPDX-License-Identifier: MIT
+
 =cut
 
 syncthing_apikey=${syncthing_apikey:-}
diff --git a/plugins/system/irq b/plugins/system/irq
index 8b4bb67e..0b84b20b 100755
--- a/plugins/system/irq
+++ b/plugins/system/irq
@@ -18,21 +18,25 @@ None need
 You can set warning and critical levels for each of the data
 series the plugin reports.
 'General' graph support cpu-irqtype limits and irqtype limits
+
 Examples:
-[irq]
-env.warning_cpu1_sirq_total 550
-env.critical_cpu0_irq_total 600
-env.warning_irq_total 700
-env.critical_sirq_total 700
+
+ [irq]
+ env.warning_cpu1_sirq_total 550
+ env.critical_cpu0_irq_total 600
+ env.warning_irq_total 700
+ env.critical_sirq_total 700
 
 'Child' graphs support cpu-irqtype-irqname and irqtype-irqname limits
+
 Examples:
-[irq]
-env.warning_cpu0_irq_7 100
-env.critical_cpu1_sirq_HI 100
-env.warning_irq_LOC 100
-env.critical_irq_12 200
-env.warning_sirq_BLOCK 1000
+
+ [irq]
+ env.warning_cpu0_irq_7 100
+ env.critical_cpu1_sirq_HI 100
+ env.warning_irq_LOC 100
+ env.critical_irq_12 200
+ env.warning_sirq_BLOCK 1000
 
 Note: irqtype: sirq, irq; sirq - Software IRQ; irq name you can see in [] on graph
 
diff --git a/plugins/vpn/openvpn_as_mtime b/plugins/vpn/openvpn_as_mtime
index eb8ce58a..4c6a8ba3 100755
--- a/plugins/vpn/openvpn_as_mtime
+++ b/plugins/vpn/openvpn_as_mtime
@@ -12,8 +12,8 @@ openvpn_as_time -Indicate the medium time of the logged users.
 Require jsonpipe software:
 https://github.com/dvxhouse/jsonpipe
 
-[openvpn_*]
-user root
+ [openvpn_*]
+ user root
 
 =head1 AUTHOR
 
diff --git a/plugins/vpn/openvpn_as_traffic b/plugins/vpn/openvpn_as_traffic
index 718ff7f1..37d006c7 100755
--- a/plugins/vpn/openvpn_as_traffic
+++ b/plugins/vpn/openvpn_as_traffic
@@ -12,8 +12,8 @@ openvpn_as_traffic -OpenVPN traffic
 Require jsonpipe software:
 https://github.com/dvxhouse/jsonpipe
 
-[openvpn_as*]
-  user root
+ [openvpn_as*]
+ user root
 
 =head1 AUTHOR
 
diff --git a/plugins/vpn/openvpn_as_ttime b/plugins/vpn/openvpn_as_ttime
index 2f514cba..59e0a361 100755
--- a/plugins/vpn/openvpn_as_ttime
+++ b/plugins/vpn/openvpn_as_ttime
@@ -12,8 +12,8 @@ openvpn_as_time -Indicate user logged time.
 Require jsonpipe software:
 https://github.com/dvxhouse/jsonpipe
 
-[openvpn_*]
-user root
+ [openvpn_*]
+ user root
 
 =head1 AUTHOR
 
diff --git a/plugins/vpn/openvpn_as_users b/plugins/vpn/openvpn_as_users
index 1fe54eb5..0ce694ae 100755
--- a/plugins/vpn/openvpn_as_users
+++ b/plugins/vpn/openvpn_as_users
@@ -9,8 +9,8 @@ openvpn_as_users -Indicate the number of users and the license limit
 
 =head1 CONFIGURATION
 
-[openvpn_*]
-user root
+ [openvpn_*]
+ user root
 
 =head1 AUTHOR
 
diff --git a/plugins/zimbra/zimbra-mailboxsizes b/plugins/zimbra/zimbra-mailboxsizes
index 11bfc66d..40882f5d 100755
--- a/plugins/zimbra/zimbra-mailboxsizes
+++ b/plugins/zimbra/zimbra-mailboxsizes
@@ -33,9 +33,12 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301 USA.
 
+SPDX-License-Identifier: GPL-2.0-only
+
 =head1 CONFIGURATION
-[zimbra_mailboxsizes]
-user zimbra
+
+ [zimbra_mailboxsizes]
+ user zimbra
 
 =head1 MAGIC MARKERS