Merge remote-tracking branch 'upstream/pull/4266'

[rails.git] / config / example.database.yml

diff --git a/config/example.database.yml b/config/example.database.yml
index 3908e51e53785b82fe367f6841c3e7134c0f3ea7..4c77998da1d38fbe45a6b2766e3ebce7f26a0a86 100644 (file)
--- a/config/example.database.yml
+++ b/config/example.database.yml
@@ -1,12 +1,12 @@
-# Postgresql version 8.3 recommended.
-# See http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6/postgres for detailed setup instructions.
+# Using a recent release (9.1 or higher) of PostgreSQL (http://postgresql.org/) is recommended.
+# See https://github.com/openstreetmap/openstreetmap-website/blob/master/INSTALL.md#database-setup for detailed setup instructions.
 #
 development:
   adapter: postgresql
   database: openstreetmap
 #  username: openstreetmap
 #  password: openstreetmap
-  host: localhost
+#  host: localhost
   encoding: utf8
 
 # Warning: The database defined as 'test' will be erased and
@@ -17,7 +17,7 @@ test:
   database: osm_test
 #  username: osm_test
 #  password: osm_test
-  host: localhost
+#  host: localhost
   encoding: utf8
 
 production:
@@ -25,5 +25,5 @@ production:
   database: osm
 #  username: osm
 #  password: osm
-  host: localhost
+#  host: localhost
   encoding: utf8