浏览代码

Docs: improve installation/ubuntulinux memory and swap accounting section

Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> (github: jbbarth)
Jean-Baptiste Barth 11 年之前
父节点
当前提交
0a0e49d406
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      docs/sources/installation/ubuntulinux.rst

+ 7 - 2
docs/sources/installation/ubuntulinux.rst

@@ -234,7 +234,7 @@ To install the latest version of docker, use the standard ``apt-get`` method:
 Memory and Swap Accounting
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If want to enable memory and swap accounting, you must add the following
+If you want to enable memory and swap accounting, you must add the following
 command-line parameters to your kernel::
 
     cgroup_enable=memory swapaccount=1
@@ -249,7 +249,12 @@ And replace it by the following one::
 
     GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1"
 
-Then run ``update-grub``, and reboot.
+Then run ``sudo update-grub``, and reboot.
+
+These parameters will help you get rid of the following warnings::
+
+    WARNING: Your kernel does not support cgroup swap limit.
+    WARNING: Your kernel does not support swap limit capabilities. Limitation discarded.
 
 Troubleshooting
 ^^^^^^^^^^^^^^^