summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-03-14 23:14:20 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-03-14 23:14:20 +1100
commit1adc2bd8d72e7ee0c8f65f84e6f36dafe5421d12 (patch)
tree4171ed86d09540fcb0ac71aa49ed7ed07f32bae6
parent9f438a9d63a346121685b9872cb220294ca22db4 (diff)
- jmc@cvs.openbsd.org 2005/03/12 11:55:03
[ssh_config.5] escape `.' at eol to avoid double spacing issues;
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.56
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index cad2f9f41..59e55b2e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
15 - markus@cvs.openbsd.org 2005/03/11 14:59:06 15 - markus@cvs.openbsd.org 2005/03/11 14:59:06
16 [ssh-keygen.c] 16 [ssh-keygen.c]
17 typo, missing \n; mpech 17 typo, missing \n; mpech
18 - jmc@cvs.openbsd.org 2005/03/12 11:55:03
19 [ssh_config.5]
20 escape `.' at eol to avoid double spacing issues;
18 21
1920050313 2220050313
20 - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the 23 - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the
@@ -2349,4 +2352,4 @@
2349 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2352 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2350 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2353 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2351 2354
2352$Id: ChangeLog,v 1.3714 2005/03/14 12:09:18 dtucker Exp $ 2355$Id: ChangeLog,v 1.3715 2005/03/14 12:14:20 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 06db04c27..dc6d6746f 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
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.47 2005/03/07 23:41:54 jmc Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.48 2005/03/12 11:55:03 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -571,9 +571,9 @@ Default is 22.
571.It Cm PreferredAuthentications 571.It Cm PreferredAuthentications
572Specifies the order in which the client should try protocol 2 572Specifies the order in which the client should try protocol 2
573authentication methods. 573authentication methods.
574This allows a client to prefer one method (e.g. 574This allows a client to prefer one method (e.g.\&
575.Cm keyboard-interactive ) 575.Cm keyboard-interactive )
576over another method (e.g. 576over another method (e.g.\&
577.Cm password ) 577.Cm password )
578The default for this option is: 578The default for this option is:
579.Dq hostbased,publickey,keyboard-interactive,password . 579.Dq hostbased,publickey,keyboard-interactive,password .