summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-07-29 12:04:24 +0200
committerChristophe Simonis <chs@odoo.com>2016-07-29 12:04:24 +0200
commit4c7d9cb6a6489b4654c91073f37e9f6d0b3d080f (patch)
tree56e5774034471b25d2e1fdaf91a810f141cc505d /doc
parenta2d9b72112cafa21578024562b3284ffd28eca6c (diff)
parente0c0a5fb1b6497b0e401ee23ada19d2ec9774a35 (diff)
[MERGE] forward port branch 9.0 up to e0c0a5f
Diffstat (limited to 'doc')
-rw-r--r--doc/setup/deploy.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst
index 53aabb1aec8..76f1d81cb38 100644
--- a/doc/setup/deploy.rst
+++ b/doc/setup/deploy.rst
@@ -170,7 +170,7 @@ Worker number calculation
* Rule of thumb : (#CPU * 2) + 1
* Cron workers need CPU
-* 1 worker ~= 6 concurent users
+* 1 worker ~= 6 concurrent users
memory size calculation
-----------------------
@@ -196,7 +196,7 @@ Configuration sample
--------------------
* Server with 4 CPU, 8 Thread
-* 60 concurent users
+* 60 concurrent users
* 60 users / 6 = 10 <- theorical number of worker needed
* (4 * 2) + 1 = 9 <- theorical maximal number of worker
@@ -208,8 +208,8 @@ in ``/etc/odoo.conf``:
.. code-block:: apacheconf
[options]
- limit_memory_hard = 629145600
- limit_memory_soft = 1677721600
+ limit_memory_hard = 1677721600
+ limit_memory_soft = 629145600
limit_request = 8192
limit_time_cpu = 600
limit_time_real = 1200