diff options
| author | J Bradshaw <jbradsha@users.noreply.github.com> | 2015-05-23 20:28:22 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@odoo.com> | 2015-07-07 12:09:21 +0200 |
| commit | 2f7ab001e209fa54260bbc1dd008b9fa0e17baad (patch) | |
| tree | d8ab5ffe63478450fdd9ee3af97ea4cc3b40b522 /doc/setup/deploy.rst | |
| parent | 95e56a109d5abc97ab7db1ee1c9b9efb66a7e362 (diff) | |
[IMP] doc: grammar and readability
Backport of most of #6827 by J Bradshaw with additional
modifications (and some reverts) during review.
closes #6827
Diffstat (limited to 'doc/setup/deploy.rst')
| -rw-r--r-- | doc/setup/deploy.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst index 9b95a3adb27..9197afe839f 100644 --- a/doc/setup/deploy.rst +++ b/doc/setup/deploy.rst @@ -42,14 +42,14 @@ connections (from "localhost", the same machine the PostgreSQL server is installed on). UNIX socket is fine if you want Odoo and PostgreSQL to execute on the same -machine, and the default when no host is provided, but if you want Odoo and +machine, and is the default when no host is provided, but if you want Odoo and PostgreSQL to execute on different machines [#different-machines]_ it will need to `listen to network interfaces`_ [#remote-socket]_, either: * only accept loopback connections and `use an SSH tunnel`_ between the machine on which Odoo runs and the one on which PostgreSQL runs, then configure Odoo to connect to its end of the tunnel -* accept connections to the machine on which Odoo is installed, possibly with +* accept connections to the machine on which Odoo is installed, possibly over ssl (see `PostgreSQL connection settings`_ for details), then configure Odoo to connect over the network @@ -79,7 +79,7 @@ create a new user (``odoo``) and set it as the database user. to be completely non-functional, the user needs to be created with ``no-createdb`` and the database must be owned by a different user. - .. warning:: the user also needs to *not* be a superuser + .. warning:: the user *must not* be a superuser HTTPS ===== @@ -160,7 +160,7 @@ most HTTP connections are relatively short and quickly free up their worker process for the next request, LiveChat require a long-lived connection for each client in order to implement near-real-time notifications. -This is in conflict with the process-based worker model, as it's going to tie +This is in conflict with the process-based worker model, as it will tie up worker processes and prevent new users from accessing the system. However, those long-lived connections do very little and mostly stay parked waiting for notifications. |