From: Christian Brauner Date: Fri, 19 Jun 2020 21:58:15 +0000 (+0200) Subject: doc: update terminology X-Git-Tag: lxc-5.0.0~411^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1d358b08a253dd87c4bddb9c6621b30762262fe;p=thirdparty%2Flxc.git doc: update terminology Signed-off-by: Christian Brauner --- diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in index 91111a222..7a65e3fe4 100644 --- a/doc/ja/lxc.container.conf.sgml.in +++ b/doc/ja/lxc.container.conf.sgml.in @@ -713,25 +713,25 @@ by KATOH Yasufumi modes are , and . It defaults to mode. In mode TX processing up to L3 happens on the stack instance - attached to the slave device and packets are switched to the stack instance of the - master device for the L2 processing and routing from that instance will be - used before packets are queued on the outbound device. In this mode the slaves + attached to the dependent device and packets are switched to the stack instance of the + parent device for the L2 processing and routing from that instance will be + used before packets are queued on the outbound device. In this mode the dependent devices will not receive nor can send multicast / broadcast traffic. In mode TX processing is very similar to the L3 mode except that iptables (conn-tracking) works in this mode and hence it is L3-symmetric (L3s). This will have slightly less performance but that shouldn't matter since you are choosing this mode over plain-L3 mode to make conn-tracking work. In mode TX processing happens on the stack instance attached to - the slave device and packets are switched and queued to the master device to send - out. In this mode the slaves will RX/TX multicast and broadcast (if applicable) as well. + the dependent device and packets are switched and queued to the parent device to send + out. In this mode the dependent devices will RX/TX multicast and broadcast (if applicable) as well. specifies the isolation mode. The accepted isolation values are , and . It defaults to . - In isolation mode slaves can cross-talk among themselves - apart from talking through the master device. + In isolation mode dependent devices can cross-talk among themselves + apart from talking through the parent device. In isolation mode the port is set in private mode. - i.e. port won't allow cross communication between slaves. + i.e. port won't allow cross communication between dependent devices. In isolation mode the port is set in VEPA mode. i.e. port will offload switching functionality to the external entity as described in 802.1Qbg. @@ -1548,7 +1548,7 @@ by KATOH Yasufumi fstab フォーマットの一行と同じフォーマットのマウントポイントの指定をします。 - 加えて、LXC では rslave や rprivate といったマウント・プロパゲーションオプションと、独自の 3 つのマウントオプションが使えます。 + 加えて、LXC では rshared や rprivate といったマウント・プロパゲーションオプションと、独自の 3 つのマウントオプションが使えます。 は、マウントが失敗しても失敗を返さずに無視します。 と は、マウントポイントをマウントする際にディレクトリもしくはファイルを作成します。 を指定すると、マウントされたコンテナルートからの相対パスとして取得されます。 diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in index 7b0099d3a..740a02f33 100644 --- a/doc/lxc.container.conf.sgml.in +++ b/doc/lxc.container.conf.sgml.in @@ -536,25 +536,25 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA modes are , and . It defaults to mode. In mode TX processing up to L3 happens on the stack instance - attached to the slave device and packets are switched to the stack instance of the - master device for the L2 processing and routing from that instance will be - used before packets are queued on the outbound device. In this mode the slaves + attached to the dependent device and packets are switched to the stack instance of the + parent device for the L2 processing and routing from that instance will be + used before packets are queued on the outbound device. In this mode the dependent devices will not receive nor can send multicast / broadcast traffic. In mode TX processing is very similar to the L3 mode except that iptables (conn-tracking) works in this mode and hence it is L3-symmetric (L3s). This will have slightly less performance but that shouldn't matter since you are choosing this mode over plain-L3 mode to make conn-tracking work. In mode TX processing happens on the stack instance attached to - the slave device and packets are switched and queued to the master device to send - out. In this mode the slaves will RX/TX multicast and broadcast (if applicable) as well. + the dependent device and packets are switched and queued to the parent device to send devices + out. In this mode the dependent devices will RX/TX multicast and broadcast (if applicable) as well. specifies the isolation mode. The accepted isolation values are , and . It defaults to . - In isolation mode slaves can cross-talk among themselves - apart from talking through the master device. + In isolation mode dependent devices can cross-talk among themselves + apart from talking through the parent device. In isolation mode the port is set in private mode. - i.e. port won't allow cross communication between slaves. + i.e. port won't allow cross communication between dependent devices. In isolation mode the port is set in VEPA mode. i.e. port will offload switching functionality to the external entity as described in 802.1Qbg. @@ -1170,7 +1170,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Specify a mount point corresponding to a line in the fstab format. - Moreover lxc supports mount propagation, such as rslave or + Moreover lxc supports mount propagation, such as rshared or rprivate, and adds three additional mount options. don't fail if mount does not work. or