summaryrefslogtreecommitdiffstats
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 ab4173e5..1a7e9b02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
[ssh.1]
- typo fix
ok jmc@
+ - jmc@cvs.openbsd.org 2006/02/06 21:44:47
+ [ssh.1]
+ make this a little less ambiguous...
20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3905,4 +3908,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4140 2006/03/15 00:05:35 djm Exp $
+$Id: ChangeLog,v 1.4141 2006/03/15 00:05:59 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 89500813..ba02e6c9 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh.1,v 1.254 2006/02/06 15:54:07 msf Exp $
+.\" $OpenBSD: ssh.1,v 1.255 2006/02/06 21:44:47 jmc Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -1075,11 +1075,11 @@ Client access may be more finely tuned via the
file (see below) and the
.Cm PermitRootLogin
server option.
-The following entry would permit connections on the first
+The following entry would permit connections on
.Xr tun 4
-device from user
+device 1 from user
.Dq jane
-and on the second device from user
+and on tun device 2 from user
.Dq john ,
if
.Cm PermitRootLogin