summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:05:59 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:05:59 +1100
commite93eaaa0d1e8e6447eeb6f698f7da50ede0cb926 (patch)
treece8ade686d18b805fbd65bded6993e2e32400386
parent9f67a21de62ca0b0e2db022abaeaf3f2faed5f0c (diff)
- jmc@cvs.openbsd.org 2006/02/06 21:44:47
[ssh.1] make this a little less ambiguous...
-rw-r--r--ChangeLog5
-rw-r--r--ssh.18
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ab4173e56..1a7e9b020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 [ssh.1] 4 [ssh.1]
5 - typo fix 5 - typo fix
6 ok jmc@ 6 ok jmc@
7 - jmc@cvs.openbsd.org 2006/02/06 21:44:47
8 [ssh.1]
9 make this a little less ambiguous...
7 10
820060313 1120060313
9 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 12 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3905,4 +3908,4 @@
3905 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3908 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3906 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3909 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3907 3910
3908$Id: ChangeLog,v 1.4140 2006/03/15 00:05:35 djm Exp $ 3911$Id: ChangeLog,v 1.4141 2006/03/15 00:05:59 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 895008139..ba02e6c90 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.254 2006/02/06 15:54:07 msf Exp $ 37.\" $OpenBSD: ssh.1,v 1.255 2006/02/06 21:44:47 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -1075,11 +1075,11 @@ Client access may be more finely tuned via the
1075file (see below) and the 1075file (see below) and the
1076.Cm PermitRootLogin 1076.Cm PermitRootLogin
1077server option. 1077server option.
1078The following entry would permit connections on the first 1078The following entry would permit connections on
1079.Xr tun 4 1079.Xr tun 4
1080device from user 1080device 1 from user
1081.Dq jane 1081.Dq jane
1082and on the second device from user 1082and on tun device 2 from user
1083.Dq john , 1083.Dq john ,
1084if 1084if
1085.Cm PermitRootLogin 1085.Cm PermitRootLogin