nagachika	2013-11-14 00:14:59 +0900 (Thu, 14 Nov 2013)

  New Revision: 43670

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43670

  Log:
    Squashed commit of the following:
    
    commit 6895f38bfc3c0ad6bd212b8f9acc3c71384dfcb7
    Author: Chikanaga Tomoyuki <nagachika00@g...>
    Date:   Thu Nov 14 00:14:00 2013 +0900
    
        * ChangeLog: fix a typo at r43666
    
        * ext/openssl/ossl_asn1.c: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_asn1.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43669)
+++ ChangeLog	(revision 43670)
@@ -27,7 +27,7 @@ Wed Nov 13 18:03:00 2013  Zachary Scott https://github.com/ruby/ruby/blob/trunk/ChangeLog#L27
 	* 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
Index: ext/openssl/ossl_asn1.c
===================================================================
--- ext/openssl/ossl_asn1.c	(revision 43669)
+++ ext/openssl/ossl_asn1.c	(revision 43670)
@@ -1954,7 +1954,7 @@ do{\ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_asn1.c#L1954
 
     /* 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 */

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/