[LFS-SVN] SVN-20140924, Changeset 10763 対応。

git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@921 d6661c75-0afd-443a-aae1-cb31083e41e8

diff --git a/lfsbook/configure b/lfsbook/configure
index ef01777..8a40930 100755 (executable)
--- a/lfsbook/configure
+++ b/lfsbook/configure
@@ -3879,7 +3879,7 @@ if test "$TIDY" = no; then
  as_fn_error $? "tidy not found in $PATH" "$LINENO" 5
 fi;
 
-TARGETVER=svn-20140923
+TARGETVER=svn-20140924
 
 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/chapter01/askforhelp.ch b/lfsbook/src/chapter01/askforhelp.ch
index 118024d..c3ea073 100644 (file)
--- a/lfsbook/src/chapter01/askforhelp.ch
+++ b/lfsbook/src/chapter01/askforhelp.ch
@@ -95,9 +95,9 @@
 @z
 
 @x
-        <para>The output from the <xref linkend='version-check'/></para>
+        <para>The output from the <xref linkend='version-check'/> script</para>
 @y
-        <para><xref linkend='version-check'/> の出力結果。</para>
+        <para><xref linkend='version-check'/> ã\81«ã\81\8aã\81\91ã\82\8bã\82¹ã\82¯ã\83ªã\83\97ã\83\88ã\81®å\87ºå\8a\9bçµ\90æ\9e\9cã\80\82</para>
 @z
 
 @x

diff --git a/lfsbook/src/chapter01/changelog.ch b/lfsbook/src/chapter01/changelog.ch
index 50fdeee..baefa0c 100644 (file)
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -48,6 +48,72 @@
 @z
 
 @x
+      <para>2014-09-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to perl-5.20.1. Fixes 
+          <ulink url="&lfs-ticket-root;3670">#3670</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xz-5.0.7. Fixes 
+          <ulink url="&lfs-ticket-root;3671">#3671</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.16.3. Fixes 
+          <ulink url="&lfs-ticket-root;3673">#3673</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.73. Fixes 
+          <ulink url="&lfs-ticket-root;3674">#3674</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to   libpipeline-1.3.1. Fixes 
+          <ulink url="&lfs-ticket-root;3675">#3675</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-db-2.7.0.1. Fixes 
+          <ulink url="&lfs-ticket-root;3676">#3676</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to procps-ng-3.3.10. Fixes 
+          <ulink url="&lfs-ticket-root;3677">#3677</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2014-09-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - perl-5.20.1 へのアップデート。
+          <ulink url="&lfs-ticket-root;3670">#3670</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - xz-5.0.7 へのアップデート。
+          <ulink url="&lfs-ticket-root;3671">#3671</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - linux-3.16.3 へのアップデート。
+          <ulink url="&lfs-ticket-root;3673">#3673</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - man-pages-3.73 へのアップデート。
+          <ulink url="&lfs-ticket-root;3674">#3674</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - libpipeline-1.3.1 へのアップデート。
+          <ulink url="&lfs-ticket-root;3675">#3675</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - man-db-2.7.0.1 へのアップデート。
+          <ulink url="&lfs-ticket-root;3676">#3676</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - procps-ng-3.3.10 へのアップデート。
+          <ulink url="&lfs-ticket-root;3677">#3677</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2014-09-23</para>
       <itemizedlist>
         <listitem>

diff --git a/lfsbook/src/chapter01/how.ch b/lfsbook/src/chapter01/how.ch
index ad32959..72f9d85 100644 (file)
--- a/lfsbook/src/chapter01/how.ch
+++ b/lfsbook/src/chapter01/how.ch
@@ -146,7 +146,7 @@
   a virtual environment and start a new shell whose root directory will be
   set to the LFS partition. This is very similar to rebooting and instructing
   the kernel to mount the LFS partition as the root partition. The system
-  does not actually reboot, but instead <command>chroot</command>'s because
+  does not actually reboot, but instead uses <command>chroot</command> because
   creating a bootable system requires additional work which is not necessary
   just yet. The major advantage is that <quote>chrooting</quote> allows you
   to continue using the host system while LFS is being built. While waiting

diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index 8a4d6f6..650d873 100644 (file)
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -54,6 +54,20 @@
 -->
 
     <listitem>
+      <para>2014-09-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          Changeset
+          <ulink url="&lfs-rev-root;10759">10759</ulink> ～
+          <ulink url="&lfs-rev-root;10763">10763</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-09-23</para>
       <itemizedlist>
         <listitem>

diff --git a/lfsbook/src/chapter06/man-db.ch b/lfsbook/src/chapter06/man-db.ch
index 67ec877..ccb7957 100644 (file)
--- a/lfsbook/src/chapter06/man-db.ch
+++ b/lfsbook/src/chapter06/man-db.ch
@@ -29,6 +29,14 @@
 @z
 
 @x
+    <para>Disable two tests that fail:</para>
+@y
+    <para>
+    テストの中で失敗するものを無効化します。
+    </para>
+@z
+
+@x
     <para>Prepare Man-DB for compilation:</para>
 @y
     <para>&PreparePackage1;Man-DB&PreparePackage2;</para>

diff --git a/lfsbook/src/chapter06/procps.ch b/lfsbook/src/chapter06/procps.ch
index a88a60e..b8d1a34 100644 (file)
--- a/lfsbook/src/chapter06/procps.ch
+++ b/lfsbook/src/chapter06/procps.ch
@@ -91,19 +91,23 @@
 @x
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed library</segtitle>
+      <segtitle>Installed directory</segtitle>
 @y
       <segtitle>&InstalledProgram;</segtitle>
       <segtitle>&InstalledLibrary;</segtitle>
+      <segtitle>&InstalledDirectory;</segtitle>
 @z
 
 @x
         <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop,
         sysctl, tload, top, uptime, vmstat, w, and, watch</seg>
         <seg>libprocps.so</seg>
+        <seg>/usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
 @y
         <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop,
         sysctl, tload, top, uptime, vmstat, w, watch</seg>
         <seg>libprocps.so</seg>
+        <seg>/usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
 @z
 
 @x

diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index ac8ed7c..a71e4d4 100644 (file)
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,15 +8,15 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20140923">
+<!ENTITY version         "SVN-20140924">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "September 23, 2014">
+<!ENTITY releasedate     "September 24, 2014">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20140923">
+<!ENTITY version         "SVN-20140924">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "2014年9月23日">
-<!ENTITY jversion        "20140923">
+<!ENTITY releasedate     "2014年9月24日">
+<!ENTITY jversion        "20140925">
 @z
 
 @x

diff --git a/lfsbook/src/prologue/hostreqs.ch b/lfsbook/src/prologue/hostreqs.ch
index f9a2fcb..68dc4b0 100644 (file)
--- a/lfsbook/src/prologue/hostreqs.ch
+++ b/lfsbook/src/prologue/hostreqs.ch
@@ -182,6 +182,12 @@
 @z
 
 @x
+  <sect2 id="version-check" xreflabel="Section vii, Host System Requirements">
+@y
+  <sect2 id="version-check" xreflabel="vii 節、ホストシステム要件">
+@z
+
+@x
   <para >To see whether your host system has all the appropriate versions, and
   the ability to compile programs, run the following:</para>
 @y

diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index 27775dc..13854df 100644 (file)
--- 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-20140923])
+m4_define([lfs_version], [svn-20140924])