diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-28 14:37:02 +0200 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-28 14:37:02 +0200 |
commit | 58750422c57e0cdc7f0a4ab4030fb9a98ec0b9db (patch) | |
tree | 1720ef4cd6b11208bd35d30cbf655bdff77113c4 /guides/source | |
parent | 805bd7a81a376198b8ae8a90539e6487f3f14ca7 (diff) | |
parent | c0d3209b2eab994093eb99673a5a2dd35cb3310b (diff) | |
download | rails-58750422c57e0cdc7f0a4ab4030fb9a98ec0b9db.tar.gz rails-58750422c57e0cdc7f0a4ab4030fb9a98ec0b9db.tar.bz2 rails-58750422c57e0cdc7f0a4ab4030fb9a98ec0b9db.zip |
Merge pull request #21797 from dv/docs-rewording-in-database-configure-guide
Make fuzzy sentence more clear
Diffstat (limited to 'guides/source')
-rw-r--r-- | guides/source/configuring.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 0dd99cf8e9..f0d87e4dc8 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -641,7 +641,7 @@ TIP: You don't have to update the database configurations manually. If you look ### Connection Preference -Since there are two ways to set your connection, via environment variable it is important to understand how the two can interact. +Since there are two ways to configure your connection (using `config/database.yml` or using an environment variable) it is important to understand how they can interact. If you have an empty `config/database.yml` file but your `ENV['DATABASE_URL']` is present, then Rails will connect to the database via your environment variable: |