2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d130a420f..8124065c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,13 @@
    - jmc@cvs.openbsd.org 2006/05/29 16:10:03
      [ssh_config.5]
      oops - previous was too long; split the list of auths up
+   - mk@cvs.openbsd.org 2006/05/30 11:46:38
+     [ssh-add.c]
+     Sync usage() with man page and reality.
+     ok deraadt dtucker
+   - jmc@cvs.openbsd.org 2006/05/29 16:13:23
+     [ssh.1]
+     add GSSAPI to the list of authentication methods supported;
 
 20060521
  - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
@@ -4656,4 +4663,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4337 2006/06/13 03:01:41 djm Exp $
+$Id: ChangeLog,v 1.4338 2006/06/13 03:03:16 djm Exp $
diff --git a/ssh.1 b/ssh.1
index dab09c84e..874a5d2fe 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (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.259 2006/03/22 21:16:24 jakob Exp $
+.\" $OpenBSD: ssh.1,v 1.260 2006/05/29 16:13:23 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -666,6 +666,7 @@ Protocol 1 lacks a strong mechanism for ensuring the
 integrity of the connection.
 .Pp
 The methods available for authentication are:
+GSSAPI-based authentication,
 host-based authentication,
 public key authentication,
 challenge-response authentication,