diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-07 14:15:53 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-07 14:15:53 +0000 |
commit | 098fa943565e06dafa67ca59ccf433939d2941b4 (patch) | |
tree | 9f660c2aac3e9988d0e1664bac91d884ad2ec3de /activerecord/lib/active_record/connection_adapters | |
parent | 9b0fd9d00d8b6e6c3b16bc513b454185fe169454 (diff) | |
download | rails-098fa943565e06dafa67ca59ccf433939d2941b4.tar.gz rails-098fa943565e06dafa67ca59ccf433939d2941b4.tar.bz2 rails-098fa943565e06dafa67ca59ccf433939d2941b4.zip |
Fixed documentation snafus #575, #576, #577, #585
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@525 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rwxr-xr-x | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index a2bab29b42..6a9ca8fcf1 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -326,7 +326,7 @@ module ActiveRecord # Commits the transaction (and turns on auto-committing). def commit_db_transaction() end - # Rollsback the transaction (and turns on auto-committing). Must be done if the transaction block + # Rolls back the transaction (and turns on auto-committing). Must be done if the transaction block # raises an exception or returns false. def rollback_db_transaction() end diff --git a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb index d01085c395..b4c9323b80 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -23,7 +23,7 @@ require 'active_record/connection_adapters/abstract_adapter' # with User Id replaced with your proper login, and Password with your # password. # -# I have tested this code on a WindowsXP Pro SP1 system, +# I have tested this code on a Windows XP Pro SP1 system, # ruby 1.8.2 (2004-07-29) [i386-mswin32], SQL Server 2000. # module ActiveRecord @@ -122,7 +122,7 @@ EOL execute enable_identity_insert(table_name, true) ii_enabled = true rescue Exception => e - # Coulnd't turn on IDENTITY_INSERT + # Couldn't turn on IDENTITY_INSERT end end end @@ -285,4 +285,4 @@ EOL end end end -end
\ No newline at end of file +end |