Import 6.4p1 tarball

author: Colin Watson <cjwatson@debian.org> 2013-11-09 12:08:24 +0000
committer: Colin Watson <cjwatson@debian.org> 2013-11-09 12:08:24 +0000
commit: ee196dab7c5f97f0b80c8099343a375bead92010 (patch)
tree: f5e86571416d84ad156949e8a3ab12ed12d681f2 /ssh.1
parent: e01f4f6bfd6f5a47f810fd3522a151d59815402b (diff)
parent: c41345ad7ee5a22689e2c009595e85fa27b4b39a (diff)
1 files changed, 4 insertions, 8 deletions
diff --git a/ssh.1 b/ssh.1
index 227654016..62292cc09 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.336 2013/08/20 06:56:07 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.334 2013/07/18 01:12:26 djm Exp $
-.Dd $Mdocdate: August 20 2013 $
+.Dd $Mdocdate: July 18 2013 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -465,7 +465,6 @@ For full details of the options listed below, and their possible values, see
 .It PreferredAuthentications
 .It Protocol
 .It ProxyCommand
-.It ProxyUseFdpass
 .It PubkeyAuthentication
 .It RekeyLimit
 .It RemoteForward
@@ -828,12 +827,9 @@ 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
-.Bx
+BSD Authentication (see
-Authentication (see
 .Xr login.conf 5 )
-and PAM (some
+and PAM (some non-OpenBSD systems).
-.Pf non- Ox
-systems).
 .Pp
 Finally, if other authentication methods fail,
 .Nm
author	Colin Watson <cjwatson@debian.org>	2013-11-09 12:08:24 +0000
committer	Colin Watson <cjwatson@debian.org>	2013-11-09 12:08:24 +0000
commit	ee196dab7c5f97f0b80c8099343a375bead92010 (patch)
tree	f5e86571416d84ad156949e8a3ab12ed12d681f2 /ssh.1
parent	e01f4f6bfd6f5a47f810fd3522a151d59815402b (diff)
parent	c41345ad7ee5a22689e2c009595e85fa27b4b39a (diff)

diff --git a/ssh.1 b/ssh.1 index 227654016..62292cc09 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.336 2013/08/20 06:56:07 jmc Exp $	36	.\" $OpenBSD: ssh.1,v 1.334 2013/07/18 01:12:26 djm Exp $
37	.Dd $Mdocdate: August 20 2013 $	37	.Dd $Mdocdate: July 18 2013 $
38	.Dt SSH 1	38	.Dt SSH 1
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -465,7 +465,6 @@ For full details of the options listed below, and their possible values, see
465	.It PreferredAuthentications	465	.It PreferredAuthentications
466	.It Protocol	466	.It Protocol
467	.It ProxyCommand	467	.It ProxyCommand
468	.It ProxyUseFdpass
469	.It PubkeyAuthentication	468	.It PubkeyAuthentication
470	.It RekeyLimit	469	.It RekeyLimit
471	.It RemoteForward	470	.It RemoteForward
@@ -828,12 +827,9 @@ text, and prompts for a response.
828	Protocol 2 allows multiple challenges and responses;	827	Protocol 2 allows multiple challenges and responses;
829	protocol 1 is restricted to just one challenge/response.	828	protocol 1 is restricted to just one challenge/response.
830	Examples of challenge-response authentication include	829	Examples of challenge-response authentication include
831	.Bx	830	BSD Authentication (see
832	Authentication (see
833	.Xr login.conf 5 )	831	.Xr login.conf 5 )
834	and PAM (some	832	and PAM (some non-OpenBSD systems).
835	.Pf non- Ox
836	systems).
837	.Pp	833	.Pp
838	Finally, if other authentication methods fail,	834	Finally, if other authentication methods fail,
839	.Nm	835	.Nm