diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2018-10-23 11:24:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 11:24:59 -0500 |
| commit | ff008c00f6cabe78d3b90bc3b9c14346aae01cb0 (patch) | |
| tree | f0267ea1f57c6ba69bf49b6f92adbd075e66ae05 | |
| parent | adf61b891a781047e13773805f7f1c6d5db1bc7d (diff) | |
| parent | 7217179d1e03ab3d6ece4f3aa19fe29af2a496da (diff) | |
| download | rails-ff008c00f6cabe78d3b90bc3b9c14346aae01cb0.tar.gz rails-ff008c00f6cabe78d3b90bc3b9c14346aae01cb0.tar.bz2 rails-ff008c00f6cabe78d3b90bc3b9c14346aae01cb0.zip | |
Merge pull request #34295 from ohbarye/fix-typo-of-duplicated-the
Fix typo of duplicated `the`
| -rw-r--r-- | activerecord/lib/active_record/database_configurations.rb | 2 | ||||
| -rw-r--r-- | guides/source/i18n.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb index fa1589511e..30cb0a27e7 100644 --- a/activerecord/lib/active_record/database_configurations.rb +++ b/activerecord/lib/active_record/database_configurations.rb @@ -29,7 +29,7 @@ module ActiveRecord # configs for all environments. # <tt>spec_name:</tt> The specification name (ie primary, animals, etc.). Defaults # to +nil+. - # <tt>include_replicas:</tt> Determines whether to include replicas in the + # <tt>include_replicas:</tt> Determines whether to include replicas in # the returned list. Most of the time we're only iterating over the write # connection (i.e. migrations don't need to run for the write and read connection). # Defaults to +false+. diff --git a/guides/source/i18n.md b/guides/source/i18n.md index eba71eec60..7465726dca 100644 --- a/guides/source/i18n.md +++ b/guides/source/i18n.md @@ -1105,7 +1105,7 @@ For several reasons the Simple backend shipped with Active Support only does the That does not mean you're stuck with these limitations, though. The Ruby I18n gem makes it very easy to exchange the Simple backend implementation with something else that fits better for your needs, by passing a backend instance to the `I18n.backend=` setter. -For example, you can replace the Simple backend with the the Chain backend to chain multiple backends together. This is useful when you want to use standard translations with a Simple backend but store custom application translations in a database or other backends. +For example, you can replace the Simple backend with the Chain backend to chain multiple backends together. This is useful when you want to use standard translations with a Simple backend but store custom application translations in a database or other backends. With the Chain backend, you could use the Active Record backend and fall back to the (default) Simple backend: |