[ssh.1]
     document -MM; ok djm@
This commit is contained in:
Damien Miller 2005-12-31 16:23:15 +11:00
parent 134eb81383
commit 88b25524b8
2 changed files with 12 additions and 2 deletions

View File

@ -13,6 +13,9 @@
with the -b flag; with the -b flag;
based on a diff from john l. scarfone; based on a diff from john l. scarfone;
ok djm ok djm
- stevesk@cvs.openbsd.org 2005/12/31 01:38:45
[ssh.1]
document -MM; ok djm@
20051229 20051229
- (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd
@ -3568,4 +3571,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4055 2005/12/31 05:22:55 djm Exp $ $Id: ChangeLog,v 1.4056 2005/12/31 05:23:15 djm Exp $

9
ssh.1
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh.1,v 1.230 2005/12/23 23:46:23 jmc Exp $ .\" $OpenBSD: ssh.1,v 1.231 2005/12/31 01:38:45 stevesk Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -369,6 +369,13 @@ Places the
client into client into
.Dq master .Dq master
mode for connection sharing. mode for connection sharing.
Multiple
.Fl M
options places
.Nm
into
.Dq master
mode with confirmation required before slave connections are accepted.
Refer to the description of Refer to the description of
.Cm ControlMaster .Cm ControlMaster
in in