merge revision(s) 17839:

	* lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of
	  'localhost.localdomain'.  [ruby-dev:35333]
	* lib/net/smtp.rb (Net::SMTP::SMTP.start): ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d26d734c..217069d7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul  7 16:14:05 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of
+	  'localhost.localdomain'.  [ruby-dev:35333]
+
+	* lib/net/smtp.rb (Net::SMTP::SMTP.start): ditto.
+
 Mon Jul  7 12:07:28 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c: avoid creating Ruby object during
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index dda9dab07..35108966c 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -289,7 +289,7 @@ module Net
     # +port+ is the port to connect to; it defaults to port 25.
     #
     # +helo+ is the _HELO_ _domain_ provided by the client to the
-    # server (see overview comments); it defaults to 'localhost.localdomain'. 
+    # server (see overview comments); it defaults to 'localhost'. 
     #
     # The remaining arguments are used for SMTP authentication, if required
     # or desired.  +user+ is the account name; +secret+ is your password
@@ -310,7 +310,7 @@ module Net
     # * TimeoutError
     #
     def SMTP.start( address, port = nil,
-                    helo = 'localhost.localdomain',
+                    helo = 'localhost',
                     user = nil, secret = nil, authtype = nil,
                     &block) # :yield: smtp
       new(address, port).start(helo, user, secret, authtype, &block)
@@ -371,7 +371,7 @@ module Net
     # * IOError
     # * TimeoutError
     #
-    def start( helo = 'localhost.localdomain',
+    def start( helo = 'localhost',
                user = nil, secret = nil, authtype = nil ) # :yield: smtp
       if block_given?
         begin
diff --git a/version.h b/version.h
index 0f0c2336e..08e8341fd 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-07"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080707
-#define RUBY_PATCHLEVEL 268
+#define RUBY_PATCHLEVEL 269
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8