X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=doc%2Fconfig.but;h=5107858c5f54d4f52c2b06927c21466738817108;hb=5471539a6738484b48fb938c88dce547a3e4b299;hp=8ee0d4451e700477a20d6984ffa8bea58397d65e;hpb=0550943b51c538400e31ce18483032e446178120;p=PuTTY.git

diff --git a/doc/config.but b/doc/config.but
index 8ee0d445..5107858c 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -2353,6 +2353,9 @@ with sharing enabled, then it can act as a downstream and use an
 existing SSH connection set up by an instance of GUI PuTTY. The one
 special case is that PSCP and PSFTP will \e{never} act as upstreams.
 
+It is possible to test programmatically for the existence of a live
+upstream using Plink. See \k{plink-option-shareexists}.
+
 \H{config-ssh-kex} The Kex panel
 
 The Kex panel (short for \q{\i{key exchange}}) allows you to configure
@@ -2548,6 +2551,8 @@ use that.
 
 PuTTY currently supports the following algorithms:
 
+\b \i{ChaCha20-Poly1305}, a combined cipher and \i{MAC} (SSH-2 only)
+
 \b \i{AES} (Rijndael) - 256, 192, or 128-bit SDCTR or CBC (SSH-2 only)
 
 \b \i{Arcfour} (RC4) - 256 or 128-bit stream cipher (SSH-2 only)