diff options
| author | Tim Graham <timograham@gmail.com> | 2012-12-11 16:30:07 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2012-12-11 16:35:37 -0500 |
| commit | d92d9cf2aa15e70bcca8a3c9b2efa4ea8961ca4e (patch) | |
| tree | bd80a88315787e2e711f4b08b659b2bb90272f15 | |
| parent | deb205b8ce560957167a6d0472d4ffca3a40abd9 (diff) | |
[1.5.X] Fixed #19377 - Emphasized database host link in tutorial
Backport of 0eed8ece32 from master
| -rw-r--r-- | docs/intro/tutorial01.txt | 4 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 8 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 10 |
3 files changed, 10 insertions, 12 deletions
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt index 5712d557c6..9913b21e13 100644 --- a/docs/intro/tutorial01.txt +++ b/docs/intro/tutorial01.txt @@ -220,8 +220,8 @@ your database connection settings. SQLite). * :setting:`HOST` -- The host your database is on. Leave this as - an empty string if your database server is on the same physical - machine (not used for SQLite). + an empty string (or possibly ``127.0.0.1``) if your database server is on the + same physical machine (not used for SQLite). See :setting:`HOST` for details. If you're new to databases, we recommend simply using SQLite by setting :setting:`ENGINE` to ``'django.db.backends.sqlite3'`` and :setting:`NAME` to diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 946d0f4f3b..352c0f4584 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -34,13 +34,9 @@ aggregate with a database backend that falls within the affected release range. .. _Release 8.2.5: http://www.postgresql.org/docs/devel/static/release-8-2-5.html PostgreSQL connection settings ------------------------------- +------------------------------- -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). On Windows, you should always define -:setting:`HOST`, as UNIX domain sockets are not available. +See :setting:`HOST` for details. Optimizing PostgreSQL's configuration ------------------------------------- diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index b17f88ab4a..2177945d22 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -431,10 +431,12 @@ MySQL will connect via a Unix socket to the specified socket. For example:: If you're using MySQL and this value *doesn't* start with a forward slash, then this value is assumed to be the host. -If you're using PostgreSQL, an empty string means to use a Unix domain socket -for the connection, rather than a network connection to localhost. If you -explicitly need to use a TCP/IP connection on the local machine with -PostgreSQL, specify ``localhost`` here. +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``). +On Windows, you should always define :setting:`HOST`, as UNIX domain sockets +are not available. .. setting:: NAME |