Browse Source

Merge pull request #14450 from hqhq/hq_fix_oom_kill_disable_doc

Fix docs for oom-kill-disable
moxiegirl 10 years ago
parent
commit
5bf335d0a2
1 changed files with 1 additions and 1 deletions
  1. 1 1
      docs/reference/run.md

+ 1 - 1
docs/reference/run.md

@@ -590,7 +590,7 @@ would be 2*300M, so processes can use 300M swap memory as well.
 We set both memory and swap memory, so the processes in the container can use
 We set both memory and swap memory, so the processes in the container can use
 300M memory and 700M swap memory.
 300M memory and 700M swap memory.
 
 
-By default, Docker kills processes in a container if an out-of-memory (OOM)
+By default, kernel kills processes in a container if an out-of-memory (OOM)
 error occurs. To change this behaviour, use the `--oom-kill-disable` option.
 error occurs. To change this behaviour, use the `--oom-kill-disable` option.
 Only disable the OOM killer on containers where you have also set the
 Only disable the OOM killer on containers where you have also set the
 `-m/--memory` option. If the `-m` flag is not set, this can result in the host
 `-m/--memory` option. If the `-m` flag is not set, this can result in the host