nagachika	2014-07-06 22:57:45 +0900 (Sun, 06 Jul 2014)

  New Revision: 46719

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

  Log:
    merge revision(s) r45344: [Backport #9543]
    
    * lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/gserver.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46718)
+++ ruby_2_1/ChangeLog	(revision 46719)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Jul  6 22:56:03 2014  Zachary Scott  <e@z...>
+
+	* lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543]
+
 Fri Jul  4 00:46:03 2014  Zachary Scott  <e@z...>
 
 	* enumerator.c: [DOC] Fix example to show Enumerator#peek behavior
Index: ruby_2_1/lib/gserver.rb
===================================================================
--- ruby_2_1/lib/gserver.rb	(revision 46718)
+++ ruby_2_1/lib/gserver.rb	(revision 46719)
@@ -37,7 +37,7 @@ require "thread" https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/gserver.rb#L37
 #       super(port, *args)
 #     end
 #     def serve(io)
-#       io.puts(Time.now.to_s)
+#       io.puts(Time.now.to_i)
 #     end
 #   end
 #
@@ -144,7 +144,7 @@ class GServer https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/gserver.rb#L144
   attr_reader :port
   # Host on which to bind, as a String
   attr_reader :host
-  # Maximum number of connections to accept at at ime, as a Fixnum
+  # Maximum number of connections to accept at a time, as a Fixnum
   attr_reader :maxConnections
   # IO Device on which log messages should be written
   attr_accessor :stdlog
@@ -156,7 +156,7 @@ class GServer https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/gserver.rb#L156
 
   # Called when a client connects, if auditing is enabled.
   #
-  # +client+:: a TCPSocket instances representing the client that connected
+  # +client+:: a TCPSocket instance representing the client that connected
   #
   # Return true to allow this client to connect, false to prevent it.
   def connecting(client)
@@ -192,7 +192,7 @@ class GServer https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/gserver.rb#L192
   # Called if #debug is true whenever an unhandled exception is raised.
   # This implementation simply logs the backtrace.
   #
-  # +detail+:: The Exception that was caught
+  # +detail+:: the Exception that was caught
   def error(detail)
     log(detail.backtrace.join("\n"))
   end
@@ -212,9 +212,9 @@ class GServer https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/gserver.rb#L212
 
   # Create a new server
   #
-  # +port+:: the port, as a Fixnum, on which to listen.
+  # +port+:: the port, as a Fixnum, on which to listen
   # +host+:: the host to bind to
-  # +maxConnections+:: The maximum number of simultaneous connections to
+  # +maxConnections+:: the maximum number of simultaneous connections to
   #                    accept
   # +stdlog+:: IO device on which to log messages
   # +audit+:: if true, lifecycle callbacks will be called.  See #audit
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46718)
+++ ruby_2_1/version.h	(revision 46719)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-07-04"
-#define RUBY_PATCHLEVEL 166
+#define RUBY_RELEASE_DATE "2014-07-06"
+#define RUBY_PATCHLEVEL 167
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 6
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45344


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