From 4ced441ef9a2ec5a62397c5535cf50dbc23c3543 Mon Sep 17 00:00:00 2001
From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Sat, 23 Oct 2021 14:44:22 +0900
Subject: [PATCH 1/4] doc: add loglevels to ja and ko common options

Update for commit 44b87e8

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
---
 doc/ja/common_options.sgml.in | 10 ++++++----
 doc/ko/common_options.sgml.in | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/doc/ja/common_options.sgml.in b/doc/ja/common_options.sgml.in
index 5360945be..893998905 100644
--- a/doc/ja/common_options.sgml.in
+++ b/doc/ja/common_options.sgml.in
@@ -105,16 +105,18 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 	  Set log priority to
 	  <replaceable>LEVEL</replaceable>. The default log
 	  priority is <literal>ERROR</literal>. Possible values are :
-	  <literal>FATAL</literal>, <literal>CRIT</literal>,
+	  <literal>FATAL</literal>, <literal>ALERT</literal>,
+	  <literal>CRIT</literal>,
 	  <literal>WARN</literal>, <literal>ERROR</literal>,
 	  <literal>NOTICE</literal>, <literal>INFO</literal>,
-	  <literal>DEBUG</literal>.
+	  <literal>DEBUG</literal>, <literal>TRACE</literal>.
           -->
           ログの優先度を <replaceable>LEVEL</replaceable> に設定します。デフォルトの優先度は <literal>ERROR</literal> です。以下の値を設定可能です:
-	  <literal>FATAL</literal>, <literal>CRIT</literal>,
+	  <literal>FATAL</literal>, <literal>ALERT</literal>,
+	  <literal>CRIT</literal>,
 	  <literal>WARN</literal>, <literal>ERROR</literal>,
 	  <literal>NOTICE</literal>, <literal>INFO</literal>,
-	  <literal>DEBUG</literal>。
+	  <literal>DEBUG</literal>, <literal>TRACE</literal>。
 	</para>
 	<para>
           <!--
diff --git a/doc/ko/common_options.sgml.in b/doc/ko/common_options.sgml.in
index 9e8b1b124..a3d44d52e 100644
--- a/doc/ko/common_options.sgml.in
+++ b/doc/ko/common_options.sgml.in
@@ -105,16 +105,18 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 	  Set log priority to
 	  <replaceable>LEVEL</replaceable>. The default log
 	  priority is <literal>ERROR</literal>. Possible values are :
-	  <literal>FATAL</literal>, <literal>CRIT</literal>,
+	  <literal>FATAL</literal>, <literal>ALERT</literal>,
+	  <literal>CRIT</literal>,
 	  <literal>WARN</literal>, <literal>ERROR</literal>,
 	  <literal>NOTICE</literal>, <literal>INFO</literal>,
-	  <literal>DEBUG</literal>.
+	  <literal>DEBUG</literal>, <literal>TRACE</literal>.
           -->
           로그 수준을 <replaceable>LEVEL</replaceable>로 지정한다. 기본값은 <literal>ERROR</literal>이다. 사용 가능한 값 :
-	  <literal>FATAL</literal>, <literal>CRIT</literal>,
+	  <literal>FATAL</literal>, <literal>ALERT</literal>,
+	  <literal>CRIT</literal>,
 	  <literal>WARN</literal>, <literal>ERROR</literal>,
 	  <literal>NOTICE</literal>, <literal>INFO</literal>,
-	  <literal>DEBUG</literal>.
+	  <literal>DEBUG</literal>, <literal>TRACE</literal>.
 	</para>
 	<para>
           <!--

From cc6a34b9da9a536e41898237ffabe7831d482f60 Mon Sep 17 00:00:00 2001
From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Sat, 23 Oct 2021 14:53:58 +0900
Subject: [PATCH 2/4] doc: add way to specify broadcast address to Japanese
 lxc.container.conf(5)

Update for commit 5686798

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
---
 doc/ja/lxc.container.conf.sgml.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index a81457018..94304c7b8 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -894,8 +894,13 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
               Specify the ipv4 address to assign to the virtualized interface.
               Several lines specify several ipv4 addresses. The address is in
               format x.y.z.t/m, eg. 192.168.1.123/24.
+              You can optionally specify the broadcast address after the IP adress,
+              e.g. 192.168.1.123/24 255.255.255.255.
+              Otherwise it is automatically calculated from the IP address.
               -->
               仮想インターフェースに割り当てる ipv4 アドレスを指定します。複数行により複数の ipv4 アドレスを指定します。このアドレスは x.y.z.t/m というフォーマットで指定します。例) 192.168.1.123/24
+              IP アドレスのあとにオプションでブロードキャストアドレスを指定できます。例）192.168.1.123/24 255.255.255.255
+              指定しなければ IP アドレスから自動的に計算されます。
             </para>
           </listitem>
         </varlistentry>

From 9093e179586a63e7176c46879f4c4372172d2521 Mon Sep 17 00:00:00 2001
From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Sat, 23 Oct 2021 15:18:00 +0900
Subject: [PATCH 3/4] doc: Add lxc.sched.core to Japanese lxc.container.conf(5)

Update for commit 09996a4

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
---
 doc/ja/lxc.container.conf.sgml.in | 36 +++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index 94304c7b8..20b6bcf14 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -445,6 +445,42 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
       </variablelist>
     </refsect2>
 
+    <refsect2>
+      <title><!-- Core Scheduling -->コアスケジューリング</title>
+      <para>
+        <!--
+        Core scheduling defines if the container payload
+        is marked as being schedulable on the same core. Doing so will cause
+        the kernel scheduler to ensure that tasks that are not in the same
+        group never run simultaneously on a core. This can serve as an extra
+        security measure to prevent the container payload from using
+        cross hyper thread attacks.
+        -->
+        コアスケジューリングは、コンテナのペイロードが同じコアでスケジュール可能であるとマークするかどうかを指定します。
+        これによりカーネルスケジューラーは、同じグループに属さないタスクが同一コア上で同時に実行されないようにします。
+        これは、コンテナペイロードがクロスハイパースレッド攻撃を受けることを防ぐための、追加のセキュリティ対策として機能させることができます。
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <option>lxc.sched.core</option>
+          </term>
+          <listitem>
+            <para>
+              <!--
+              The only allowed values are 0 and 1. Set this to 1 to create a
+              core scheduling domain for the container or 0 to not create one.
+              If not set explicitly no core scheduling domain will be created
+              for the container.
+                -->
+              0 または 1 のみ指定できます。1 を設定すると、コンテナに対するコアスケジューリングドメインを作成し、0 を設定すると作成しません。
+              明示的に指定していない場合は、コンテナに対するコアスケジューリングドメインは作成されません。
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
     <refsect2>
       <title>Proc</title>
       <para>

From 9fe946bcc629b64fd991ab2db6437919208a3571 Mon Sep 17 00:00:00 2001
From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Sat, 23 Oct 2021 15:26:26 +0900
Subject: [PATCH 4/4] doc: fix typo in English lxc.container.conf(5)

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
---
 doc/lxc.container.conf.sgml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index 095562704..e2c7868cf 100644
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -688,7 +688,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
               Specify the ipv4 address to assign to the virtualized interface.
               Several lines specify several ipv4 addresses. The address is in
               format x.y.z.t/m, eg. 192.168.1.123/24.
-              You can optionally specify the broadcast address after the IP adress,
+              You can optionally specify the broadcast address after the IP address,
               e.g. 192.168.1.123/24 255.255.255.255.
               Otherwise it is automatically calculated from the IP address.
             </para>