From cf7891ffbfa6eb8f2dfb03c211d279654c351d2c Mon Sep 17 00:00:00 2001
From: takagi <takagi@localhost>
Date: Thu, 3 May 2007 22:32:22 +0000
Subject: [PATCH] sync with en.

---
 .../language-function-config-load.xml                  |  6 +++++-
 .../language-function-foreach.xml                      |  8 ++++----
 .../language-function-if.xml                           |  8 ++++----
 .../language-modifiers/language-modifier-cat.xml       |  2 +-
 .../language-modifiers/language-modifier-wordwrap.xml  | 10 +++++-----
 docs/ja/designers/language-variables.xml               |  2 +-
 .../language-variables/language-variables-smarty.xml   |  2 +-
 7 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/docs/ja/designers/language-builtin-functions/language-function-config-load.xml b/docs/ja/designers/language-builtin-functions/language-function-config-load.xml
index 6970e1a5..bb942820 100644
--- a/docs/ja/designers/language-builtin-functions/language-function-config-load.xml
+++ b/docs/ja/designers/language-builtin-functions/language-function-config-load.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.12 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 1.13 Maintainer: takagi Status: ready -->
 <!-- CREDITS: mat-sh,daichi,joe -->
 <sect1 id="language.function.config.load">
  <title>{config_load}</title>
@@ -114,6 +114,10 @@ pageTitle = "Customer Info"
   <link linkend="config.files">設定ファイル</link>
   には、セクションも含まれます。<parameter>section</parameter>
   属性を指定する事で、そのセクション内の変数を読み込む事ができます。
+  セクションを指定したとしても、
+  グローバルな設定変数は常に読み込まれることに注意しましょう。
+  グローバル変数と同じ名前のセクション変数があった場合は、
+  セクション変数の内容が優先されます(グローバル変数の値を上書きします)。
  </para>
  <note>
   <para>
diff --git a/docs/ja/designers/language-builtin-functions/language-function-foreach.xml b/docs/ja/designers/language-builtin-functions/language-function-foreach.xml
index 03e0ba83..81a4a56d 100644
--- a/docs/ja/designers/language-builtin-functions/language-function-foreach.xml
+++ b/docs/ja/designers/language-builtin-functions/language-function-foreach.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.11 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 1.12 Maintainer: takagi Status: ready -->
 <!-- CREDITS: mat-sh,daichi,joe -->
 <sect1 id="language.function.foreach">
  <title>{foreach},{foreachelse}</title>
   <para>
-  <varname>{foreach}</varname> を使用して、
-   <emphasis role="bold">１つの連想配列</emphasis> をループします。
+  <varname>{foreach}</varname> を使用して、通常の数値添字配列と同じように
+   <emphasis role="bold">連想配列</emphasis> をループします。
    <link linkend="language.function.section"><varname>{section}</varname></link>
-  のように、<emphasis role="bold">データの配列</emphasis> をループすることはありません。
+  のように、<emphasis role="bold">数値添字の配列のみ</emphasis> をループさせるということはありません。
    <varname>{foreach}</varname> の構文は
    <link linkend="language.function.section"><varname>{section}</varname></link>
    よりずっと簡単ですが、その代わりに <emphasis role="bold">１つの配列</emphasis>
diff --git a/docs/ja/designers/language-builtin-functions/language-function-if.xml b/docs/ja/designers/language-builtin-functions/language-function-if.xml
index f0138dd3..68e7773d 100644
--- a/docs/ja/designers/language-builtin-functions/language-function-if.xml
+++ b/docs/ja/designers/language-builtin-functions/language-function-if.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.10 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 1.11 Maintainer: takagi Status: ready -->
 <!-- CREDITS: mat-sh,daichi,joe -->
 <sect1 id="language.function.if">
  <title>{if},{elseif},{else}</title>
@@ -17,9 +17,9 @@
  </para>
  <para>
   <link linkend="variable.security"><parameter>$security</parameter></link>
-  が有効な場合、配列 <link
+  が有効な場合は、 <link
   linkend="variable.security.settings"><parameter>$security_settings</parameter></link>
-  には <emphasis>IF_FUNCS</emphasis> 配列が入ります。
+  の配列 <emphasis>IF_FUNCS</emphasis> に含まれる PHP の関数のみが利用可能となります。
  </para>
  <para>
   以下は認識される条件演算子の一覧です。
@@ -230,7 +230,7 @@
    <title>{if} のその他の例</title>
 <programlisting>
  <![CDATA[
-{if isset($name) && $name = 'Blog'}
+{if isset($name) && $name == 'Blog'}
      {* 何かを行います *}
 {elseif $name == $foo}
     {* 何かを行います *}
diff --git a/docs/ja/designers/language-modifiers/language-modifier-cat.xml b/docs/ja/designers/language-modifiers/language-modifier-cat.xml
index cfb6962e..75982f92 100644
--- a/docs/ja/designers/language-modifiers/language-modifier-cat.xml
+++ b/docs/ja/designers/language-modifiers/language-modifier-cat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 1.5 Maintainer: takagi Status: ready -->
 <!-- CREDITS: mat-sh,daichi,joe -->
  <sect1 id="language.modifier.cat">
   <title>cat</title>
diff --git a/docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml b/docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml
index c7b6ef0f..3198b250 100644
--- a/docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml
+++ b/docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.6 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready -->
 <!-- CREDITS: mat-sh,daichi,joe -->
  <sect1 id="language.modifier.wordwrap">
   <title>wordwrap</title>
@@ -84,7 +84,7 @@ $smarty->assign('articleTitle',
 
 {$articleTitle|wordwrap:30:"<br />\n"}
 
-{$articleTitle|wordwrap:30:"\n":true}
+{$articleTitle|wordwrap:26:"\n":true}
 ]]>
    </programlisting>
    <para>
@@ -107,9 +107,9 @@ Blind woman gets new kidney<br />
 from dad she hasn't seen in<br />
 years.
 
-Blind woman gets new kidney
-from dad she hasn't seen in
-years.
+Blind woman gets new kidn
+ey from dad she hasn't se
+en in years.
 ]]>
    </screen>
   </example>
diff --git a/docs/ja/designers/language-variables.xml b/docs/ja/designers/language-variables.xml
index 3c3da3b3..ff1f6c7b 100644
--- a/docs/ja/designers/language-variables.xml
+++ b/docs/ja/designers/language-variables.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 1.9 Maintainer: takagi Status: ready -->
 <!-- CREDITS: mat-sh,daichi,joe -->
 <chapter id="language.variables">
  <title>変数</title>
diff --git a/docs/ja/designers/language-variables/language-variables-smarty.xml b/docs/ja/designers/language-variables/language-variables-smarty.xml
index 182e6d32..fa45861c 100644
--- a/docs/ja/designers/language-variables/language-variables-smarty.xml
+++ b/docs/ja/designers/language-variables/language-variables-smarty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.18 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 1.19 Maintainer: takagi Status: ready -->
 <!-- CREDITS: mat-sh,daichi,joe -->
 <sect1 id="language.variables.smarty">
  <title>予約変数 {$smarty}</title>