From a0f5e0b6d9de6594e5a83a4d8eaf7ee9ec1754c9 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Tue, 3 Feb 2009 22:52:07 +0000 Subject: Merge docrails --- railties/doc/guides/html/action_mailer_basics.html | 52 +++++++-------- railties/doc/guides/html/association_basics.html | 33 ++++++++++ railties/doc/guides/html/command_line.html | 73 +++++++++++++++++++++- .../guides/html/getting_started_with_rails.html | 44 ++++++++++--- railties/doc/guides/html/i18n.html | 3 +- .../doc/guides/source/action_mailer_basics.txt | 52 +++++++-------- railties/doc/guides/source/association_basics.txt | 41 ++++++------ railties/doc/guides/source/command_line.txt | 68 +++++++++++++++++++- .../guides/source/getting_started_with_rails.txt | 2 +- railties/doc/guides/source/i18n.txt | 4 +- 10 files changed, 281 insertions(+), 91 deletions(-) diff --git a/railties/doc/guides/html/action_mailer_basics.html b/railties/doc/guides/html/action_mailer_basics.html index 22b575af45..38f127fea8 100644 --- a/railties/doc/guides/html/action_mailer_basics.html +++ b/railties/doc/guides/html/action_mailer_basics.html @@ -37,9 +37,9 @@ Sending Emails