summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-04-16 15:52:24 +1000
committerDamien Miller <djm@mindrot.org>2010-04-16 15:52:24 +1000
commit544378da56f8ad4620874183a14100b6ef1a464c (patch)
treef9028f36c94c224440f60fb87ea42e20fe11e206
parent67f30d70d94ba36cc63bdcd2e674bf1ec6f4bfc0 (diff)
- jmc@cvs.openbsd.org 2010/03/27 14:26:55
[ssh_config.5] tweak previous; ok dtucker
-rw-r--r--ChangeLog3
-rw-r--r--ssh_config.514
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ecee054c..6b9bc5e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
- jmc@cvs.openbsd.org 2010/03/26 06:54:36
[ssh.1]
tweak previous;
+ - jmc@cvs.openbsd.org 2010/03/27 14:26:55
+ [ssh_config.5]
+ tweak previous; ok dtucker
20100410
- (dtucker) [configure.ac] Put the check for the existence of getaddrinfo
diff --git a/ssh_config.5 b/ssh_config.5
index 41085356..2945e48b 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.130 2010/03/26 01:06:13 dtucker Exp $
-.Dd $Mdocdate: March 26 2010 $
+.\" $OpenBSD: ssh_config.5,v 1.131 2010/03/27 14:26:55 jmc Exp $
+.Dd $Mdocdate: March 27 2010 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -732,10 +732,12 @@ 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:
-.Do gssapi-with-mic,hostbased,publickey,keyboard-interactive,password
-.Dc .
+.Cm password ) .
+The default is:
+.Bd -literal -offset indent
+gssapi-with-mic,hostbased,publickey,
+keyboard-interactive,password
+.Ed
.It Cm Protocol
Specifies the protocol versions
.Xr ssh 1