From b508b9f6ef7282e782e91663705637bc3af87a94 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 15 Jan 2017 19:35:19 +0100 Subject: [PATCH] Update database config comments closes #7282 --- Changelog.md | 1 + config/database.yml.example | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index f9c32963d..b53fad879 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,7 @@ ## Bug fixes * Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281) +* Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282) ## Features diff --git a/config/database.yml.example b/config/database.yml.example index 879572d36..20f0ff43a 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -17,8 +17,8 @@ mysql: &mysql collation: utf8mb4_bin -# Comment the the mysql line and uncomment the postgres line -# if you want to use postgres +# Comment the postgresql line and uncomment the mysql line +# if you want to use mysql common: &common # Choose one of the following <<: *postgresql