From 18358ad8cd769d41785bcce4c97c6ab59169f47b Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 13 Nov 2013 15:14:59 +0000 Subject: Squashed commit of the following: commit 6895f38bfc3c0ad6bd212b8f9acc3c71384dfcb7 Author: Chikanaga Tomoyuki Date: Thu Nov 14 00:14:00 2013 +0900 * ChangeLog: fix a typo at r43666 * ext/openssl/ossl_asn1.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 2 +- ext/openssl/ossl_asn1.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9ff8adf5d..d231501566 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,7 +27,7 @@ Wed Nov 13 18:03:00 2013 Zachary Scott * ext/openssl/ossl_asn1.c: [DOC] Document parts of OpenSSL::ASN1::ObjectId included a fix for the class overview, which previously showed the documentation for Constructive due to missing - ObjectId overview. This patch also includes a note for Primative. + ObjectId overview. This patch also includes a note for Primitive. Based on a patch by @vbatts via GH-436 https://github.com/ruby/ruby/pull/436 diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index 7fe20b042c..8aa8422b84 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -1954,7 +1954,7 @@ do{\ /* Document-class: OpenSSL::ASN1::ObjectId * - * Represents the primative object id for OpenSSL::ASN1 + * Represents the primitive object id for OpenSSL::ASN1 */ #if 0 cASN1ObjectId = rb_define_class_under(mASN1, "ObjectId", cASN1Primitive); /* let rdoc know */ -- cgit v1.2.3