diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-05-24 12:33:23 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-05-24 12:33:23 +0200 |
| commit | f8e6bb73b3aed541fd96e28ec0382ea9964a1db7 (patch) | |
| tree | 04ee6296f90cad1377971806970b973fec70ee1f /doc | |
| parent | 06c49d19c3f0028d9dadaee9c9d97abf005e3455 (diff) | |
| parent | 4c07fafe708d3ddb5079c930d536fc1e22b51aac (diff) | |
[MERGE] forward port of branch 9.0 up to 4c07faf
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/individual/lbaldi.md | 11 | ||||
| -rw-r--r-- | doc/reference/cmdline.rst | 10 |
2 files changed, 16 insertions, 5 deletions
diff --git a/doc/cla/individual/lbaldi.md b/doc/cla/individual/lbaldi.md new file mode 100644 index 00000000000..22f9a22c90c --- /dev/null +++ b/doc/cla/individual/lbaldi.md @@ -0,0 +1,11 @@ +Argentina, 19/05/2016 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Baldi Leandro baldileandro@gmail.com https://github.com/lbaldi 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> |