diff --git a/doc/faq.but b/doc/faq.but index fcadaa0e..474b984a 100644 --- a/doc/faq.but +++ b/doc/faq.but @@ -1154,6 +1154,16 @@ inactive. And Pageant spends most of its time inactive. \H{faq-admin} Administrative questions +\S{faq-putty-org}{Question} Is \cw{putty.org} your website? + +No, it isn't. \cw{putty.org} is run by an opportunist who uses it to +advertise their own commercial SSH implementation to people looking +for our free one. We don't own that site, we can't control it, and we +don't advise anyone to use it in preference to our own site. + +The real PuTTY web site, run by the PuTTY team, has always been at +\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/}\cw{https://www.chiark.greenend.org.uk/~sgtatham/putty/}. + \S{faq-domain}{Question} Would you like me to register you a nicer domain name? diff --git a/doc/pubkey.but b/doc/pubkey.but index cad6988b..f40c9526 100644 --- a/doc/pubkey.but +++ b/doc/pubkey.but @@ -380,7 +380,7 @@ doesn't support any of the following options to control that. All of the following options only affect keys saved with passphrases. They control how much work is required to decrypt the key (which -happens every type you type its passphrase). This allows you to trade +happens every time you type its passphrase). This allows you to trade off the cost of legitimate use of the key against the resistance of the encrypted key to password-guessing attacks.