doc: tweak documentation a little

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/doc/ja/lxc-attach.sgml.in b/doc/ja/lxc-attach.sgml.in
index 19ccfb8aa406d9312c23b2030c23230bf1960c71..8e001a45756e45350847c5ad7ad9f2ab41530976 100644 (file)
--- a/doc/ja/lxc-attach.sgml.in
+++ b/doc/ja/lxc-attach.sgml.in
@@ -102,8 +102,8 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
     input faking via a TIOCSTI <command>ioctl</command> call after switching
     between userspace execution contexts with different privilege levels. Newer
     versions of <command>lxc-attach</command> will try to allocate a pseudo
-    terminal master/slave pair on the host and attach any standard file
-    descriptors which refer to a terminal to the slave side of the pseudo
+    terminal file descriptor pair on the host and attach any standard file
+    descriptors which refer to a terminal to the container side of the pseudo
     terminal before executing a shell or command. Note, that if none of the
     standard file descriptors refer to a terminal <command>lxc-attach</command>
     will not try to allocate a pseudo terminal. Instead it will simply attach

diff --git a/doc/ja/lxc-unshare.sgml.in b/doc/ja/lxc-unshare.sgml.in
index fd4c817e1c671eb10bc0a601f0f3ffd801f764b6..1640201533ceca55fbeeca30621c6e1aa0c0a4e2 100644 (file)
--- a/doc/ja/lxc-unshare.sgml.in
+++ b/doc/ja/lxc-unshare.sgml.in
@@ -246,22 +246,22 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
         To spawn a shell in a new network, pid, mount, and hostname
         namespace.
         <programlisting>
-          lxc-unshare -s "NETWORK|PID|MOUNT|UTSNAME" -M -H slave -i veth1 /bin/bash
+          lxc-unshare -s "NETWORK|PID|MOUNT|UTSNAME" -M -H myhostname -i veth1 /bin/bash
         </programlisting>
         -->
         新しいネットワーク、PID、マウント、ホスト名 (UTS) 名前空間でシェルを起動するには、
         <programlisting>
-          lxc-unshare -s "NETWORK|PID|MOUNT|UTSNAME" -M -H slave -i veth1 /bin/bash
+          lxc-unshare -s "NETWORK|PID|MOUNT|UTSNAME" -M -H myhostname -i veth1 /bin/bash
         </programlisting>
 
         <!--
        The resulting shell will have pid 1 and will see two network
-       interfaces (lo and veth1).  The hostname will be "slave" and
+       interfaces (lo and veth1).  The hostname will be "myhostname" and
        /proc will have been remounted.  ps output will show there are
        no other processes in the namespace.
         -->
         起動したシェルは PID 1 を持ち、2 つのネットワークインターフェース (lo と veth1) を持ちます。
-        ホスト名は "slave" となり、/proc は再マウントされます。ps コマンドは、名前空間内には他のプロセスがない状態を表示するでしょう。
+        ホスト名は "myhostname" となり、/proc は再マウントされます。ps コマンドは、名前空間内には他のプロセスがない状態を表示するでしょう。
       </para>
   </refsect1>
 

diff --git a/doc/ko/lxc-attach.sgml.in b/doc/ko/lxc-attach.sgml.in
index 7a7dfa5250d3dee9a965e8f84af7d5c3a456be99..9a739e69ed5b6671f0f45b4c8002df20a86455ac 100644 (file)
--- a/doc/ko/lxc-attach.sgml.in
+++ b/doc/ko/lxc-attach.sgml.in
@@ -103,8 +103,8 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
       input faking via a TIOCSTI <command>ioctl</command> call after switching
       between userspace execution contexts with different privilege levels. Newer
       versions of <command>lxc-attach</command> will try to allocate a pseudo
-      terminal master/slave pair on the host and attach any standard file
-      descriptors which refer to a terminal to the slave side of the pseudo
+      terminal file descriptor pair on the host and attach any standard file
+      descriptors which refer to a terminal to the container side of the pseudo
       terminal before executing a shell or command. Note, that if none of the
       standard file descriptors refer to a terminal <command>lxc-attach</command>
       will not try to allocate a pseudo terminal. Instead it will simply attach

diff --git a/doc/ko/lxc-unshare.sgml.in b/doc/ko/lxc-unshare.sgml.in
index 480f20050727de55193289f7530d9fba333e5d43..edcdbf0a8e9584af16af15a891ea585478658584 100644 (file)
--- a/doc/ko/lxc-unshare.sgml.in
+++ b/doc/ko/lxc-unshare.sgml.in
@@ -242,21 +242,21 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
         To spawn a shell in a new network, pid, mount, and hostname
         namespace.
         <programlisting>
-          lxc-unshare -s "NETWORK|PID|MOUNT|UTSNAME" -M -H slave -i veth1 /bin/bash
+          lxc-unshare -s "NETWORK|PID|MOUNT|UTSNAME" -M -H myhostname -i veth1 /bin/bash
         </programlisting>
         -->
         새로운 네트워크, PID, 마운트 그리고 호스트 이름(UTS) 네임스페이스 내에 쉘을 실행하려면, 아래처럼 하면 된다.
         <programlisting>
-          lxc-unshare -s "NETWORK|PID|MOUNT|UTSNAME" -M -H slave -i veth1 /bin/bash
+          lxc-unshare -s "NETWORK|PID|MOUNT|UTSNAME" -M -H myhostname -i veth1 /bin/bash
         </programlisting>
 
         <!--
        The resulting shell will have pid 1 and will see two network
-       interfaces (lo and veth1).  The hostname will be "slave" and
+       interfaces (lo and veth1).  The hostname will be "myhostname" and
        /proc will have been remounted.  ps output will show there are
        no other processes in the namespace.
         -->
-        그 결과 생긴 쉘은 1번 pid를 갖는다. 그리고 2개의 네트워크 인터페이스(lo와 veth1)를 갖는다. 호스트 이름은 "slave"이고, /proc은 다시 마운트 된다.
+        그 결과 생긴 쉘은 1번 pid를 갖는다. 그리고 2개의 네트워크 인터페이스(lo와 veth1)를 갖는다. 호스트 이름은 "myhostname"이고, /proc은 다시 마운트 된다.
         ps 명령어를 입력하면, 네임스페이스 내에서 다른 프로세스들은 보이지 않을 것이다.
       </para>
   </refsect1>

diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in
index 14fa77d7995c531fd942eaabf76970c6095c5830..12aecd39bfeb4f0967ccf9e827c3aa09e7c8d57f 100644 (file)
--- a/doc/lxc-attach.sgml.in
+++ b/doc/lxc-attach.sgml.in
@@ -90,8 +90,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
     input faking via a TIOCSTI <command>ioctl</command> call after switching
     between userspace execution contexts with different privilege levels. Newer
     versions of <command>lxc-attach</command> will try to allocate a pseudo
-    terminal master/slave pair on the host and attach any standard file
-    descriptors which refer to a terminal to the slave side of the pseudo
+    terminal file descriptor pair on the host and attach any standard file
+    descriptors which refer to a terminal to the container side of the pseudo
     terminal before executing a shell or command. Note, that if none of the
     standard file descriptors refer to a terminal <command>lxc-attach</command>
     will not try to allocate a pseudo terminal. Instead it will simply attach

diff --git a/doc/lxc-unshare.sgml.in b/doc/lxc-unshare.sgml.in
index b0cb1eab16db611875bf85bb2e2b8f259a6faf98..2a508bef23cf27fdd463213459577c48d6075338 100644 (file)
--- a/doc/lxc-unshare.sgml.in
+++ b/doc/lxc-unshare.sgml.in
@@ -190,11 +190,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
         To spawn a shell in a new network, pid, mount, and hostname
         namespace.
         <programlisting>
-          lxc-unshare -s "NETWORK|PID|MOUNT|UTSNAME" -M -H slave -i veth1 /bin/bash
+          lxc-unshare -s "NETWORK|PID|MOUNT|UTSNAME" -M -H myhostname -i veth1 /bin/bash
         </programlisting>
 
        The resulting shell will have pid 1 and will see two network
-       interfaces (lo and veth1).  The hostname will be "slave" and
+       interfaces (lo and veth1).  The hostname will be "myhostname" and
        /proc will have been remounted.  ps output will show there are
        no other processes in the namespace.
       </para>