doc: remove the warning mentionning upstart

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index 9b0b01ba1bafb5ef6deedea8df3dc0200237fca6..a1d82faed259f75f5a4c025f3842718758c21638 100644 (file)
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -597,23 +597,6 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
               現時点では、以下のネットワーク仮想化のタイプが使えます:
             </para>
 
-            <para>
-              <!--
-              <option>none:</option> will cause the container to share
-              the host's network namespace.  This means the host
-              network devices are usable in the container.  It also
-              means that if both the container and host have upstart as
-              init, 'halt' in a container (for instance) will shut down the
-              host. Note that unprivileged containers do not work with this
-              setting due to an inability to mount sysfs. An unsafe workaround
-              would be to bind mount the host's sysfs.
-              -->
-              <option>none:</option> ホストのネットワーク名前空間を共有します。
-              これにより、ホストのネットワークデバイスをコンテナ内で使うことが可能になります。
-              もしコンテナもホストも init として upstart を使っている場合、(例えば) コンテナ内で 'halt' を実行すると、ホストがシャットダウンしてしまうことにもなります。
-              非特権コンテナでは、sysfs をマウントできないので、この設定は動作しません。この問題に対する回避策は、ホストの sysfs を bind マウントすることです。ただしこの回避策は安全ではありません。
-            </para>
-
             <para>
               <!--
               <option>empty:</option> will create only the loopback

diff --git a/doc/ko/lxc.container.conf.sgml.in b/doc/ko/lxc.container.conf.sgml.in
index 3ca030406bfd6ef611380d596d765e9376ee72b1..a5f17a64598ba0448bb25fc67a58b76c654dc577 100644 (file)
--- a/doc/ko/lxc.container.conf.sgml.in
+++ b/doc/ko/lxc.container.conf.sgml.in
@@ -447,19 +447,6 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
               지정 가능한 형태는 아래와 같다.
            </para>
 
-           <para>
-              <!--
-             <option>none:</option> will cause the container to share
-             the host's network namespace.  This means the host
-             network devices are usable in the container.  It also
-             means that if both the container and host have upstart as
-             init, 'halt' in a container (for instance) will shut down the
-             host.
-              -->
-              <option>none:</option> 호스트의 네트워크 네임스페이스를 공유한다. 이렇게 하면 호스트의 네트워크 장치를 컨테이너 내에서 사용가능하다.
-              컨테이너와 호스트 둘다 init에서 upstart를 사용하는 경우, (예를 들어) 컨테이너에서 'halt'를 하면, 호스트의 것도 종료된다.
-           </para>
-
            <para>
               <!--
              <option>empty:</option> will create only the loopback

diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index 9c5db9ba1471e271d57cbbda6c54c50b8bb8ac63..8726341f2a77020e4374c334615a633c8c27a81a 100644 (file)
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -452,17 +452,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
               Currently, the different virtualization types can be:
             </para>
 
-            <para>
-              <option>none:</option> will cause the container to share
-              the host's network namespace.  This means the host
-              network devices are usable in the container.  It also
-              means that if both the container and host have upstart as
-              init, 'halt' in a container (for instance) will shut down the
-              host. Note that unprivileged containers do not work with this
-             setting due to an inability to mount sysfs. An unsafe workaround
-             would be to bind mount the host's sysfs.
-            </para>
-
             <para>
               <option>empty:</option> will create only the loopback
               interface.