[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1210-gdc74128

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  dc74128530402b487734b219795760d98cc7c05e (commit)
       via  586e0d4cc21afc1925a801c8dfd70b749628faec (commit)
      from  4f48ef018e4ad87838ffb1af6d02b3319b40a412 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc74128530402b487734b219795760d98cc7c05e
Author: Chris Staub <chris at beaker67.com>
Date:   Tue Jun 3 06:45:36 2014 -0400

    Added command explanation to final-system vim

diff --git a/BOOK/final-system/common/vim.xml b/BOOK/final-system/common/vim.xml
index 07dd33c..b967891 100644
--- a/BOOK/final-system/common/vim.xml
+++ b/BOOK/final-system/common/vim.xml
@@ -65,16 +65,31 @@
 
 <screen os="k"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
 
-    <para os="l">Many users are accustomed to using <command>vi</command>
+    <variablelist os="l">
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>HELPSUBLOC=/usr/share/doc/vim-&vim-version;</parameter></term>
+        <listitem>
+          <para>Tells Vim to install its documentation into
+          <filename class="directory">/usr/share/doc/vim-&vim-version;</filename>
+          instead of 
+          <filename class="directory">/usr/share/vim/vim&vim-version2;/doc</filename>.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para os="m">Many users are accustomed to using <command>vi</command>
     instead of <command>vim</command>. Some programs, such as
     <command>vigr</command> and <command>vipw</command>, also use
     <command>vi</command>. Create a symlink to permit execution of
     <command>vim</command> when users habitually enter <command>vi</command>
     and allow programs that use <command>vi</command> to work:</para>
 
-<screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
+<screen os="n"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
 
-    <para os="n">If an X Window System is going to be installed on the CLFS
+    <para os="o">If an X Window System is going to be installed on the CLFS
     system, you may want to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
     additional libraries to be installed. For more information, refer to the
diff --git a/BOOK/final-system/multilib/vim.xml b/BOOK/final-system/multilib/vim.xml
index 7739f74..c9824a1 100644
--- a/BOOK/final-system/multilib/vim.xml
+++ b/BOOK/final-system/multilib/vim.xml
@@ -89,6 +89,10 @@
     href="../common/vim.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

commit 586e0d4cc21afc1925a801c8dfd70b749628faec
Author: Chris Staub <chris at beaker67.com>
Date:   Tue Jun 3 06:23:12 2014 -0400

    Added command explanation for libcap

diff --git a/BOOK/final-system/common/libcap.xml b/BOOK/final-system/common/libcap.xml
index 12a685c..c1b5e4d 100644
--- a/BOOK/final-system/common/libcap.xml
+++ b/BOOK/final-system/common/libcap.xml
@@ -39,6 +39,20 @@ ln -sfv ../../lib/$(readlink /lib/libcap.so) /usr/lib/libcap.so
 rm -v /lib/libcap.so
 mv -v /lib/libcap.a /usr/lib</userinput></screen>
 
+    <variablelist os="f">
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>RAISE_SETFCAP=no</parameter></term>
+        <listitem>
+          <para>This prevents <command>setcap</command> from being run on
+          itself, which will fail if the kernel or file system does not
+          support extended capabilities.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
   </sect2>
 
   <sect2 id="contents-libcap" role="content">
diff --git a/BOOK/final-system/multilib/libcap.xml b/BOOK/final-system/multilib/libcap.xml
index aec65bb..e11a48f 100644
--- a/BOOK/final-system/multilib/libcap.xml
+++ b/BOOK/final-system/multilib/libcap.xml
@@ -42,6 +42,10 @@ ln -sfv ../../lib/$(readlink /lib/libcap.so) /usr/lib/libcap.so
 rm -v /lib/libcap.so
 mv -v /lib/libcap.a /usr/lib</userinput></screen>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
   </sect2>
 
   <sect2 role="content">

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/libcap.xml   |   14 ++++++++++++++
 BOOK/final-system/common/vim.xml      |   21 ++++++++++++++++++---
 BOOK/final-system/multilib/libcap.xml |    4 ++++
 BOOK/final-system/multilib/vim.xml    |    4 ++++
 4 files changed, 40 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book