hsbt	2014-07-13 17:51:23 +0900 (Sun, 13 Jul 2014)

  New Revision: 46804

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

  Log:
    * ext/openssl/ossl_cipher.c: Fix call to ciphers class method and
      spell out `encryption` by @vipulnsward [fix GH-664]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_cipher.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 46803)
+++ ChangeLog	(revision 46804)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Jul 13 17:49:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* ext/openssl/ossl_cipher.c: Fix call to ciphers class method and
+	  spell out `encryption` by @vipulnsward [fix GH-664]
+
 Sun Jul 13 17:31:51 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* ext/gdbm/gdbm.c: fix wrong arguments in GetDBM2 macro.
Index: ext/openssl/ossl_cipher.c
===================================================================
--- ext/openssl/ossl_cipher.c	(revision 46803)
+++ ext/openssl/ossl_cipher.c	(revision 46804)
@@ -158,7 +158,7 @@ add_cipher_name_to_ary(const OBJ_NAME *n https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_cipher.c#L158
 #ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
 /*
  *  call-seq:
- *     Cipher.ciphers -> array[string...]
+ *     OpenSSL::Cipher.ciphers -> array[string...]
  *
  *  Returns the names of all available ciphers in an array.
  */
@@ -183,7 +183,7 @@ ossl_s_ciphers(VALUE self) https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_cipher.c#L183
  *     cipher.reset -> self
  *
  *  Fully resets the internal state of the Cipher. By using this, the same
- *  Cipher instance may be used several times for en- or decryption tasks.
+ *  Cipher instance may be used several times for encryption or decryption tasks.
  *
  *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, -1).
  */

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