summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh_config.56
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ddba8a9c..338750207 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
14 hardcoding lowdelay/throughput. 14 hardcoding lowdelay/throughput.
15 15
16 bz#1733 patch from philipp AT redfish-solutions.com; ok markus@ deraadt@ 16 bz#1733 patch from philipp AT redfish-solutions.com; ok markus@ deraadt@
17 - jmc@cvs.openbsd.org 2010/11/15 07:40:14
18 [ssh_config.5]
19 libary -> library;
17 20
1820101111 2120101111
19 - (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on 22 - (djm) [servconf.c ssh-add.c ssh-keygen.c] don't look for ECDSA keys on
diff --git a/ssh_config.5 b/ssh_config.5
index 9e82fa864..a51a37dde 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.143 2010/11/13 23:27:50 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.144 2010/11/15 07:40:14 jmc Exp $
37.Dd $Mdocdate: November 13 2010 $ 37.Dd $Mdocdate: November 15 2010 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -806,7 +806,7 @@ The default is
806.Dq no . 806.Dq no .
807.It Cm PKCS11Provider 807.It Cm PKCS11Provider
808Specifies which PKCS#11 provider to use. 808Specifies which PKCS#11 provider to use.
809The argument to this keyword is the PKCS#11 shared libary 809The argument to this keyword is the PKCS#11 shared library
810.Xr ssh 1 810.Xr ssh 1
811should use to communicate with a PKCS#11 token providing the user's 811should use to communicate with a PKCS#11 token providing the user's
812private RSA key. 812private RSA key.