diff options
author | Damien Miller <djm@mindrot.org> | 2005-05-26 12:14:32 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-05-26 12:14:32 +1000 |
commit | dfec2941acfdcadb81adb149f452f0eece26625d (patch) | |
tree | d53bd6cacab834e54910a69b01d6f19dd4d2a4f7 | |
parent | ebcfedce85310aba939049b29804bf68697c9a1f (diff) |
- jmc@cvs.openbsd.org 2005/05/20 11:23:32
[ssh_config.5]
oops - article and spacing;
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh_config.5 | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -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 | ||
72 | 20050524 | 75 | 20050524 |
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. | |||
624 | This directive is useful in conjunction with | 624 | This directive is useful in conjunction with |
625 | .Xr nc 1 | 625 | .Xr nc 1 |
626 | and its proxy support. | 626 | and its proxy support. |
627 | For example, the following directive would connect via a HTTP proxy at | 627 | For example, the following directive would connect via an HTTP proxy at |
628 | 192.0.2.0: | 628 | 192.0.2.0: |
629 | .Bd -literal -offset 3n | 629 | .Bd -literal -offset 3n |
630 | ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p | 630 | ProxyCommand /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 |
634 | Specifies whether to try public key authentication. | 633 | Specifies whether to try public key authentication. |
635 | The argument to this keyword must be | 634 | The argument to this keyword must be |