nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 01:18:00 +00:00
Code Issues Projects Releases Wiki Activity

Docs updates.

Browse Source 
Since the previous commit is causing an RC2 build of 0.75 anyway,
let's take the opportunity to bring in updates to the docs from main,
so that the release will have the most up-to-date version available.

This is a combined cherry-pick of:
  f6142ba29b
  7c1bea59a3
  f5d1d4ce4b
This commit is contained in:
Simon Tatham 2021-04-18 17:03:01 +01:00
parent fdfad6adca
commit f4d99d3f59
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/faq.but
View File

@ -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?

2
doc/pubkey.but
View File

@ -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.