diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | scp.1 | 9 | ||||
-rw-r--r-- | ssh.1 | 11 |
3 files changed, 16 insertions, 8 deletions
@@ -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 | ||
50 | 20130808 | 54 | 20130808 |
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 |
@@ -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 |
233 | is based on the | 233 | is based on the |
234 | .Xr rcp 1 | 234 | .Xr rcp 1 |
235 | program in BSD source code from the Regents of the University of | 235 | program in |
236 | California. | 236 | .Bx |
237 | source 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 |
@@ -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. | |||
827 | Protocol 2 allows multiple challenges and responses; | 827 | Protocol 2 allows multiple challenges and responses; |
828 | protocol 1 is restricted to just one challenge/response. | 828 | protocol 1 is restricted to just one challenge/response. |
829 | Examples of challenge-response authentication include | 829 | Examples of challenge-response authentication include |
830 | BSD Authentication (see | 830 | .Bx |
831 | Authentication (see | ||
831 | .Xr login.conf 5 ) | 832 | .Xr login.conf 5 ) |
832 | and PAM (some non-OpenBSD systems). | 833 | and PAM (some |
834 | .Pf non- Ox | ||
835 | systems). | ||
833 | .Pp | 836 | .Pp |
834 | Finally, if other authentication methods fail, | 837 | Finally, if other authentication methods fail, |
835 | .Nm | 838 | .Nm |