mirror of
https://git.linuxfromscratch.org/lfs.git
synced 2025-01-31 11:21:59 +00:00
Sort out some merge problems.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1/BOOK@6298 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
parent
8f1042af10
commit
fd96303fd3
@ -97,6 +97,8 @@ chapters 1 - 5 (matt).</para></listitem>
|
|||||||
the preface section of the book.</para></listitem>
|
the preface section of the book.</para></listitem>
|
||||||
|
|
||||||
<listitem><para>June 28th, 2005 [archaic]: Switched from mounting /dev on a
|
<listitem><para>June 28th, 2005 [archaic]: Switched from mounting /dev on a
|
||||||
|
ramfs to a tmpfs.</para></listitem>
|
||||||
|
|
||||||
<listitem><para>June 27th, 2005 [matthew]: Removed mention of test suite
|
<listitem><para>June 27th, 2005 [matthew]: Removed mention of test suite
|
||||||
problems from chapter 1 as more comprehensive information is given in
|
problems from chapter 1 as more comprehensive information is given in
|
||||||
chapter 5 (archaic).</para></listitem>
|
chapter 5 (archaic).</para></listitem>
|
||||||
@ -105,9 +107,6 @@ chapter 5 (archaic).</para></listitem>
|
|||||||
atime failure case, and removed the description of the shm test failure as we
|
atime failure case, and removed the description of the shm test failure as we
|
||||||
already mount a tmpfs (archaic).</para></listitem>
|
already mount a tmpfs (archaic).</para></listitem>
|
||||||
|
|
||||||
<listitem><para>June 27th, 2005 [archaic]: Switched from mounting /dev on a
|
|
||||||
ramfs to a tmpfs.</para></listitem>
|
|
||||||
|
|
||||||
<listitem><para>June 27th, 2005 [archaic]: Filled in text for errata page.
|
<listitem><para>June 27th, 2005 [archaic]: Filled in text for errata page.
|
||||||
Thanks for the text, Steve!</para></listitem>
|
Thanks for the text, Steve!</para></listitem>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user