summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.55
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 28a7d082f..82ab680f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,9 @@
68 - djm@cvs.openbsd.org 2005/05/20 10:50:55 68 - djm@cvs.openbsd.org 2005/05/20 10:50:55
69 [ssh_config.5] 69 [ssh_config.5]
70 give a ProxyCommand example using nc(1), with and ok jmc@ 70 give a ProxyCommand example using nc(1), with and ok jmc@
71 - jmc@cvs.openbsd.org 2005/05/20 11:23:32
72 [ssh_config.5]
73 oops - article and spacing;
71 74
7220050524 7520050524
73 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 76 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@@ -2567,4 +2570,4 @@
2567 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2570 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2568 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2571 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2569 2572
2570$Id: ChangeLog,v 1.3781 2005/05/26 02:13:56 djm Exp $ 2573$Id: ChangeLog,v 1.3782 2005/05/26 02:14:32 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 52a8dff4c..42eefa034 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.52 2005/05/20 10:50:55 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.53 2005/05/20 11:23:32 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
@@ -624,12 +624,11 @@ is not available for connects with a proxy command.
624This directive is useful in conjunction with 624This directive is useful in conjunction with
625.Xr nc 1 625.Xr nc 1
626and its proxy support. 626and its proxy support.
627For example, the following directive would connect via a HTTP proxy at 627For example, the following directive would connect via an HTTP proxy at
628192.0.2.0: 628192.0.2.0:
629.Bd -literal -offset 3n 629.Bd -literal -offset 3n
630ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p 630ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p
631.Ed 631.Ed
632.Pp
633.It Cm PubkeyAuthentication 632.It Cm PubkeyAuthentication
634Specifies whether to try public key authentication. 633Specifies whether to try public key authentication.
635The argument to this keyword must be 634The argument to this keyword must be