From 9a44873bbf68bae82b9084930a69bd2f99213060 Mon Sep 17 00:00:00 2001
From: matsuand <matsuand@d6661c75-0afd-443a-aae1-cb31083e41e8>
Date: Thu, 19 Nov 2015 08:06:06 +0000
Subject: [PATCH] =?utf8?q?[LFS-SVN]=20SVN-20151118,=20Changeset=2010973=20?=
 =?utf8?q?=E5=AF=BE=E5=BF=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@1033 d6661c75-0afd-443a-aae1-cb31083e41e8
---
 lfsbook/configure                      |  2 +-
 lfsbook/src/appendices/dependencies.ch |  4 ++--
 lfsbook/src/chapter01/changelog.ch     | 34 ++++++++++++++++++++++++++++++++++
 lfsbook/src/chapter01/jchangelog.ch    | 15 +++++++++++++++
 lfsbook/src/chapter06/bison.ch         | 11 +++++++++++
 lfsbook/src/chapter06/flex.ch          | 21 ---------------------
 lfsbook/src/general.ch                 | 10 +++++-----
 lfsbook/version.ac                     |  2 +-
 8 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/lfsbook/configure b/lfsbook/configure
index 8545fd86..804335d2 100755
--- a/lfsbook/configure
+++ b/lfsbook/configure
@@ -3985,7 +3985,7 @@ if test "$TIDY" = no; then
  as_fn_error $? "tidy not found in $PATH" "$LINENO" 5
 fi;
 
-TARGETVER=svn-20151106
+TARGETVER=svn-20151118
 
 SVNVER=`grep 'ENTITY version' ${bookdir}/general.ent | sed -e 's/^<!ENTITY version         \"//' -e 's/\">$//' | tr 'A-Z' 'a-z'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the original XML version" >&5
diff --git a/lfsbook/src/appendices/dependencies.ch b/lfsbook/src/appendices/dependencies.ch
index 740977aa..6888216c 100644
--- a/lfsbook/src/appendices/dependencies.ch
+++ b/lfsbook/src/appendices/dependencies.ch
@@ -515,9 +515,9 @@
          Patch, Sed, Texinfo</seg>
 @z
 @x
-          <seg>Bison (suppressed) and Gawk</seg>
+          <seg>Bison and Gawk</seg>
 @y
-          <seg>Bison (suppressed), Gawk</seg>
+          <seg>Bison, Gawk</seg>
 @z
 @x
           <seg>IPRoute2, Kbd, and Man-DB</seg>
diff --git a/lfsbook/src/chapter01/changelog.ch b/lfsbook/src/chapter01/changelog.ch
index 78b929a9..674a9923 100644
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -48,6 +48,40 @@
 @z
 
 @x
+      <para>2015-11-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to flex-2.6.0. Fixes
+          <ulink url="&lfs-ticket-root;3860">#3860</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-db-2.7.5. Fixes
+          <ulink url="&lfs-ticket-root;3859">#3859</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kmod-22. Fixes
+          <ulink url="&lfs-ticket-root;3861">#3861</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2015-11-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - flex-2.6.0 へのアップデート。
+          <ulink url="&lfs-ticket-root;3860">#3860</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - man-db-2.7.5 へのアップデート。
+          <ulink url="&lfs-ticket-root;3859">#3859</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - kmod-22 へのアップデート。
+          <ulink url="&lfs-ticket-root;3861">#3861</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2015-11-06</para>
       <itemizedlist>
         <listitem>
diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index a7b05682..035df9b8 100644
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -54,6 +54,21 @@
 -->
 
     <listitem>
+      <para>2015-11-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          SVN-20151118,
+          Changeset
+          <ulink url="&lfs-rev-root;10972">10972</ulink>,
+          <ulink url="&lfs-rev-root;10973">10973</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2015-11-09</para>
       <itemizedlist>
         <listitem>
diff --git a/lfsbook/src/chapter06/bison.ch b/lfsbook/src/chapter06/bison.ch
index b8e280fb..4ff84c91 100644
--- a/lfsbook/src/chapter06/bison.ch
+++ b/lfsbook/src/chapter06/bison.ch
@@ -52,6 +52,17 @@
 @z
 
 @x
+    <para>There is a circular dependency between bison and flex with regard to
+    the checks.  If desired, after installing flex in the next section, the
+    bison checks can be run with <command>make check</command>.</para>
+@y
+    <para>
+    テストに関連しては bison と flex の間に循環的な依存があります。
+    テストが必要な場合は次節に示す flex をインストールした後に <command>make check</command> を実行します。
+    </para>
+@z
+
+@x
     <para>Install the package:</para>
 @y
     <para>&InstallThePackage;</para>
diff --git a/lfsbook/src/chapter06/flex.ch b/lfsbook/src/chapter06/flex.ch
index d693da40..d859c94c 100644
--- a/lfsbook/src/chapter06/flex.ch
+++ b/lfsbook/src/chapter06/flex.ch
@@ -29,14 +29,6 @@
 @z
 
 @x
-    <para>First, skip running three regression tests that require Bison:</para>
-@y
-    <para>
-    Bison を必要としている三つの縮退テストを実行しないようにします。
-    </para>
-@z
-
-@x
     <para>Prepare Flex for compilation:</para>
 @y
     <para>&PreparePackage1;Flex&PreparePackage2;</para>
@@ -63,19 +55,6 @@
 @z
 
 @x
-    <para>There are some packages that expect to find the
-    <filename class="libraryfile">lex</filename> library in <filename
-    class="directory">/usr/lib</filename>. Create a symlink to account for
-    this:</para>
-@y
-    <para>
-    パッケージの中には <filename class="libraryfile">lex</filename> ライブラリが <filename
-    class="directory">/usr/lib</filename> ディレクトリにあるものとして動作しているものがあります。
-    これに対応するためシンボリックリンクを作成します。
-    </para>
-@z
-
-@x
     <para>A few programs do not know about <command>flex</command> yet and
     try to run its predecessor, <command>lex</command>. To support those
     programs, create a symbolic link named <filename>lex</filename> that
diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index a67b5c1b..cf50812a 100644
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,17 +8,17 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20151106">
+<!ENTITY version         "SVN-20151118">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
                                       but not -rc releases -->
-<!ENTITY releasedate     "November 6, 2015">
+<!ENTITY releasedate     "November 18, 2015">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20151106">
+<!ENTITY version         "SVN-20151118">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
                                       but not -rc releases -->
-<!ENTITY releasedate     "2015年11月06日">
-<!ENTITY jversion        "20151109">
+<!ENTITY releasedate     "2015年11月18日">
+<!ENTITY jversion        "20151119">
 @z
 
 @x
diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index 02e96201..81c4741a 100644
--- a/lfsbook/version.ac
+++ b/lfsbook/version.ac
@@ -7,4 +7,4 @@ dnl  $Date::                           $
 dnl 
 dnl
 dnl m4-include this file to define the current LFS version
-m4_define([lfs_version], [svn-20151106])
+m4_define([lfs_version], [svn-20151118])
-- 
2.11.0