summaryrefslogtreecommitdiffstats
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 cad2f9f4..59e55b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
- markus@cvs.openbsd.org 2005/03/11 14:59:06
[ssh-keygen.c]
typo, missing \n; mpech
+ - jmc@cvs.openbsd.org 2005/03/12 11:55:03
+ [ssh_config.5]
+ escape `.' at eol to avoid double spacing issues;
20050313
- (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the
@@ -2349,4 +2352,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3714 2005/03/14 12:09:18 dtucker Exp $
+$Id: ChangeLog,v 1.3715 2005/03/14 12:14:20 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 06db04c2..dc6d6746 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.47 2005/03/07 23:41:54 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.48 2005/03/12 11:55:03 jmc Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -571,9 +571,9 @@ 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.
+This allows a client to prefer one method (e.g.\&
.Cm keyboard-interactive )
-over another method (e.g.
+over another method (e.g.\&
.Cm password )
The default for this option is:
.Dq hostbased,publickey,keyboard-interactive,password .