usa	2014-02-24 12:39:54 +0900 (Mon, 24 Feb 2014)

  New Revision: 45157

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

  Log:
    merge revision(s) 44584,44587,44945: [Backport #9243]
    
    * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Sz?\239?\190?\131?\239?\189?\188cs [Bug #9243]
    
    * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Sz?cs [Bug #9243]
    
    * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/openssl/ossl_pkey_dh.c
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 45156)
+++ ruby_1_9_3/ChangeLog	(revision 45157)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Mon Feb 24 12:39:11 2014  Zachary Scott  <e@z...>
+
+	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
+
 Mon Feb 24 12:33:38 2014  Zachary Scott  <e@z...>
 
 	* lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis
Index: ruby_1_9_3/ext/openssl/ossl_pkey_dh.c
===================================================================
--- ruby_1_9_3/ext/openssl/ossl_pkey_dh.c	(revision 45156)
+++ ruby_1_9_3/ext/openssl/ossl_pkey_dh.c	(revision 45157)
@@ -572,7 +572,7 @@ Init_ossl_dh() https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/openssl/ossl_pkey_dh.c#L572
      *
      * === Example of a key exchange
      *  dh1 = OpenSSL::PKey::DH.new(2048)
-     *  params = dh1.public_key.to_der #you may send this publicly to the participating party
+     *  der = dh1.public_key.to_der #you may send this publicly to the participating party
      *  dh2 = OpenSSL::PKey::DH.new(der)
      *  dh2.generate_key! #generate the per-session key pair
      *  symm_key1 = dh1.compute_key(dh2.pub_key)
@@ -615,4 +615,3 @@ Init_ossl_dh() https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/openssl/ossl_pkey_dh.c#L615
 {
 }
 #endif /* NO_DH */
-
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 45156)
+++ ruby_1_9_3/version.h	(revision 45157)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 543
+#define RUBY_PATCHLEVEL 544
 
 #define RUBY_RELEASE_DATE "2014-02-24"
 #define RUBY_RELEASE_YEAR 2014

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44584,44587,44945


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