aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-05-14 01:41:31 +0200
committerNils Adermann <naderman@naderman.de>2010-05-14 01:41:31 +0200
commitb3bbe576035da528aa6e52775cbc60133a8a2c90 (patch)
treed72f7d8a162bbec48ba1cacd2952087812821800 /phpBB
parent5fb945c220656b36a42c9d621b692c1c69826c74 (diff)
parent3a515bffb924130d5824d40ab250832a43e1db5b (diff)
downloadforums-b3bbe576035da528aa6e52775cbc60133a8a2c90.tar
forums-b3bbe576035da528aa6e52775cbc60133a8a2c90.tar.gz
forums-b3bbe576035da528aa6e52775cbc60133a8a2c90.tar.bz2
forums-b3bbe576035da528aa6e52775cbc60133a8a2c90.tar.xz
forums-b3bbe576035da528aa6e52775cbc60133a8a2c90.zip
Merge branch 'ticket/p/6726' into develop-olympus
* ticket/p/6726: [ticket/6726] Added localhost/127.0.0.1 note to database server hostname explanation in install language.
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/install.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 1c27e2f40d..8515739dc9 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -128,7 +128,7 @@ $lang = array_merge($lang, array(
'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing <var>query_first</var>, %s (ā€œ%sā€).',
'DB_ERR_SELECT' => 'Error while running <code>SELECT</code> query.',
'DB_HOST' => 'Database server hostname or DSN',
- 'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs.',
+ 'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs. On PostgreSQL, use localhost to connect to the local server via UNIX domain socket and 127.0.0.1 to connect via TCP.',
'DB_NAME' => 'Database name',
'DB_PASSWORD' => 'Database password',
'DB_PORT' => 'Database server port',