diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-09-21 10:42:19 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-09-21 10:42:19 +0200 |
| commit | a119373b5bc79bf93bc3f8942146de182a3ad6ea (patch) | |
| tree | 3bc3a0415eea9922d64be4a5c93821ecd4e14221 /doc/reference | |
| parent | 29b3b21ad24f7b912db381cc0dc9d59d6b6db5e9 (diff) | |
| parent | cda1bec3e0017fb3403cf895f863c4c53932e761 (diff) | |
[MERGE] forward port branch 10.0 up to cda1bec3e00
Diffstat (limited to 'doc/reference')
| -rw-r--r-- | doc/reference/cmdline.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst index 21f5b80ba6d..fa57319e4f9 100644 --- a/doc/reference/cmdline.rst +++ b/doc/reference/cmdline.rst @@ -54,7 +54,7 @@ Running the server Maximum allowed virtual memory per worker. If the limit is exceeded, the worker is killed and recycled at the end of the current request. - Defaults to 2048MB. + Defaults to 2048MiB. .. option:: --limit-memory-hard <limit> @@ -62,7 +62,7 @@ Running the server immediately killed without waiting for the end of the current request processing. - Defaults to 2560MB. + Defaults to 2560MiB. .. option:: --limit-time-cpu <limit> |