aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNeeraj Singh <neerajdotname@gmail.com>2010-06-15 00:46:44 -0400
committerNeeraj Singh <neerajdotname@gmail.com>2010-06-15 00:46:44 -0400
commit5e60e6571384a809598f3118fdc02dac1fd9d7b8 (patch)
tree3cfccbc36f0133124181ab965480a1352d86ca79 /ci
parent51a9703b1e80caa30d699f30615f023079874623 (diff)
parent1a50cc31639f35fd82a4a24821b9fc49dc7eadc9 (diff)
downloadrails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.gz
rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.bz2
rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'ci')
-rw-r--r--ci/site_config.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/site_config.rb b/ci/site_config.rb
index ac7f658237..c08dac8e84 100644
--- a/ci/site_config.rb
+++ b/ci/site_config.rb
@@ -6,8 +6,8 @@
# EMAIL NOTIFICATION
# ------------------
-# CruiseControl.rb can notify you about build status via email. It uses ActionMailer component of Ruby on Rails
-# framework. Obviously, ActionMailer needs to know how to send out email messages.
+# CruiseControl.rb can notify you about build status via email. It uses the Action Mailer component of Ruby on Rails
+# framework. Obviously, Action Mailer needs to know how to send out email messages.
# If you have an SMTP server on your network, and it needs no authentication, write this in your site_config.rb:
#
ActionMailer::Base.smtp_settings = {