Set preferred option to skip plugin executiont o --no-plugins, as that is more in line with the other 'no' options

3 files changed, 10 insertions, 10 deletions

diff --git a/include/helper_show b/include/helper_show
index 923f4496..fc21ead9 100644
--- a/include/helper_show
+++ b/include/helper_show
@@ -30,7 +30,7 @@
 
 COMMANDS="audit configure generate show update upload-only"
 HELPERS="audit configure show update"
-OPTIONS="--auditor\n--cronjob (--cron)\n--debug\n--developer\n--devops\n--forensics\n--help (-h)\n--log-file\n--manpage (--man)\n--no-colors\n--no-log\n--pentest\n--profile\n--plugin-dir\n--quick (-Q)\n--quiet (-q)\n--report-file\n--reverse-colors\n--skip-plugins\n--tests\n--tests-from-category\n--tests-from-group\n--usecwd\n--upload\n--verbose\n--version (-V)\n--wait\n--warnings-only"
+OPTIONS="--auditor\n--cronjob (--cron)\n--debug\n--developer\n--devops\n--forensics\n--help (-h)\n--log-file\n--manpage (--man)\n--no-colors\n--no-log\n--no-plugins\n--pentest\n--profile\n--plugin-dir\n--quick (-Q)\n--quiet (-q)\n--report-file\n--reverse-colors\n--tests\n--tests-from-category\n--tests-from-group\n--usecwd\n--upload\n--verbose\n--version (-V)\n--wait\n--warnings-only"
 
 SHOW_ARGS="categories changelog commands dbdir details environment eol groups help hostids includedir language license logfile man options os pidfile plugindir profiles release releasedate report settings tests version workdir"
 SHOW_HELP="lynis show ${BROWN}categories${NORMAL}              (display test categories)
diff --git a/include/parameters b/include/parameters
index b8676b4c..77a6084f 100644
--- a/include/parameters
+++ b/include/parameters
@@ -280,6 +280,11 @@
                 LOGFILE="/dev/null"
             ;;
 
+            # Skip execution of plugins
+            --no-plugins | --noplugins | --skip-plugins)
+                SKIP_PLUGINS=1
+            ;;
+
             --pen-test | --pentest)
                 PENTESTINGMODE=1
             ;;
@@ -359,11 +364,6 @@
                 fi
             ;;
 
-            # Skip execution of plugins
-            --skip-plugins | --no-plugins | --noplugins)
-                SKIP_PLUGINS=1
-            ;;
-
             # Only scan these tests
             --tests)
                 shift
diff --git a/lynis.8 b/lynis.8
index 719e82c7..717a6c4a 100644
--- a/lynis.8
+++ b/lynis.8
@@ -1,4 +1,4 @@
-.TH Lynis 8 "4 Dec 2019" "1.31" "Unix System Administrator's Manual"
+.TH Lynis 8 "14 Feb 2020" "1.32" "Unix System Administrator's Manual"
 
 
 .SH "NAME"
@@ -91,6 +91,9 @@ Disable colored output.
 Redirect all logging information to /dev/null, prevents sensitive information to
 be written to disk.
 .TP
+.B \-\-no\-plugins
+Do not run any of the enabled plugins.
+.TP
 .B \-\-pentest
 Run a non-privileged scan, usually used for penetration testing. Some of the
 tests will be skipped if they require root permissions.
@@ -113,9 +116,6 @@ Provide an alternative name for report file.
 .B \-\-reverse\-colors
 Optimize screen output for light backgrounds.
 .TP
-.B \-\-skip\-plugins
-Do not run plugins.
-.TP
 .B \-\-tests TEST-IDs
 Only run the specific test(s). When using multiple tests, add quotes around the
 line.