1 files changed, 5 insertions, 9 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 91c0e1bb0..45496cfbc 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.129 2010/03/05 10:28:21 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.130 2010/03/26 01:06:13 dtucker Exp $
-.Dd $Mdocdate: March 5 2010 $
+.Dd $Mdocdate: March 26 2010 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -144,8 +144,8 @@ Valid arguments are
 If set to
 .Dq yes ,
 passphrase/password querying will be disabled.
-In addition, the 
+In addition, the
-.Cm ServerAliveInterval 
+.Cm ServerAliveInterval
 option will be set to 300 seconds by default.
 This option is useful in scripts and other batch jobs where no user
 is present to supply the password,
@@ -785,11 +785,7 @@ This allows a client to prefer one method (e.g.\&
 over another method (e.g.\&
 .Cm password )
 The default for this option is:
-.Do gssapi-with-mic ,
+.Do gssapi-with-mic,hostbased,publickey,keyboard-interactive,password
-hostbased,
-publickey,
-keyboard-interactive,
-password
 .Dc .
 .It Cm Protocol
 Specifies the protocol versions

diff --git a/ssh_config.5 b/ssh_config.5 index 91c0e1bb0..45496cfbc 100644 --- a/ssh_config.5 +++ b/ssh_config.5
@@ -34,8 +34,8 @@
34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36	.\"	36	.\"
37	.\" $OpenBSD: ssh_config.5,v 1.129 2010/03/05 10:28:21 djm Exp $	37	.\" $OpenBSD: ssh_config.5,v 1.130 2010/03/26 01:06:13 dtucker Exp $
38	.Dd $Mdocdate: March 5 2010 $	38	.Dd $Mdocdate: March 26 2010 $
39	.Dt SSH_CONFIG 5	39	.Dt SSH_CONFIG 5
40	.Os	40	.Os
41	.Sh NAME	41	.Sh NAME
@@ -144,8 +144,8 @@ Valid arguments are
144	If set to	144	If set to
145	.Dq yes ,	145	.Dq yes ,
146	passphrase/password querying will be disabled.	146	passphrase/password querying will be disabled.
147	In addition, the	147	In addition, the
148	.Cm ServerAliveInterval	148	.Cm ServerAliveInterval
149	option will be set to 300 seconds by default.	149	option will be set to 300 seconds by default.
150	This option is useful in scripts and other batch jobs where no user	150	This option is useful in scripts and other batch jobs where no user
151	is present to supply the password,	151	is present to supply the password,
@@ -785,11 +785,7 @@ This allows a client to prefer one method (e.g.\&
785	over another method (e.g.\&	785	over another method (e.g.\&
786	.Cm password )	786	.Cm password )
787	The default for this option is:	787	The default for this option is:
788	.Do gssapi-with-mic ,	788	.Do gssapi-with-mic,hostbased,publickey,keyboard-interactive,password
789	hostbased,
790	publickey,
791	keyboard-interactive,
792	password
793	.Dc .	789	.Dc .
794	.It Cm Protocol	790	.It Cm Protocol
795	Specifies the protocol versions	791	Specifies the protocol versions