#
#
# patch "options_list.hh"
#  from [d39e3d262a36493d728016e71d08749baa6643b9]
#    to [2766f71455bd95bf39d04ac3bf2e6423e4717cf3]
# 
# patch "tests/default_command_options/__driver__.lua"
#  from [cde1437cda224d838246f23a9dbde5d7d49bbcab]
#    to [4933c67f0a215ef42eeba6a27b26eebd5a9276fa]
#
============================================================
--- options_list.hh	d39e3d262a36493d728016e71d08749baa6643b9
+++ options_list.hh	2766f71455bd95bf39d04ac3bf2e6423e4717cf3
@@ -629,8 +629,8 @@ OPTION(full, full, false, "full",
 }
 #endif
 
-OPTION(verbosity, verbose, false, "verbose/no-verbose",
-       gettext_noop("verbose completion output"))
+OPTION(verbosity, verbose, false, "verbose",
+       gettext_noop("verbose completion output (set verbosity to 1)"))
 #ifdef option_bodies
 {
   if (verbosity < 1)
@@ -638,8 +638,8 @@ OPTION(verbosity, verbose, false, "verbo
 }
 #endif
 
-OPTION(verbosity, quiet, false, "quiet",
-     gettext_noop("suppress verbose, informational and progress messages"))
+OPTION(verbosity, quiet, false, "quiet,q",
+     gettext_noop("suppress verbose, informational and progress messages (set verbosity to -1)"))
 #ifdef option_bodies
 {
   if (verbosity > -1)
@@ -648,7 +648,7 @@ OPTION(verbosity, reallyquiet, false, "r
 #endif
 
 OPTION(verbosity, reallyquiet, false, "reallyquiet",
-     gettext_noop("suppress warning, verbose, informational and progress messages"))
+     gettext_noop("suppress warning, verbose, informational and progress messages (set verbosity to -2)"))
 #ifdef option_bodies
 {
   verbosity = -2;
============================================================
--- tests/default_command_options/__driver__.lua	cde1437cda224d838246f23a9dbde5d7d49bbcab
+++ tests/default_command_options/__driver__.lua	4933c67f0a215ef42eeba6a27b26eebd5a9276fa
@@ -24,7 +24,7 @@ check(samefile("stdout", "normallog"))
 check(mtn("log", "--rcfile=default_options.lua", "--no-brief"), 0, true, false)
 check(samefile("stdout", "normallog"))
 
-check(mtn("version", "--no-verbose"), 0, true, false)
+check(mtn("version", "--verbosity=0"), 0, true, false)
 rename("stdout", "normalversion")
 
 check(mtn("version", "--verbose"), 0, true, false)
@@ -33,10 +33,10 @@ check(samefile("stdout", "fullversion"))
 check(mtn("version", "--rcfile=default_options.lua"), 0, true, false)
 check(samefile("stdout", "fullversion"))
 
-check(mtn("version", "--verbose", "--no-verbose"), 0, true, false)
+check(mtn("version", "--verbose", "--verbosity=0"), 0, true, false)
 check(samefile("stdout", "normalversion"))
 
-check(mtn("version", "--rcfile=default_options.lua", "--no-verbose"), 0, true, false)
+check(mtn("version", "--rcfile=default_options.lua", "--verbosity=0"), 0, true, false)
 check(samefile("stdout", "normalversion"))
 
 check(mtn("status", "--rcfile=default_options.lua"), 1, false, false)