From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Tue, 4 Nov 2014 18:38:46 +0000 (+0000)
Subject: Merge shorter option name from 'pre-0.64'.
X-Git-Tag: 0.68~651
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=44a936fbb526de7076830cc1093d17fdc05884b2;hp=-c;p=PuTTY.git

Merge shorter option name from 'pre-0.64'.
---

44a936fbb526de7076830cc1093d17fdc05884b2
diff --combined config.c
index c01c6812,7e4cc242..e126d4dc
--- a/config.c
+++ b/config.c
@@@ -433,7 -433,6 +433,7 @@@ static void kexlist_handler(union contr
  	    { "Diffie-Hellman group 14",	KEX_DHGROUP14 },
  	    { "Diffie-Hellman group exchange",	KEX_DHGEX },
  	    { "RSA-based key exchange", 	KEX_RSA },
 +            { "ECDH key exchange",              KEX_ECDH },
  	    { "-- warn below here --",		KEX_WARN }
  	};
  
@@@ -2595,8 -2594,8 +2595,8 @@@ void setup_config_box(struct controlbo
  	    ctrl_droplist(s, "Ignores SSH-2 maximum packet size", 'x', 20,
  			  HELPCTX(ssh_bugs_maxpkt2),
  			  sshbug_handler, I(CONF_sshbug_maxpkt2));
- 	    ctrl_droplist(s, "Replies to channel requests after channel close",
-                           'q', 20, HELPCTX(ssh_bugs_chanreq),
+ 	    ctrl_droplist(s, "Replies to requests on closed channels", 'q', 20,
+ 			  HELPCTX(ssh_bugs_chanreq),
  			  sshbug_handler, I(CONF_sshbug_chanreq));
  	}
      }