From cbde784735e0956fa37bf219f4718a3e12d63614 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Mon, 9 Feb 2015 18:03:25 +0000
Subject: [PATCH] Merged trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10841 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml    | 19 +++++++++++++++++++
 chapter06/acl.xml          |  4 ++--
 chapter06/attr.xml         |  4 ++--
 chapter06/bison.xml        |  2 +-
 chapter06/creatingdirs.xml |  2 +-
 chapter06/libcap.xml       |  2 +-
 6 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fb79877b5..ea4c1ae26 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,25 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2015-02-09</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added --docdir switch to Chapter 6 Bison to
+          put docs in versioned directory.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-02-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Updated FHS URL to new location.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2015-02-06</para>
       <itemizedlist>
diff --git a/chapter06/acl.xml b/chapter06/acl.xml
index 875aff701..d725c69bb 100644
--- a/chapter06/acl.xml
+++ b/chapter06/acl.xml
@@ -97,7 +97,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so</userinput><
       <seglistitem>
         <seg>chacl, getfacl, and setacl</seg>
         <seg>libacl.{a,so}</seg>
-        <seg>/usr/include/acl, /usr/share/doc/acl-&acl-version;</seg>
+        <seg>/usr/include/acl and /usr/share/doc/acl-&acl-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -140,7 +140,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so</userinput><
       <varlistentry id="libacl">
         <term><filename class="libraryfile">libacl</filename></term>
         <listitem>
-          <para>Contains the <application>Acl</application> API functions</para>
+          <para>Contains the  library functions for manipulating Access Control Lists</para>
           <indexterm zone="ch-system-acl libacl">
             <primary sortas="c-libacl">libacl</primary>
           </indexterm>
diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index cef60100d..1822ade4e 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -92,7 +92,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput
       <seglistitem>
         <seg>attr, getfattr, and setattr</seg>
         <seg>libattr.{a,so}</seg>
-        <seg>/usr/include/attr, /usr/share/doc/attr-&attr-version;</seg>
+        <seg>/usr/include/attr and /usr/share/doc/attr-&attr-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -134,7 +134,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput
       <varlistentry id="libattr">
         <term><filename class="libraryfile">libattr</filename></term>
         <listitem>
-          <para>Contains the <application>Attr</application> API functions</para>
+          <para>Contains the libbrary functions for manipulating extended attributes</para>
           <indexterm zone="ch-system-attr libattr">
             <primary sortas="c-libattr">libattr</primary>
           </indexterm>
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index b565cf766..af13eef5d 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -42,7 +42,7 @@
 
     <para>Prepare Bison for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/bison-&bison-version;</userinput></screen>
 <!--
     <para>The configure system causes Bison to be built without support for
     internationalization of error messages if a <command>bison</command>
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index 5572a62cc..09ad4fd65 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -53,7 +53,7 @@ mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput></screen>
     <title>FHS Compliance Note</title>
 
     <para>The directory tree is based on the Filesystem Hierarchy Standard (FHS)
-    (available at <ulink url="http://www.pathname.com/fhs/"/>).
+    (available at <ulink url="https://wiki.linuxfoundation.org/en/FHS"/>).
     The FHS also stipulates the existence of <filename
     class="directory">/usr/local/games</filename> and <filename
     class="directory">/usr/share/games</filename>. The FHS is not precise as to
diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml
index ca0e3e805..e15dd9c20 100644
--- a/chapter06/libcap.xml
+++ b/chapter06/libcap.xml
@@ -129,7 +129,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so</userinput><
       <varlistentry id="libcap">
         <term><filename class="libraryfile">libcap</filename></term>
         <listitem>
-          <para>Contains the libcap API functions</para>
+          <para>Contains the library functions for manipulating capabilities</para>
           <indexterm zone="ch-system-libcap libcap">
             <primary sortas="c-libcap">libcap</primary>
           </indexterm>