diff -r 487d96eac004 -r 5e80956cc792 config/configuration.yml.example
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@@ -5,6 +5,7 @@
 # Environment specific configuration options override the default ones.
 #
 # Note that this file needs to be a valid YAML file.
+# DO NOT USE TABS! Use 2 spaces instead of tabs for identation.
 #
 # == Outgoing email settings (email_delivery setting)
 #
@@ -61,6 +62,7 @@
 #     delivery_method: :smtp
 #     smtp_settings:
 #       tls: true
+#       enable_starttls_auto: true
 #       address: "smtp.gmail.com"
 #       port: 587
 #       domain: "smtp.gmail.com" # 'your.domain.com' for GoogleApps
@@ -89,7 +91,7 @@
       authentication: :login
       user_name: "redmine@example.net"
       password: "redmine"
-  
+
   # Absolute path to the directory where attachments are stored.
   # The default is the 'files' directory in your Redmine instance.
   # Your Redmine instance needs to have write permission on this
@@ -98,7 +100,7 @@
   # attachments_storage_path: /var/redmine/files
   # attachments_storage_path: D:/redmine/files
   attachments_storage_path:
-  
+
   # Configuration of the autologin cookie.
   # autologin_cookie_name: the name of the cookie (default: autologin)
   # autologin_cookie_path: the cookie path (default: /)
@@ -106,10 +108,17 @@
   autologin_cookie_name:
   autologin_cookie_path:
   autologin_cookie_secure:
-  
+
   # Configuration of SCM executable command.
+  #
   # Absolute path (e.g. /usr/local/bin/hg) or command name (e.g. hg.exe, bzr.exe)
-  # On Windows, *.cmd, *.bat (e.g. hg.cmd, bzr.bat) does not work.
+  # On Windows + CRuby, *.cmd, *.bat (e.g. hg.cmd, bzr.bat) does not work.
+  #
+  # On Windows + JRuby 1.6.2, path which contains spaces does not work.
+  # For example, "C:\Program Files\TortoiseHg\hg.exe".
+  # If you want to this feature, you need to install to the path which does not contains spaces.
+  # For example, "C:\TortoiseHg\hg.exe".
+  #
   # Examples:
   # scm_subversion_command: svn                                       # (default: svn)
   # scm_mercurial_command:  C:\Program Files\TortoiseHg\hg.exe        # (default: hg)
@@ -117,13 +126,14 @@
   # scm_cvs_command:        cvs                                       # (default: cvs)
   # scm_bazaar_command:     bzr.exe                                   # (default: bzr)
   # scm_darcs_command:      darcs-1.0.9-i386-linux                    # (default: darcs)
+  #
   scm_subversion_command:
   scm_mercurial_command:
   scm_git_command:
   scm_cvs_command:
   scm_bazaar_command:
   scm_darcs_command:
-  
+
   # Key used to encrypt sensitive data in the database (SCM and LDAP passwords).
   # If you don't want to enable data encryption, just leave it blank.
   # WARNING: losing/changing this key will make encrypted data unreadable.
@@ -136,8 +146,8 @@
   # * decrypt data using 'rake db:decrypt RAILS_ENV=production' first
   # * change the cipher key here in your configuration file
   # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
-  database_cipher_key: 
-  
+  database_cipher_key:
+
 # specific configuration options for production environment
 # that overrides the default ones
 production: