diff options
author | Damien Miller <djm@mindrot.org> | 2013-08-21 02:43:49 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-08-21 02:43:49 +1000 |
commit | b7727df37efde4dbe4f5a33b19cbf42022aabf66 (patch) | |
tree | 16a667457e52ec788a05c5c0c7ab29ad8bd77236 | |
parent | d5d9d7b1fdacf0551de4c747728bd159be40590a (diff) | |
download | openssh-git-b7727df37efde4dbe4f5a33b19cbf42022aabf66.tar.gz |
- jmc@cvs.openbsd.org 2013/08/14 08:39:27
[scp.1 ssh.1]
some Bx/Ox conversion;
From: Jan Stary
-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 @@ - djm@cvs.openbsd.org 2013/08/13 18:33:08 [ssh-keygen.c] another of the same typo + - jmc@cvs.openbsd.org 2013/08/14 08:39:27 + [scp.1 ssh.1] + some Bx/Ox conversion; + From: Jan Stary 20130808 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt @@ -8,9 +8,9 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.59 2013/07/16 00:07:52 schwarze Exp $ +.\" $OpenBSD: scp.1,v 1.60 2013/08/14 08:39:27 jmc Exp $ .\" -.Dd $Mdocdate: July 16 2013 $ +.Dd $Mdocdate: August 14 2013 $ .Dt SCP 1 .Os .Sh NAME @@ -232,8 +232,9 @@ debugging connection, authentication, and configuration problems. .Nm is based on the .Xr rcp 1 -program in BSD source code from the Regents of the University of -California. +program in +.Bx +source code from the Regents of the University of California. .Sh AUTHORS .An Timo Rinne Aq Mt tri@iki.fi .An Tatu Ylonen Aq Mt ylo@cs.hut.fi @@ -33,8 +33,8 @@ .\" (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.334 2013/07/18 01:12:26 djm Exp $ -.Dd $Mdocdate: July 18 2013 $ +.\" $OpenBSD: ssh.1,v 1.335 2013/08/14 08:39:27 jmc Exp $ +.Dd $Mdocdate: August 14 2013 $ .Dt SSH 1 .Os .Sh NAME @@ -827,9 +827,12 @@ text, and prompts for a response. Protocol 2 allows multiple challenges and responses; protocol 1 is restricted to just one challenge/response. Examples of challenge-response authentication include -BSD Authentication (see +.Bx +Authentication (see .Xr login.conf 5 ) -and PAM (some non-OpenBSD systems). +and PAM (some +.Pf non- Ox +systems). .Pp Finally, if other authentication methods fail, .Nm |