diff options
author | Damien Miller <djm@mindrot.org> | 2005-12-31 16:23:15 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-12-31 16:23:15 +1100 |
commit | 88b25524b885885896e23e01e1aa873864ca7386 (patch) | |
tree | 3072b1983630cd8391746d2b2581f8f1f75b34cc | |
parent | 134eb81383dab4b7f87e45c3c52172cc139f347c (diff) |
- stevesk@cvs.openbsd.org 2005/12/31 01:38:45
[ssh.1]
document -MM; ok djm@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.1 | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -13,6 +13,9 @@ | |||
13 | with the -b flag; | 13 | with the -b flag; |
14 | based on a diff from john l. scarfone; | 14 | based on a diff from john l. scarfone; |
15 | ok djm | 15 | ok djm |
16 | - stevesk@cvs.openbsd.org 2005/12/31 01:38:45 | ||
17 | [ssh.1] | ||
18 | document -MM; ok djm@ | ||
16 | 19 | ||
17 | 20051229 | 20 | 20051229 |
18 | - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd | 21 | - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd |
@@ -3568,4 +3571,4 @@ | |||
3568 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3571 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3569 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3572 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3570 | 3573 | ||
3571 | $Id: ChangeLog,v 1.4055 2005/12/31 05:22:55 djm Exp $ | 3574 | $Id: ChangeLog,v 1.4056 2005/12/31 05:23:15 djm Exp $ |
@@ -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.1,v 1.230 2005/12/23 23:46:23 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.231 2005/12/31 01:38:45 stevesk Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -369,6 +369,13 @@ Places the | |||
369 | client into | 369 | client into |
370 | .Dq master | 370 | .Dq master |
371 | mode for connection sharing. | 371 | mode for connection sharing. |
372 | Multiple | ||
373 | .Fl M | ||
374 | options places | ||
375 | .Nm | ||
376 | into | ||
377 | .Dq master | ||
378 | mode with confirmation required before slave connections are accepted. | ||
372 | Refer to the description of | 379 | Refer to the description of |
373 | .Cm ControlMaster | 380 | .Cm ControlMaster |
374 | in | 381 | in |