summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Magliocchetti <riccardo.magliocchetti@gmail.com>2013-10-21 16:53:25 +0200
committerTim Graham <timograham@gmail.com>2013-10-21 13:10:41 -0400
commit15a6667a7040739a74c9bc7c83ee9435f517b284 (patch)
treef2c34dd6f02acf707a294fe9fe2b361a36fbb351
parent0c850e28858016b5890ae83a6ec6880614b306a2 (diff)
downloaddjango-15a6667a7040739a74c9bc7c83ee9435f517b284.tar.gz
[1.6.x] Fixed #21296 -- Added docs for PostgreSQL and unix domains sockets.
Backport of 1e39982b6e from master
-rw-r--r--docs/ref/settings.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 5503d8752d..d949198d52 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -506,8 +506,10 @@ this value is assumed to be the host.
If you're using PostgreSQL, by default (empty :setting:`HOST`), the connection
to the database is done through UNIX domain sockets ('local' lines in
-``pg_hba.conf``). If you want to connect through TCP sockets, set
-:setting:`HOST` to 'localhost' or '127.0.0.1' ('host' lines in ``pg_hba.conf``).
+``pg_hba.conf``). If your UNIX domain socket is not in the standard location,
+use the same value of ``unix_socket_directory`` from ``postgresql.conf``.
+If you want to connect through TCP sockets, set :setting:`HOST` to 'localhost'
+or '127.0.0.1' ('host' lines in ``pg_hba.conf``).
On Windows, you should always define :setting:`HOST`, as UNIX domain sockets
are not available.