summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--scp.19
-rw-r--r--ssh.111
3 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 0199afda4..a3ac3d537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,10 @@
46 - djm@cvs.openbsd.org 2013/08/13 18:33:08 46 - djm@cvs.openbsd.org 2013/08/13 18:33:08
47 [ssh-keygen.c] 47 [ssh-keygen.c]
48 another of the same typo 48 another of the same typo
49 - jmc@cvs.openbsd.org 2013/08/14 08:39:27
50 [scp.1 ssh.1]
51 some Bx/Ox conversion;
52 From: Jan Stary
49 53
5020130808 5420130808
51 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt 55 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
diff --git a/scp.1 b/scp.1
index c83012c92..595db3260 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
8.\" 8.\"
9.\" Created: Sun May 7 00:14:37 1995 ylo 9.\" Created: Sun May 7 00:14:37 1995 ylo
10.\" 10.\"
11.\" $OpenBSD: scp.1,v 1.59 2013/07/16 00:07:52 schwarze Exp $ 11.\" $OpenBSD: scp.1,v 1.60 2013/08/14 08:39:27 jmc Exp $
12.\" 12.\"
13.Dd $Mdocdate: July 16 2013 $ 13.Dd $Mdocdate: August 14 2013 $
14.Dt SCP 1 14.Dt SCP 1
15.Os 15.Os
16.Sh NAME 16.Sh NAME
@@ -232,8 +232,9 @@ debugging connection, authentication, and configuration problems.
232.Nm 232.Nm
233is based on the 233is based on the
234.Xr rcp 1 234.Xr rcp 1
235program in BSD source code from the Regents of the University of 235program in
236California. 236.Bx
237source code from the Regents of the University of California.
237.Sh AUTHORS 238.Sh AUTHORS
238.An Timo Rinne Aq Mt tri@iki.fi 239.An Timo Rinne Aq Mt tri@iki.fi
239.An Tatu Ylonen Aq Mt ylo@cs.hut.fi 240.An Tatu Ylonen Aq Mt ylo@cs.hut.fi
diff --git a/ssh.1 b/ssh.1
index 62292cc09..09c9dbcbd 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.334 2013/07/18 01:12:26 djm Exp $ 36.\" $OpenBSD: ssh.1,v 1.335 2013/08/14 08:39:27 jmc Exp $
37.Dd $Mdocdate: July 18 2013 $ 37.Dd $Mdocdate: August 14 2013 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -827,9 +827,12 @@ text, and prompts for a response.
827Protocol 2 allows multiple challenges and responses; 827Protocol 2 allows multiple challenges and responses;
828protocol 1 is restricted to just one challenge/response. 828protocol 1 is restricted to just one challenge/response.
829Examples of challenge-response authentication include 829Examples of challenge-response authentication include
830BSD Authentication (see 830.Bx
831Authentication (see
831.Xr login.conf 5 ) 832.Xr login.conf 5 )
832and PAM (some non-OpenBSD systems). 833and PAM (some
834.Pf non- Ox
835systems).
833.Pp 836.Pp
834Finally, if other authentication methods fail, 837Finally, if other authentication methods fail,
835.Nm 838.Nm