From: Josh Soref Date: Tue, 30 Oct 2018 07:35:39 +0000 (+0000) Subject: spelling: otherwise X-Git-Tag: lxc-4.0.0~372^2~22 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=69e3b3bebf35568a6109046ae56d5110af61e230;p=mirror_lxc.git spelling: otherwise Signed-off-by: Josh Soref --- diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in index cb9a8a760..8e2b47af8 100644 --- a/doc/ja/lxc.container.conf.sgml.in +++ b/doc/ja/lxc.container.conf.sgml.in @@ -2272,7 +2272,7 @@ by KATOH Yasufumi container should be run can be specified in the container configuration. The default is lxc-container-default-cgns if the host kernel is cgroup namespace aware, or - lxc-container-default othewise. + lxc-container-default otherwise. --> lxc が apparmor サポートでコンパイルされ、インストールされている場合で、ホストで apparmor が有効な場合、コンテナが従って動くべき apparmor プロファイルは、コンテナの設定で指定することが可能です。 デフォルトは、ホストのカーネルで cgroup 名前空間が使える場合は lxc-container-default-cgnsです。使えない場合は lxc-container-default です。 diff --git a/doc/ko/lxc.container.conf.sgml.in b/doc/ko/lxc.container.conf.sgml.in index 39fe01edc..198812f93 100644 --- a/doc/ko/lxc.container.conf.sgml.in +++ b/doc/ko/lxc.container.conf.sgml.in @@ -1623,7 +1623,7 @@ proc proc proc nodev,noexec,nosuid 0 0 container should be run can be specified in the container configuration. The default is lxc-container-default-cgns if the host kernel is cgroup namespace aware, or - lxc-container-default othewise. + lxc-container-default otherwise. --> lxc가 apparmor를 지원하도록 컴파일된 후 설치되었고, 호스트 시스템에서 apparmor가 활성화되었다면, 컨테이너에서 따라야할 apparmor 프로파일을 컨테이너 설정에서 지정할 수 있다. 기본값은 호스트 커널이 cgroup 네임스페이스를 지원하면 lxc-container-default-cgns이고, 그렇지 않다면 lxc-container-default이다. diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in index 0a20e06db..91a7355a0 100644 --- a/doc/lxc.container.conf.sgml.in +++ b/doc/lxc.container.conf.sgml.in @@ -1705,7 +1705,7 @@ dev/null proc/kcore none bind,relative 0 0 container should be run can be specified in the container configuration. The default is lxc-container-default-cgns if the host kernel is cgroup namespace aware, or - lxc-container-default othewise. + lxc-container-default otherwise. diff --git a/src/lxc/criu.c b/src/lxc/criu.c index c40e93a71..3d857b541 100644 --- a/src/lxc/criu.c +++ b/src/lxc/criu.c @@ -952,7 +952,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_ struct cgroup_ops *cgroup_ops; /* Try to detach from the current controlling tty if it exists. - * Othwerise, lxc_init (via lxc_console) will attach the container's + * Otherwise, lxc_init (via lxc_console) will attach the container's * console output to the current tty, which is probably not what any * library user wants, and if they do, they can just manually configure * it :)