Context Navigation

Ticket #19377: 19377.diff

File 19377.diff, 2.6 KB (added by Tim Graham, 12 years ago)

diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index 5712d55..9913b21 100644

                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 946d0f4..3a52f83 100644

                aggregate with a database backend that falls within the affected release range.
 .. _known to be faulty: http://archives.postgresql.org/pgsql-bugs/2007-07/msg00046.php
 .. _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.
 Optimizing PostgreSQL's configuration
 -------------------------------------

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index bf0a1e5..b4b7e7d 100644

                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