Merge shorter option name from 'pre-0.64'.

diff --git a/config.c b/config.c
index c01c6812a90cdc7b41e9f63e389ddd248c9b9745..e126d4dce4124f458ed319297d8de83343a2edd1 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2595,8 +2595,8 @@ void setup_config_box(struct controlbox *b, int midsession,
            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));
        }
     }

diff --git a/doc/config.but b/doc/config.but
index 942e0d478b26300fc0d39316345e3ee31f34cc2c..4f9b0d7c7ea4808645e99b5b21d56b3a80b8d88f 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -3343,7 +3343,7 @@ believes the server has this bug, it will never send its
 \cq{winadj@putty.projects.tartarus.org} request, and will make do
 without its timing data.
 
-\S{config-ssh-bug-chanreq} \q{Replies to channel requests after channel close}
+\S{config-ssh-bug-chanreq} \q{Replies to requests on closed channels}
 
 \cfg{winhelp-topic}{ssh.bugs.chanreq}