aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gronenwoud <alex@linuxfromscratch.org>2003-11-02 12:22:24 +0000
committerAlex Gronenwoud <alex@linuxfromscratch.org>2003-11-02 12:22:24 +0000
commit49f4dd549ab4535cf182b011b2d2803f349027a8 (patch)
treefcc053c7513d546c617db1a13c6a98d5f612d417
parent73aedd1d35747ff2fad4ddf514dca810721a612a (diff)
Correcting several merging oversights.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3053 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter06/glibc.xml2
-rw-r--r--chapter06/kernel.xml2
-rw-r--r--chapter06/shadowpwd.xml2
-rw-r--r--chapter06/sysklogd.xml2
-rw-r--r--chapter06/sysvinit.xml2
-rw-r--r--chapter06/vim.xml2
6 files changed, 6 insertions, 6 deletions
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 0ee7f3f5b..c7208a363 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -117,6 +117,6 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
<screen><userinput>make -C ../&glibc-dir;/linuxthreads/man install</userinput></screen>
</sect2>
-
+&c6-cf-glibc;
</sect1>
diff --git a/chapter06/kernel.xml b/chapter06/kernel.xml
index f154f00c5..b03c7adc7 100644
--- a/chapter06/kernel.xml
+++ b/chapter06/kernel.xml
@@ -68,6 +68,6 @@ failures. Create an empty <filename>autoconf.h</filename> file:</para>
<screen><userinput>touch /usr/include/linux/autoconf.h</userinput></screen>
</sect2>
-
+&c6-kernel-exp-headers;
</sect1>
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml
index d61415e08..271f8c8f5 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadowpwd.xml
@@ -112,6 +112,6 @@ installed by Shadow:</para>
<screen><userinput>rm /bin/groups</userinput></screen>
</sect2>
-
+&c6-cf-shadowpwd;
</sect1>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index c5fee1038..2d8dd4aa9 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -22,6 +22,6 @@ Estimated required disk space: &sysklogd-compsize;</screen>
<screen><userinput>make install</userinput></screen>
</sect2>
-
+&c6-cf-sysklogd;
</sect1>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 934e5cfd5..2f771b460 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -36,6 +36,6 @@ sed 's/Sending processes/Sending processes started by init/g' \
<screen><userinput>make -C src install</userinput></screen>
</sect2>
-
+&c6-cf-sysvinit;
</sect1>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 3c830af75..e0efd0ebd 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -53,6 +53,6 @@ other libraries to be installed. For more information read the Vim
documentation.</para>
</sect2>
-
+&c6-cf-vim;
</sect1>