diff options
| author | Jacob Nevins <jacobn@chiark.greenend.org.uk> | 2022-05-20 21:35:17 +0300 |
|---|---|---|
| committer | Jacob Nevins <jacobn@chiark.greenend.org.uk> | 2022-05-20 21:35:17 +0300 |
| commit | 04311767fa1701be75530a2652cc3a94a9ba986e (patch) | |
| tree | 02ac5d5cefd3f66aa0bd3d774699e563785d2f25 /doc | |
| parent | aa82865f53a95b3af79200b62e5224f8adae435c (diff) | |
| parent | 176f01ea7cc1a848179e09b93820acf839c68f52 (diff) | |
Merge docs and icon fixes from 'pre-0.77'.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/index.but | 5 | ||||
| -rw-r--r-- | doc/pageant.but | 4 | ||||
| -rw-r--r-- | doc/pubkey.but | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/doc/index.but b/doc/index.but index afd74167..4c76bb05 100644 --- a/doc/index.but +++ b/doc/index.but @@ -867,6 +867,11 @@ saved sessions from \IM{authentication agent} agent, authentication \IM{-c-pageant} \c{-c} Pageant command-line option +\IM{--keylist} \c{--keylist} Pageant command-line option +\IM{--openssh-config} \c{--openssh-config} Pageant command-line option + +\IM{Windows OpenSSH} Windows OpenSSH +\IM{Windows OpenSSH} OpenSSH, on Windows \IM{FAQ} FAQ \IM{FAQ} Frequently Asked Questions diff --git a/doc/pageant.but b/doc/pageant.but index 8c19633d..c94b88d6 100644 --- a/doc/pageant.but +++ b/doc/pageant.but @@ -170,7 +170,7 @@ by the command, like this: \c C:\PuTTY\pageant.exe d:\main.ppk -c C:\PuTTY\putty.exe -\S{pageant-cmdline-openssh} Integrating with Windows OpenSSH +\S{pageant-cmdline-openssh} Integrating with \i{Windows OpenSSH} Windows's own port of OpenSSH uses the same mechanism as Pageant to talk to its SSH agent (Windows named pipes). This means that Windows @@ -184,7 +184,7 @@ configuration, then \c{ssh.exe} should automatically use Pageant as its agent, so that you can keep your keys in one place and have both SSH clients able to use them. -The option is \c{--openssh-config}, and you follow it with a filename. +The option is \i\c{--openssh-config}, and you follow it with a filename. To refer to this file from your main OpenSSH configuration, you can use the \cq{Include} directive. For example, you might run Pageant diff --git a/doc/pubkey.but b/doc/pubkey.but index 57282455..80382076 100644 --- a/doc/pubkey.but +++ b/doc/pubkey.but @@ -549,6 +549,11 @@ key. } +\dt \cw{\-E} \e{fptype} + +\dd Algorithm to use when displaying key fingerprints. You can +select \c{sha256} or \c{md5}. See \k{puttygen-fingerprint}. + \H{pubkey-gettingready} Getting ready for public key authentication Connect to your SSH server using PuTTY with the SSH protocol. When the |