2 files changed, 4 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 70cd08d63..39ecb447c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openssh (1:4.6p1-2) UNRELEASED; urgency=low
 
   * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL.
+  * Clarify that 'ssh -q -q' still prints errors caused by bad arguments
+    (i.e. before the logging system is initialised).
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 13 Jun 2007 00:56:45 +0100
 
diff --git a/ssh.1 b/ssh.1
index 04326e654..b0d23fea1 100644
--- a/ssh.1
+++ b/ssh.1
@@ -509,7 +509,8 @@ Causes all warning and diagnostic messages to be suppressed.
 Only fatal errors are displayed.
 If a second
 .Fl q
-is given then even fatal errors are suppressed.
+is given then even fatal errors are suppressed, except for those produced
+due solely to bad arguments.
 .It Fl R Xo
 .Sm off
 .Oo Ar bind_address : Oc