file name syntax changes: recipe.$topic to recipes.$topic,

aggregated or just changed.

14 files changed, 87 insertions, 102 deletions

diff --git a/fml/doc/en/tutorial/delivery/chapter.sgml b/fml/doc/en/tutorial/delivery/chapter.sgml
index 5f12be26..d0959ccb 100644
--- a/fml/doc/en/tutorial/delivery/chapter.sgml
+++ b/fml/doc/en/tutorial/delivery/chapter.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML: chapter.sgml,v 1.2 2005/07/20 10:39:17 fukachan Exp $
+   $FML: chapter.sgml,v 1.3 2005/09/25 04:27:17 fukachan Exp $
    $jaFML: chapter.sgml,v 1.12 2003/04/15 14:51:37 fukachan Exp $
 -->
 
@@ -128,7 +128,7 @@ FML::Mailer should be merged into FML::Process::QueueManager class?
 
 <qandaset>
 
-&recipe.delivery.forward;
+&recipes.delivery;
 
 </qandaset>
 
diff --git a/fml/doc/en/tutorial/delivery/recipe.forward.sgml b/fml/doc/en/tutorial/delivery/recipes.forward.sgml
index ca089d13..e2d13e3f 100644
--- a/fml/doc/en/tutorial/delivery/recipe.forward.sgml
+++ b/fml/doc/en/tutorial/delivery/recipes.forward.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML: recipe.forward.sgml,v 1.1 2003/07/28 10:41:29 fukachan Exp $
+   $FML: recipe.forward.sgml,v 1.2 2005/09/25 04:27:17 fukachan Exp $
    $jaFML: recipe.forward.sgml,v 1.2 2003/04/15 14:51:38 fukachan Exp $
 -->
 
diff --git a/fml/doc/en/tutorial/include/chapters.ent b/fml/doc/en/tutorial/include/chapters.ent
index 775c8c7c..1a39c8bf 100644
--- a/fml/doc/en/tutorial/include/chapters.ent
+++ b/fml/doc/en/tutorial/include/chapters.ent
@@ -1,5 +1,5 @@
 <!--
-   $FML: chapters.ent,v 1.10 2006/01/16 10:24:27 fukachan Exp $
+   $FML: chapters.ent,v 1.11 2006/01/16 12:02:07 fukachan Exp $
    $jaFML: chapters.ent,v 1.75 2003/06/20 22:03:12 fukachan Exp $
 -->
 
@@ -143,8 +143,7 @@
 <!entity chapter.digest              SYSTEM "digest/chapter.sgml">
 <!entity sect.digest.recipes         SYSTEM "digest/recipes.sgml">
 
-
-<!entity recipe.delivery.forward     SYSTEM "delivery/recipe.forward.sgml">
+<!entity recipes.delivery            SYSTEM "delivery/recipes.forward.sgml">
 
 
 <!-- internals -->
@@ -221,9 +220,8 @@
 <!entity troubleshoot.recipes.message SYSTEM "troubleshoot/recipes.message.sgml">
 
 
-<!entity recipe.version               SYSTEM "troubleshoot/recipe.version.sgml">
-<!entity recipe.listup.addresses      SYSTEM "troubleshoot/recipe.listup.addresses.sgml">
-<!entity recipe.listup.aliases        SYSTEM "troubleshoot/recipe.listup.aliases.sgml">
+<!entity troubleshoot.version.recipes SYSTEM "troubleshoot/recipes.version.sgml">
+<!entity troubleshoot.address.recipes SYSTEM "troubleshoot/recipes.address.sgml">
 
 <!entity sect.troubleshoot.filesystem SYSTEM "troubleshoot/filesystem.sgml">
 <!entity sect.troubleshoot.delivery   SYSTEM "troubleshoot/delivery.sgml">
diff --git a/fml/doc/en/tutorial/troubleshoot/chapter.sgml b/fml/doc/en/tutorial/troubleshoot/chapter.sgml
index f916f409..f388e64c 100644
--- a/fml/doc/en/tutorial/troubleshoot/chapter.sgml
+++ b/fml/doc/en/tutorial/troubleshoot/chapter.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML: chapter.sgml,v 1.4 2005/09/18 13:55:56 fukachan Exp $
+   $FML: chapter.sgml,v 1.5 2006/01/15 15:32:03 fukachan Exp $
    $jaFML: chapter.sgml,v 1.3 2002/11/09 14:16:19 fukachan Exp $
 -->
 
@@ -12,9 +12,8 @@
 
 <qandaset>
 
-&recipe.version;
-&recipe.listup.addresses;
-&recipe.listup.aliases;
+&troubleshoot.version.recipes;
+&troubleshoot.address.recipes;
 
 </qandaset>
 
diff --git a/fml/doc/en/tutorial/troubleshoot/recipe.listup.aliases.sgml b/fml/doc/en/tutorial/troubleshoot/recipe.listup.aliases.sgml
deleted file mode 100644
index ea810789..00000000
--- a/fml/doc/en/tutorial/troubleshoot/recipe.listup.aliases.sgml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-   $FML: recipe.listup.aliases.sgml,v 1.2 2003/08/03 01:47:18 fukachan Exp $
-   $jaFML: recipe.listup.aliases.sgml,v 1.1 2002/11/09 14:16:19 fukachan Exp $
--->
-
-<qandaentry>
-<question>
-<para>
-List up defined aliases on this host
-</para>
-</question>
-
-<answer>
-
-<para>
-Run "fmlalias". It shows all addresses defined in aliases files.
-<screen>
-% fmlalias
-</screen>
-</para>
-
-<para>
-<warning>
-<para>
-The difference between "fmladdr" and "fmlalias" is whether
-it contains users defined at /etc/passwd or not.
-"fmladdr" contains it but fmlalias not.
-"fmlalias" lists up only users defined at aliases.
-</para>
-</warning>
-</para>
-
-</answer>
-</qandaentry>
diff --git a/fml/doc/en/tutorial/troubleshoot/recipe.listup.addresses.sgml b/fml/doc/en/tutorial/troubleshoot/recipes.address.sgml
index 61b1db6c..852115b4 100644
--- a/fml/doc/en/tutorial/troubleshoot/recipe.listup.addresses.sgml
+++ b/fml/doc/en/tutorial/troubleshoot/recipes.address.sgml
@@ -1,6 +1,5 @@
 <!--
-   $FML: recipe.listup.addresses.sgml,v 1.2 2003/08/03 01:47:18 fukachan Exp $
-   $jaFML: recipe.listup.addresses.sgml,v 1.2 2003/04/15 14:51:45 fukachan Exp $
+ $FML$
 -->
 
 <qandaentry>
@@ -33,3 +32,34 @@ it contains users defined at /etc/passwd or not.
 
 </answer>
 </qandaentry>
+
+
+<qandaentry>
+<question>
+<para>
+List up defined aliases on this host
+</para>
+</question>
+
+<answer>
+
+<para>
+Run "fmlalias". It shows all addresses defined in aliases files.
+<screen>
+% fmlalias
+</screen>
+</para>
+
+<para>
+<warning>
+<para>
+The difference between "fmladdr" and "fmlalias" is whether
+it contains users defined at /etc/passwd or not.
+"fmladdr" contains it but fmlalias not.
+"fmlalias" lists up only users defined at aliases.
+</para>
+</warning>
+</para>
+
+</answer>
+</qandaentry>
diff --git a/fml/doc/en/tutorial/troubleshoot/recipe.version.sgml b/fml/doc/en/tutorial/troubleshoot/recipes.version.sgml
index 92d867f2..e64bd457 100644
--- a/fml/doc/en/tutorial/troubleshoot/recipe.version.sgml
+++ b/fml/doc/en/tutorial/troubleshoot/recipes.version.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML: recipe.version.sgml,v 1.2 2003/08/03 01:47:18 fukachan Exp $
+   $FML: recipe.version.sgml,v 1.3 2005/09/18 13:55:56 fukachan Exp $
    $jaFML: recipe.version.sgml,v 1.4 2003/04/15 14:51:45 fukachan Exp $
 -->
 
diff --git a/fml/doc/ja/tutorial/delivery/chapter.sgml b/fml/doc/ja/tutorial/delivery/chapter.sgml
index 0c13490d..d9553482 100644
--- a/fml/doc/ja/tutorial/delivery/chapter.sgml
+++ b/fml/doc/ja/tutorial/delivery/chapter.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML: chapter.sgml,v 1.14 2005/06/25 15:11:30 fukachan Exp $
+   $FML: chapter.sgml,v 1.15 2005/11/19 03:45:06 fukachan Exp $
 -->
 
 
@@ -140,7 +140,7 @@ FML::Process::QueueManager に合併するべきかもしれない。
 <!-- TABLE_OF_RECIPES -->
 <qandaset>
 
-&recipe.delivery.forward;
+&recipes.delivery;
 
 </qandaset>
 
diff --git a/fml/doc/ja/tutorial/delivery/recipe.forward.sgml b/fml/doc/ja/tutorial/delivery/recipes.forward.sgml
index bb8a35a2..84c9e8c5 100644
--- a/fml/doc/ja/tutorial/delivery/recipe.forward.sgml
+++ b/fml/doc/ja/tutorial/delivery/recipes.forward.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML: recipe.forward.sgml,v 1.2 2003/04/15 14:51:38 fukachan Exp $
+   $FML: recipe.forward.sgml,v 1.3 2004/10/06 09:07:35 fukachan Exp $
 -->
 
 
diff --git a/fml/doc/ja/tutorial/include/chapters.ent b/fml/doc/ja/tutorial/include/chapters.ent
index 60924221..cc2b709b 100644
--- a/fml/doc/ja/tutorial/include/chapters.ent
+++ b/fml/doc/ja/tutorial/include/chapters.ent
@@ -1,5 +1,5 @@
 <!--
-	$FML: chapters.ent,v 1.107 2006/01/16 10:24:27 fukachan Exp $
+	$FML: chapters.ent,v 1.108 2006/01/16 12:02:07 fukachan Exp $
 -->
 
 <!entity versin "1.1">
@@ -148,8 +148,7 @@
 <!entity chapter.digest              SYSTEM "digest/chapter.sgml">
 <!entity sect.digest.recipes         SYSTEM "digest/recipes.sgml">
 
-
-<!entity recipe.delivery.forward     SYSTEM "delivery/recipe.forward.sgml">
+<!entity recipes.delivery            SYSTEM "delivery/recipes.forward.sgml">
 
 
 <!-- 内部構造 -->
@@ -226,9 +225,8 @@
 <!entity troubleshoot.recipes.message SYSTEM "troubleshoot/recipes.message.sgml">
 
 
-<!entity recipe.version               SYSTEM "troubleshoot/recipe.version.sgml">
-<!entity recipe.listup.addresses      SYSTEM "troubleshoot/recipe.listup.addresses.sgml">
-<!entity recipe.listup.aliases        SYSTEM "troubleshoot/recipe.listup.aliases.sgml">
+<!entity troubleshoot.version.recipes SYSTEM "troubleshoot/recipes.version.sgml">
+<!entity troubleshoot.address.recipes SYSTEM "troubleshoot/recipes.address.sgml">
 
 <!entity sect.troubleshoot.filesystem SYSTEM "troubleshoot/filesystem.sgml">
 <!entity sect.troubleshoot.delivery   SYSTEM "troubleshoot/delivery.sgml">
diff --git a/fml/doc/ja/tutorial/troubleshoot/chapter.sgml b/fml/doc/ja/tutorial/troubleshoot/chapter.sgml
index cd8de29b..b6f9be3b 100644
--- a/fml/doc/ja/tutorial/troubleshoot/chapter.sgml
+++ b/fml/doc/ja/tutorial/troubleshoot/chapter.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML: chapter.sgml,v 1.7 2006/01/15 15:32:03 fukachan Exp $
+   $FML: chapter.sgml,v 1.8 2006/01/16 10:24:27 fukachan Exp $
 -->
 
 
@@ -17,9 +17,8 @@
 <!-- 基礎的なツール -->
 <qandaset>
 
-&recipe.version;
-&recipe.listup.addresses;
-&recipe.listup.aliases;
+&troubleshoot.version.recipes;
+&troubleshoot.address.recipes;
 &troubleshoot.recipes;
 &troubleshoot.recipes.message;
 
diff --git a/fml/doc/ja/tutorial/troubleshoot/recipe.listup.aliases.sgml b/fml/doc/ja/tutorial/troubleshoot/recipe.listup.aliases.sgml
deleted file mode 100644
index 1b5e6c56..00000000
--- a/fml/doc/ja/tutorial/troubleshoot/recipe.listup.aliases.sgml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-   $FML: recipe.listup.aliases.sgml,v 1.1 2002/11/09 14:16:19 fukachan Exp $
--->
-
-
-<qandaentry>
-<question>
-<para>
-定義されている alias 一覧を見たい。
-</para>
-</question>
-
-<answer>
-
-<para>
-fmlalias が aliases ファイル(群)に設定されている全アドレスを表示してく
-れます。
-<screen>
-% fmlalias
-</screen>
-</para>
-
-<para>
-<warning>
-<para>
-fmladdr と fmlalias の違いは、一覧に
-ユーザ( /etc/passwd で定義されているもの )を含むか否か？という点です。
-fmladdr は含みます、fmlalias は含みません。 
-fmlalias は純粋に alias 群を表示します。
-</para>
-</warning>
-</para>
-
-</answer>
-</qandaentry>
diff --git a/fml/doc/ja/tutorial/troubleshoot/recipe.listup.addresses.sgml b/fml/doc/ja/tutorial/troubleshoot/recipes.address.sgml
index d3252913..4ce92d1a 100644
--- a/fml/doc/ja/tutorial/troubleshoot/recipe.listup.addresses.sgml
+++ b/fml/doc/ja/tutorial/troubleshoot/recipes.address.sgml
@@ -1,8 +1,7 @@
 <!--
-   $FML: recipe.listup.addresses.sgml,v 1.2 2003/04/15 14:51:45 fukachan Exp $
+ $FML$
 -->
 
-
 <qandaentry>
 <question>
 <para>
@@ -33,3 +32,35 @@ fmlalias は純粋に alias 群を表示します。
 
 </answer>
 </qandaentry>
+
+
+<qandaentry>
+<question>
+<para>
+定義されている alias 一覧を見たい。
+</para>
+</question>
+
+<answer>
+
+<para>
+fmlalias が aliases ファイル(群)に設定されている全アドレスを表示してく
+れます。
+<screen>
+% fmlalias
+</screen>
+</para>
+
+<para>
+<warning>
+<para>
+fmladdr と fmlalias の違いは、一覧に
+ユーザ( /etc/passwd で定義されているもの )を含むか否か？という点です。
+fmladdr は含みます、fmlalias は含みません。 
+fmlalias は純粋に alias 群を表示します。
+</para>
+</warning>
+</para>
+
+</answer>
+</qandaentry>
diff --git a/fml/doc/ja/tutorial/troubleshoot/recipe.version.sgml b/fml/doc/ja/tutorial/troubleshoot/recipes.version.sgml
index accd134d..ce4f5313 100644
--- a/fml/doc/ja/tutorial/troubleshoot/recipe.version.sgml
+++ b/fml/doc/ja/tutorial/troubleshoot/recipes.version.sgml
@@ -1,8 +1,7 @@
 <!--
-   $FML: recipe.version.sgml,v 1.4 2003/04/15 14:51:45 fukachan Exp $
+   $FML: recipe.version.sgml,v 1.5 2004/10/06 09:07:43 fukachan Exp $
 -->
 
-
 <qandaentry>
 <question>
 <para>