Ticket #19377: 19377.2.diff

File 19377.2.diff, 2.6 KB (added by Tim Graham, 13 years ago)

  • docs/intro/tutorial01.txt 

    diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index 5712d55..9913b21 100644
    a b your database connection settings.  
    220220  SQLite).
    221221
    222222* :setting:`HOST` -- The host your database is on. Leave this as
    223   an empty string if your database server is on the same physical
    224   machine (not used for SQLite).
     223  an empty string (or possibly ``127.0.0.1``) if your database server is on the
     224  same physical machine (not used for SQLite). See :setting:`HOST` for details.
    225225
    226226If you're new to databases, we recommend simply using SQLite by setting
    227227:setting:`ENGINE` to ``'django.db.backends.sqlite3'`` and :setting:`NAME` to

  • docs/ref/databases.txt 

    diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 946d0f4..54eb6a4 100644
    a b aggregate with a database backend that falls within the affected release range.  
    3434.. _Release 8.2.5: http://www.postgresql.org/docs/devel/static/release-8-2-5.html
    3535
    3636PostgreSQL connection settings
    37 ------------------------------
    3837
    39 By default (empty :setting:`HOST`), the connection to the database is done
    40 through UNIX domain sockets ('local' lines in pg_hba.conf). If you want to
    41 connect through TCP sockets, set :setting:`HOST` to 'localhost' or '127.0.0.1'
    42 ('host' lines in pg_hba.conf). On Windows, you should always define
    43 :setting:`HOST`, as UNIX domain sockets are not available.
     38-------------------------------
     39See :setting:`HOST` for details.
    4440
    4541Optimizing PostgreSQL's configuration
    4642-------------------------------------

  • docs/ref/settings.txt 

    diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index bf0a1e5..b4b7e7d 100644
    a b MySQL will connect via a Unix socket to the specified socket. For example::  
    431431If you're using MySQL and this value *doesn't* start with a forward slash, then
    432432this value is assumed to be the host.
    433433
    434 If you're using PostgreSQL, an empty string means to use a Unix domain socket
    435 for the connection, rather than a network connection to localhost. If you
    436 explicitly need to use a TCP/IP connection on the local machine with
    437 PostgreSQL, specify ``localhost`` here.
     434If you're using PostgreSQL, by default (empty :setting:`HOST`), the connection
     435to the database is done through UNIX domain sockets ('local' lines in
     436``pg_hba.conf``). If you want to connect through TCP sockets, set
     437:setting:`HOST` to 'localhost' or '127.0.0.1' ('host' lines in ``pg_hba.conf``).
     438On Windows, you should always define :setting:`HOST`, as UNIX domain sockets
     439are not available.
    438440
    439441.. setting:: NAME
    440442
Back to Top