summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-13 15:14:59 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-13 15:14:59 +0000
commit18358ad8cd769d41785bcce4c97c6ab59169f47b (patch)
treed707f32dc4ccd27646fe4e39a8a7bab05bd404a7
parenta369b7f7cbf2c3232879b29162b5dd50b49db2ab (diff)
Squashed commit of the following:
commit 6895f38bfc3c0ad6bd212b8f9acc3c71384dfcb7 Author: Chikanaga Tomoyuki <nagachika00@gmail.com> 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
-rw-r--r--ChangeLog2
-rw-r--r--ext/openssl/ossl_asn1.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b9ff8adf5d7..d2315015661 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,7 +27,7 @@ Wed Nov 13 18:03:00 2013 Zachary Scott <e@zzak.io>
* 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 7fe20b042c4..8aa8422b845 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 */