2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 03db03ddd..e69d0ae72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
      initially from tobias@, but disabled them by placing them in
      "#ifdef notyet" which was asked by djm@
      ok djm@ tobias@
+   - djm@cvs.openbsd.org 2008/01/19 19:13:28
+     [ssh.1]
+     satisfy the pedants: -q does not suppress all diagnostic messages (e.g.
+     some commandline parsing warnings go unconditionally to stdout).
 
 20080119
  - (djm) Silence noice from expr in ssh-copy-id; patch from
@@ -3534,4 +3538,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4820 2008/02/10 11:20:44 djm Exp $
+$Id: ChangeLog,v 1.4821 2008/02/10 11:21:28 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 1bf6b5e1c..81d404702 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.270 2007/06/12 13:43:55 jmc Exp $
-.Dd $Mdocdate: June 12 2007 $
+.\" $OpenBSD: ssh.1,v 1.271 2008/01/19 19:13:28 djm Exp $
+.Dd $Mdocdate: January 19 2008 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -506,7 +506,7 @@ This can be specified on a
 per-host basis in the configuration file.
 .It Fl q
 Quiet mode.
-Causes all warning and diagnostic messages to be suppressed.
+Causes most warning and diagnostic messages to be suppressed.
 .It Fl R Xo
 .Sm off
 .Oo Ar bind_address : Oc