diff options
| author | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
| commit | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (patch) | |
| tree | 13e783343edf688afffb4a8e02dc9685342b98a6 /ssh.1 | |
| parent | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff) | |
| parent | ff0095389ba9a9e4599e6051c8d5bae6777c4d64 (diff) | |
merge 5.5p1
Diffstat (limited to 'ssh.1')
| -rw-r--r-- | ssh.1 | 9 |
1 files changed, 6 insertions, 3 deletions
| @@ -34,8 +34,8 @@ | |||
| 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.1,v 1.302 2010/03/05 10:28:21 djm Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.303 2010/03/26 00:26:58 djm Exp $ |
| 38 | .Dd $Mdocdate: March 5 2010 $ | 38 | .Dd $Mdocdate: March 26 2010 $ |
| 39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
| 40 | .Os | 40 | .Os |
| 41 | .Sh NAME | 41 | .Sh NAME |
| @@ -558,7 +558,10 @@ argument is | |||
| 558 | the listen port will be dynamically allocated on the server and reported | 558 | the listen port will be dynamically allocated on the server and reported |
| 559 | to the client at run time. | 559 | to the client at run time. |
| 560 | .It Fl S Ar ctl_path | 560 | .It Fl S Ar ctl_path |
| 561 | Specifies the location of a control socket for connection sharing. | 561 | Specifies the location of a control socket for connection sharing |
| 562 | or the string | ||
| 563 | .Dq none | ||
| 564 | to disable connection sharing. | ||
| 562 | Refer to the description of | 565 | Refer to the description of |
| 563 | .Cm ControlPath | 566 | .Cm ControlPath |
| 564 | and | 567 | and |