2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 7de535ef8..456d2cdbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
    - djm@cvs.openbsd.org      2001/03/19 12:10:17
      [sshd.8]
      Document permitopen authorized_keys option; ok markus@
+   - djm@cvs.openbsd.org     2001/03/19 05:49:52
+     [ssh.1]
+     document PreferredAuthentications option; ok markus@
 
 20010318
  - (bal) Fixed scp type casing issue which causes "scp: protocol error: 
@@ -4623,4 +4626,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.983 2001/03/19 12:16:14 djm Exp $
+$Id: ChangeLog,v 1.984 2001/03/19 12:59:11 djm Exp $
diff --git a/ssh.1 b/ssh.1
index b4fc1a462..8a9fb653d 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.98 2001/03/08 00:15:48 markus Exp $
+.\" $OpenBSD: ssh.1,v 1.99 2001/03/19 12:49:51 djm Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -853,6 +853,14 @@ Note that this option applies to both protocol version 1 and 2.
 .It Cm Port
 Specifies the port number to connect on the remote host.
 Default is 22.
+.It Cm PreferredAuthentications
+Specifies the order in which the client should try protocol 2 
+authentication methods. This allows a client to prefer one method (e.g. 
+.Cm keyboard-interactive )
+over another method (e.g.
+.Cm password )
+The default for this option is:
+.Dq publickey, password, keyboard-interactive
 .It Cm Protocol
 Specifies the protocol versions
 .Nm