* eval.c (top_include): include in the wrapped load is done for

  the wrapper, not for a singleton class for wrapped main.
  [ruby-dev:23305]

* bignum.c (rb_big_eq): use temporary double variable to save the
  result (internal float register may be bigger than 64 bits, for
  example, 80 bits on x86).  [ruby-dev:23311]

* eval.c (block_pass): should generate unique identifier of the
  pushing block.  [ruby-talk:96363]

* ext/socket/socket.c (make_hostent): fix memory leak, based on
  the patch from HORIKAWA Hisashi <vzw00011@nifty.ne.jp>.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 10 insertions, 10 deletions

diff --git a/lib/net/http.rb b/lib/net/http.rb
index f51981477c..1943894382 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -120,7 +120,7 @@ module Net # :nodoc:
   # 
   #     def fetch( uri_str, limit = 10 )
   #       # You should choose better exception. 
-  #       raise ArgumentError, 'http redirect too deep' if limit == 0
+  #       raise ArgumentError, 'HTTP redirect too deep' if limit == 0
   # 
   #       response = Net::HTTP.get_response(URI.parse(uri_str))
   #       case response
@@ -442,7 +442,7 @@ module Net # :nodoc:
     # Finishes HTTP session and closes TCP connection.
     # Raises IOError if not started.
     def finish
-      raise IOError, 'HTTP session not started yet' unless started?
+      raise IOError, 'HTTP session not yet started' unless started?
       do_finish
     end
 
@@ -1762,11 +1762,11 @@ module Net # :nodoc:
     end
 
     def stream_check
-      raise IOError, 'try to read body out of block' if @socket.closed?
+      raise IOError, 'attempt to read body out of block' if @socket.closed?
     end
 
     def procdest(dest, block)
-      raise ArgumentError, 'both of arg and block are given for HTTP method' \
+      raise ArgumentError, 'both arg and block given for HTTP method' \
           if dest and block
       if block
         ReadAdapter.new(block)
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 85bef3c391..641d50e41f 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -859,7 +859,7 @@ module Net # :nodoc:
     #                       firewall.
     # Errno::ETIMEDOUT:: connection timed out (possibly due to packets
     #                    being dropped by an intervening firewall).
-    # Errno::NETUNREACH:: there is no route to that network.
+    # Errno::ENETUNREACH:: there is no route to that network.
     # SocketError:: hostname not known or other socket error.
     # Net::IMAP::ByeResponseError:: we connected to the host, but they 
     #                               immediately said goodbye to us.
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 96e10f95bd..eb61c29ca3 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -292,7 +292,7 @@ module Net
     # This method must not be called while POP3 session is opened.
     # This method raises POPAuthenticationError if authentication fails.
     def auth_only( account, password )
-      raise IOError, 'opening already opened POP session' if started?
+      raise IOError, 'opening previously opened POP session' if started?
       start(account, password) {
         ;
       }
@@ -445,7 +445,7 @@ module Net
 
     # Finishes a POP3 session and closes TCP connection.
     def finish
-      raise IOError, 'POP session not started yet' unless started?
+      raise IOError, 'POP session not yet started' unless started?
       do_finish
     end
 
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 21c04812fe..62a5fc559b 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -371,7 +371,7 @@ module Net # :nodoc:
     # Finishes the SMTP session and closes TCP connection.
     # Raises IOError if not started.
     def finish
-      raise IOError, 'not started yet' unless started?
+      raise IOError, 'not yet started' unless started?
       do_finish
     end
 
@@ -472,7 +472,7 @@ module Net # :nodoc:
 
     def send0( from_addr, to_addrs )
       raise IOError, 'closed session' unless @socket
-      raise ArgumentError, 'mail destination does not given' if to_addrs.empty?
+      raise ArgumentError, 'mail destination not given' if to_addrs.empty?
       if $SAFE > 0
         raise SecurityError, 'tainted from_addr' if from_addr.tainted?
         to_addrs.each do |to| 
@@ -499,7 +499,7 @@ module Net # :nodoc:
     private
 
     def check_auth_args( user, secret, authtype )
-      raise ArgumentError, 'both of user and secret are required'\
+      raise ArgumentError, 'both user and secret are required'\
                       unless user and secret
       auth_method = "auth_#{authtype || 'cram_md5'}"
       raise ArgumentError, "wrong auth type #{authtype}"\