aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-04-03 13:08:54 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-04-03 13:08:54 +0900
commit96f0114e082b116856e945b075abd747eff0e63e (patch)
treeb10d55667ef6e88fa766a72ab6daf7805a954d3d /guides/source
parentbffacccc6a60d9f47b7ac2e7edafda0a66f59ddd (diff)
downloadrails-96f0114e082b116856e945b075abd747eff0e63e.tar.gz
rails-96f0114e082b116856e945b075abd747eff0e63e.tar.bz2
rails-96f0114e082b116856e945b075abd747eff0e63e.zip
Use official database name [ci skip]
* s/Postgres/PostgreSQL/ * s/MYSQL/MySQL/, s/Mysql/MySQL/ * s/Sqlite/SQLite/ Replaced all newly added them after 6089b31.
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/active_record_basics.md2
-rw-r--r--guides/source/i18n.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/active_record_basics.md b/guides/source/active_record_basics.md
index 7f17b19a13..d765e32ac7 100644
--- a/guides/source/active_record_basics.md
+++ b/guides/source/active_record_basics.md
@@ -105,7 +105,7 @@ depending on the purpose of these columns.
fields that Active Record will look for when you create associations between
your models.
* **Primary keys** - By default, Active Record will use an integer column named
- `id` as the table's primary key (`bigint` for Postgres and MYSQL, `integer`
+ `id` as the table's primary key (`bigint` for PostgreSQL and MySQL, `integer`
for SQLite). When using [Active Record Migrations](active_record_migrations.html)
to create your tables, this column will be automatically created.
diff --git a/guides/source/i18n.md b/guides/source/i18n.md
index dab73bfbc2..d6fccadb28 100644
--- a/guides/source/i18n.md
+++ b/guides/source/i18n.md
@@ -1206,7 +1206,7 @@ The I18n API described in this guide is primarily intended for translating inter
Several gems can help with this:
* [Globalize](https://github.com/globalize/globalize): Store translations on separate translation tables, one for each translated model
-* [Mobility](https://github.com/shioyama/mobility): Provides support for storing translations in many formats, including translation tables, json columns (Postgres), etc.
+* [Mobility](https://github.com/shioyama/mobility): Provides support for storing translations in many formats, including translation tables, json columns (PostgreSQL), etc.
* [Traco](https://github.com/barsoom/traco): Translatable columns for Rails 3 and 4, stored in the model table itself
Conclusion