From 80c0b00ba610384ab2bb8e7966104d22fb8c38e3 Mon Sep 17 00:00:00 2001 From: Dalibor Nasevic Date: Thu, 3 Mar 2011 01:03:25 +0100 Subject: Correct spelling for Base64 in action_mailer --- actionmailer/lib/action_mailer/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 15b0d01154..16fcf112b7 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -291,7 +291,7 @@ module ActionMailer #:nodoc: # * :authentication - If your mail server requires authentication, you need to specify the # authentication type here. # This is a symbol and one of :plain (will send the password in the clear), :login (will - # send password BASE64 encoded) or :cram_md5 (combines a Challenge/Response mechanism to exchange + # send password Base64 encoded) or :cram_md5 (combines a Challenge/Response mechanism to exchange # information and a cryptographic Message Digest 5 algorithm to hash important information) # * :enable_starttls_auto - When set to true, detects if STARTTLS is enabled in your SMTP server # and starts to use it. -- cgit v1.2.3 From a48f46d4fc6d62138f26d27de060c2f119842969 Mon Sep 17 00:00:00 2001 From: JudeArasu Date: Sat, 5 Mar 2011 06:08:21 +0530 Subject: typo changes --- actionmailer/README.rdoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc index b346bd9e79..805a7a72ad 100644 --- a/actionmailer/README.rdoc +++ b/actionmailer/README.rdoc @@ -75,7 +75,7 @@ Or you can just chain the methods together like: == Receiving emails To receive emails, you need to implement a public instance method called receive that takes a -tmail object as its single parameter. The Action Mailer framework has a corresponding class method, +email object as its single parameter. The Action Mailer framework has a corresponding class method, which is also called receive, that accepts a raw, unprocessed email as a string, which it then turns into the tmail object and calls the receive instance method. @@ -145,3 +145,4 @@ API documentation is at Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here: * https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets + -- cgit v1.2.3 From 3463247da55e34e8c1eb77cf029cdbbf3def624c Mon Sep 17 00:00:00 2001 From: JudeArasu Date: Sat, 5 Mar 2011 06:10:35 +0530 Subject: typo changes --- actionmailer/README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc index 805a7a72ad..4290cc9bcd 100644 --- a/actionmailer/README.rdoc +++ b/actionmailer/README.rdoc @@ -77,7 +77,7 @@ Or you can just chain the methods together like: To receive emails, you need to implement a public instance method called receive that takes a email object as its single parameter. The Action Mailer framework has a corresponding class method, which is also called receive, that accepts a raw, unprocessed email as a string, which it then turns -into the tmail object and calls the receive instance method. +into the email object and calls the receive instance method. Example: -- cgit v1.2.3 From 34f5628a072f7afa677d25c9559076d5c21721ce Mon Sep 17 00:00:00 2001 From: JudeArasu Date: Sat, 5 Mar 2011 06:19:17 +0530 Subject: commas to set off expressions that interrupt sentence flow --- actionmailer/README.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc index 4290cc9bcd..fb93fd1080 100644 --- a/actionmailer/README.rdoc +++ b/actionmailer/README.rdoc @@ -104,7 +104,7 @@ trivial case like this: rails runner 'Mailman.receive(STDIN.read)' However, invoking Rails in the runner for each mail to be received is very resource intensive. A single -instance of Rails should be run within a daemon if it is going to be utilized to process more than just +instance of Rails should be run within a daemon, if it is going to be utilized to process more than just a limited number of email. == Configuration -- cgit v1.2.3 From d8462510c5378f9204778ffb9df4fdbece7dccd0 Mon Sep 17 00:00:00 2001 From: Dalibor Nasevic Date: Sun, 6 Mar 2011 00:27:37 +0100 Subject: Fixed identation in actionmailer base_test --- actionmailer/test/base_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 1b793d255e..6a7931da8c 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -153,8 +153,8 @@ class BaseTest < ActiveSupport::TestCase assert_equal(2, email.parts.length) assert_equal("multipart/related", email.mime_type) assert_equal("multipart/alternative", email.parts[0].mime_type) - assert_equal("text/plain", email.parts[0].parts[0].mime_type) - assert_equal("text/html", email.parts[0].parts[1].mime_type) + assert_equal("text/plain", email.parts[0].parts[0].mime_type) + assert_equal("text/html", email.parts[0].parts[1].mime_type) assert_equal("logo.png", email.parts[1].filename) end -- cgit v1.2.3 From e80db417ed656018d0ad4335260c3a2313142a57 Mon Sep 17 00:00:00 2001 From: JudeArasu Date: Sun, 6 Mar 2011 10:53:44 +0530 Subject: styles applied for usage --- actionmailer/lib/rails/generators/mailer/USAGE | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/lib/rails/generators/mailer/USAGE b/actionmailer/lib/rails/generators/mailer/USAGE index a08d459739..99d1ea3885 100644 --- a/actionmailer/lib/rails/generators/mailer/USAGE +++ b/actionmailer/lib/rails/generators/mailer/USAGE @@ -1,15 +1,16 @@ -Description: +*Description:* Stubs out a new mailer and its views. Pass the mailer name, either CamelCased or under_scored, and an optional list of emails as arguments. This generates a mailer class in app/mailers and invokes your template engine and test framework generators. -Example: - `rails generate mailer Notifications signup forgot_password invoice` +*Example:* + -rails generate mailer Notifications signup forgot_password invoice- creates a Notifications mailer class, views, test, and fixtures: Mailer: app/mailers/notifications.rb Views: app/views/notifications/signup.erb [...] Test: test/functional/notifications_test.rb Fixtures: test/fixtures/notifications/signup [...] + -- cgit v1.2.3 From 1d4826937e438ebcd6a2f9e29d2e466a43fef7a8 Mon Sep 17 00:00:00 2001 From: JudeArasu Date: Sun, 6 Mar 2011 11:38:18 +0530 Subject: style changes --- actionmailer/lib/rails/generators/mailer/USAGE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/lib/rails/generators/mailer/USAGE b/actionmailer/lib/rails/generators/mailer/USAGE index 99d1ea3885..8f4ba5916a 100644 --- a/actionmailer/lib/rails/generators/mailer/USAGE +++ b/actionmailer/lib/rails/generators/mailer/USAGE @@ -1,12 +1,12 @@ -*Description:* +Description: Stubs out a new mailer and its views. Pass the mailer name, either CamelCased or under_scored, and an optional list of emails as arguments. This generates a mailer class in app/mailers and invokes your template engine and test framework generators. -*Example:* - -rails generate mailer Notifications signup forgot_password invoice- +Example: + rails generate mailer Notifications signup forgot_password invoice creates a Notifications mailer class, views, test, and fixtures: Mailer: app/mailers/notifications.rb -- cgit v1.2.3 From 2cd3dcabe26530ba73d87383732a35c02ff797f6 Mon Sep 17 00:00:00 2001 From: JudeArasu Date: Sun, 6 Mar 2011 12:53:23 +0530 Subject: Revert "style changes" This reverts commit 1d4826937e438ebcd6a2f9e29d2e466a43fef7a8. --- actionmailer/lib/rails/generators/mailer/USAGE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/lib/rails/generators/mailer/USAGE b/actionmailer/lib/rails/generators/mailer/USAGE index 8f4ba5916a..99d1ea3885 100644 --- a/actionmailer/lib/rails/generators/mailer/USAGE +++ b/actionmailer/lib/rails/generators/mailer/USAGE @@ -1,12 +1,12 @@ -Description: +*Description:* Stubs out a new mailer and its views. Pass the mailer name, either CamelCased or under_scored, and an optional list of emails as arguments. This generates a mailer class in app/mailers and invokes your template engine and test framework generators. -Example: - rails generate mailer Notifications signup forgot_password invoice +*Example:* + -rails generate mailer Notifications signup forgot_password invoice- creates a Notifications mailer class, views, test, and fixtures: Mailer: app/mailers/notifications.rb -- cgit v1.2.3 From ac59a2a1d67aca74895ceddbc709a467c572144b Mon Sep 17 00:00:00 2001 From: JudeArasu Date: Sun, 6 Mar 2011 12:55:56 +0530 Subject: style changes --- actionmailer/lib/rails/generators/mailer/USAGE | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/lib/rails/generators/mailer/USAGE b/actionmailer/lib/rails/generators/mailer/USAGE index 99d1ea3885..448ddbd5df 100644 --- a/actionmailer/lib/rails/generators/mailer/USAGE +++ b/actionmailer/lib/rails/generators/mailer/USAGE @@ -1,12 +1,14 @@ -*Description:* +Description: +============ Stubs out a new mailer and its views. Pass the mailer name, either CamelCased or under_scored, and an optional list of emails as arguments. This generates a mailer class in app/mailers and invokes your template engine and test framework generators. -*Example:* - -rails generate mailer Notifications signup forgot_password invoice- +Example: +======== + rails generate mailer Notifications signup forgot_password invoice creates a Notifications mailer class, views, test, and fixtures: Mailer: app/mailers/notifications.rb -- cgit v1.2.3 From 8bbc5b4f5fd0ccc0b496cbdb2abb07d24b84aaba Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sun, 6 Mar 2011 17:42:42 +0100 Subject: Revert "Fixed identation in actionmailer base_test" Please excuse the revert. Albeit the commit is totally innocent, docrails has a strong no-code policy we need to enforce. Please feel free to submit the fix as a patch and assign it to me, I'll apply right away. This reverts commit d8462510c5378f9204778ffb9df4fdbece7dccd0. --- actionmailer/test/base_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 6a7931da8c..1b793d255e 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -153,8 +153,8 @@ class BaseTest < ActiveSupport::TestCase assert_equal(2, email.parts.length) assert_equal("multipart/related", email.mime_type) assert_equal("multipart/alternative", email.parts[0].mime_type) - assert_equal("text/plain", email.parts[0].parts[0].mime_type) - assert_equal("text/html", email.parts[0].parts[1].mime_type) + assert_equal("text/plain", email.parts[0].parts[0].mime_type) + assert_equal("text/html", email.parts[0].parts[1].mime_type) assert_equal("logo.png", email.parts[1].filename) end -- cgit v1.2.3 From c528297d17236e57fa4076272547367870158034 Mon Sep 17 00:00:00 2001 From: Dalibor Nasevic Date: Sun, 6 Mar 2011 20:03:06 +0100 Subject: Fixed indentation in actionmailer base_test [#6538 state:committed] Signed-off-by: Xavier Noria --- actionmailer/test/base_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 1b793d255e..6a7931da8c 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -153,8 +153,8 @@ class BaseTest < ActiveSupport::TestCase assert_equal(2, email.parts.length) assert_equal("multipart/related", email.mime_type) assert_equal("multipart/alternative", email.parts[0].mime_type) - assert_equal("text/plain", email.parts[0].parts[0].mime_type) - assert_equal("text/html", email.parts[0].parts[1].mime_type) + assert_equal("text/plain", email.parts[0].parts[0].mime_type) + assert_equal("text/html", email.parts[0].parts[1].mime_type) assert_equal("logo.png", email.parts[1].filename) end -- cgit v1.2.3