2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 02417f416..e29734eca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010606
+ - OpenBSD CVS Sync                                                             
+   - markus@cvs.openbsd.org 2001/05/17 21:34:15                                 
+     [ssh.1]                                                                    
+     no spaces in PreferredAuthentications; 
+     meixner@rbg.informatik.tu-darmstadt.de                                                                              
 20010528
  - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
    Patch by Corinna Vinschen <vinschen@redhat.com>
@@ -5427,4 +5433,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1226 2001/05/28 17:17:34 tim Exp $
+$Id: ChangeLog,v 1.1227 2001/06/05 18:39:10 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index 39991a5c6..433d41e78 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.110 2001/05/15 22:04:01 deraadt Exp $
+.\" $OpenBSD: ssh.1,v 1.111 2001/05/17 21:34:15 markus Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -925,7 +925,7 @@ authentication methods. This allows a client to prefer one method (e.g.
 over another method (e.g.
 .Cm password )
 The default for this option is:
-.Dq publickey, password, keyboard-interactive
+.Dq publickey,password,keyboard-interactive
 .It Cm Protocol
 Specifies the protocol versions
 .Nm