diff options
author | Colin Watson <cjwatson@debian.org> | 2013-11-09 12:08:24 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-11-09 12:08:24 +0000 |
commit | ee196dab7c5f97f0b80c8099343a375bead92010 (patch) | |
tree | f5e86571416d84ad156949e8a3ab12ed12d681f2 /ssh_config.5 | |
parent | e01f4f6bfd6f5a47f810fd3522a151d59815402b (diff) | |
parent | c41345ad7ee5a22689e2c009595e85fa27b4b39a (diff) |
Import 6.4p1 tarball
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 9ddd6b8a6..5d76c6d2d 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.168 2013/08/20 06:56:07 jmc Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.166 2013/06/27 14:05:37 jmc Exp $ |
37 | .Dd $Mdocdate: August 20 2013 $ | 37 | .Dd $Mdocdate: June 27 2013 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -937,14 +937,6 @@ For example, the following directive would connect via an HTTP proxy at | |||
937 | .Bd -literal -offset 3n | 937 | .Bd -literal -offset 3n |
938 | ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p | 938 | ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p |
939 | .Ed | 939 | .Ed |
940 | .It Cm ProxyUseFdpass | ||
941 | Specifies that | ||
942 | .Cm ProxyCommand | ||
943 | will pass a connected file descriptor back to | ||
944 | .Xr ssh 1 | ||
945 | instead of continuing to execute and pass data. | ||
946 | The default is | ||
947 | .Dq no . | ||
948 | .It Cm PubkeyAuthentication | 940 | .It Cm PubkeyAuthentication |
949 | Specifies whether to try public key authentication. | 941 | Specifies whether to try public key authentication. |
950 | The argument to this keyword must be | 942 | The argument to this keyword must be |