summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-06 01:29:59 +0200
committerBen Lindstrom <mouring@eviladmin.org>2001-04-06 01:29:59 +0200
commitf327235f65b91e80f2d5db28678274f6a5d4def8 (patch)
tree13afbdc010dc4052c42e45bd86347066c6bf9686
parent - markus@cvs.openbsd.org 2001/04/05 11:09:17 (diff)
downloadopenssh-f327235f65b91e80f2d5db28678274f6a5d4def8.tar.xz
openssh-f327235f65b91e80f2d5db28678274f6a5d4def8.zip
- markus@cvs.openbsd.org 2001/04/05 15:45:43
[ssh.1] ssh defaults to protocol v2; from quisar@quisar.ambre.net
-rw-r--r--ChangeLog5
-rw-r--r--ssh.18
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b9dd2f2c..4c5a1c209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
- markus@cvs.openbsd.org 2001/04/05 11:09:17
[clientloop.c compat.c compat.h]
add SSH_BUG_NOREKEY and detect broken (=all old) openssh versions.
+ - markus@cvs.openbsd.org 2001/04/05 15:45:43
+ [ssh.1]
+ ssh defaults to protocol v2; from quisar@quisar.ambre.net
20010405
- OpenBSD CVS Sync
@@ -4892,4 +4895,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1068 2001/04/05 23:28:36 mouring Exp $
+$Id: ChangeLog,v 1.1069 2001/04/05 23:29:59 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index e83f618fd..1d30a7c21 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
.\" (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.100 2001/03/26 15:47:59 stevesk Exp $
+.\" $OpenBSD: ssh.1,v 1.101 2001/04/05 15:45:43 markus Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -884,11 +884,11 @@ and
.Dq 2 .
Multiple versions must be comma-separated.
The default is
-.Dq 1,2 .
+.Dq 2,1 .
This means that
.Nm
-tries version 1 and falls back to version 2
-if version 1 is not available.
+tries version 2 and falls back to version 1
+if version 2 is not available.
.It Cm ProxyCommand
Specifies the command to use to connect to the server.
The command