diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-05-24 13:19:19 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-05-24 13:19:19 +0200 |
| commit | fac4cc7006e5d72a5f6ee261e8a7422c78f5e6fb (patch) | |
| tree | facc8cb60bcd0f1d0536f6f004d05aefcf444fc7 /doc/reference/cmdline.rst | |
| parent | facb6644839c2120296e0845b8f780cb9998e34e (diff) | |
| parent | f8e6bb73b3aed541fd96e28ec0382ea9964a1db7 (diff) | |
[MERGE] forward port of branch saas-9 up to f8e6bb7
Diffstat (limited to 'doc/reference/cmdline.rst')
| -rw-r--r-- | doc/reference/cmdline.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst index 955f83981a9..e223e4a50b7 100644 --- a/doc/reference/cmdline.rst +++ b/doc/reference/cmdline.rst @@ -40,7 +40,7 @@ Running the server .. note:: multiprocessing mode is only available on Unix-based systems - A number of options allow limiting and recyling workers: + A number of options allow limiting and recycling workers: .. option:: --limit-request <limit> @@ -84,9 +84,9 @@ Running the server .. option:: --max-cron-threads <count> number of workers dedicated to cron jobs. Defaults to 2. The workers are - threads in multithreading mode and processes in multiprocessing mode. + threads in multi-threading mode and processes in multi-processing mode. - For multiprocessing mode, this is in addition to the HTTP worker + For multi-processing mode, this is in addition to the HTTP worker processes. .. option:: -c <config>, --config <config> @@ -96,7 +96,7 @@ Running the server .. option:: -s, --save saves the server configuration to the current configuration file - (:file:`{$HOME}/.openerp_serverrc` by default, overridable using + (:file:`{$HOME}/.openerp_serverrc` by default, and can be overridden using :option:`-c`) .. option:: --proxy-mode @@ -187,7 +187,7 @@ logging By default, Odoo displays all logging of level_ ``info`` except for workflow logging (``warning`` only), and log output is sent to ``stdout``. Various options are available to redirect logging to other destinations and to -customize the amout of logging output +customize the amount of logging output .. option:: --logfile <file> |