summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.14
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c42294e3d..17dd911f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
20 - markus@cvs.openbsd.org 2001/10/29 19:27:15 20 - markus@cvs.openbsd.org 2001/10/29 19:27:15
21 [sshconnect2.c] 21 [sshconnect2.c]
22 hostbased: check for client hostkey before building chost 22 hostbased: check for client hostkey before building chost
23 - markus@cvs.openbsd.org 2001/10/30 20:29:09
24 [ssh.1]
25 ssh.1
23 26
2420011109 2720011109
25 - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) 28 - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
@@ -6829,4 +6832,4 @@
6829 - Wrote replacements for strlcpy and mkdtemp 6832 - Wrote replacements for strlcpy and mkdtemp
6830 - Released 1.0pre1 6833 - Released 1.0pre1
6831 6834
6832$Id: ChangeLog,v 1.1640 2001/11/12 00:02:03 djm Exp $ 6835$Id: ChangeLog,v 1.1641 2001/11/12 00:02:25 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 9b924bd5c..404f80bd1 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.139 2001/10/01 21:51:16 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.140 2001/10/30 20:29:09 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -294,7 +294,7 @@ Background ssh
294List forwarded connections 294List forwarded connections
295.It Cm ~& 295.It Cm ~&
296Background ssh at logout when waiting for forwarded connection / X11 sessions 296Background ssh at logout when waiting for forwarded connection / X11 sessions
297to terminate (protocol version 1 only) 297to terminate
298.It Cm ~? 298.It Cm ~?
299Display a list of escape characters 299Display a list of escape characters
300.It Cm ~R 300.It Cm ~R