Changeset 350ab24 for BOOK/bootable

Timestamp:

Apr 28, 2014, 8:56:46 PM (12 years ago)

Author:

Chris Staub <chris@…>

Parents:

5c8e74d (diff), 31cfd067 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged latest systemd branch changes

Location:

BOOK/bootable

Files:

• alpha-chapter.xml (modified) (1 diff)
• alpha/fstab.xml (deleted)
• alpha/kernel.xml (modified) (1 diff)
• common/fstab.xml (modified) (2 diffs)
• mips/kernel.xml (modified) (1 diff)
• ppc/kernel.xml (modified) (2 diffs)
• ppc64/kernel.xml (modified) (1 diff)
• sparc/fstab.xml (modified) (2 diffs)
• sparc/kernel.xml (modified) (1 diff)
• x86_64/kernel.xml (modified) (1 diff)

BOOK/bootable/alpha-chapter.xml

@@ -13 +13 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/fstab.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot.xml"/>

BOOK/bootable/alpha/kernel.xml

@@ -98 +98 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='t'])"/>
-    
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86/kernel.xml"

BOOK/bootable/common/fstab.xml

@@ -13 +13 @@
   <indexterm zone="ch-bootable-fstab">
     <primary sortas="e-/etc/fstab">/etc/fstab</primary>
+    <secondary>bootable</secondary>
   </indexterm>
 
@@ -40 +41 @@
   fields in this file, see <command>man 5 fstab</command>.</para>
 
-  <para os="c">The <filename class="directory">/dev/shm</filename> mount point
-  for <systemitem class="filesystem">tmpfs</systemitem> is included to
-  allow enabling POSIX-shared memory. The kernel must have the required
-  support built into it for this to work (more about this is in the next
-  section). Please note that very little software currently uses
-  POSIX-shared memory.  Therefore, consider the <filename
-  class="directory">/dev/shm</filename> mount point optional. For more
-  information, see <filename>Documentation/filesystems/tmpfs.txt</filename>
-  in the kernel source tree.</para>
-
 </sect1>

BOOK/bootable/mips/kernel.xml

@@ -89 +89 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='t'])"/>
-    
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86/kernel.xml"

BOOK/bootable/ppc/kernel.xml

@@ -65 +65 @@
     mac-specific options for ide and input.</para>
     </warning>
-   
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86/kernel.xml"
@@ -101 +101 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='t'])"/>
-    
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86/kernel.xml"

BOOK/bootable/ppc64/kernel.xml

@@ -93 +93 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='t'])"/>
-    
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86/kernel.xml"

BOOK/bootable/sparc/fstab.xml

@@ -13 +13 @@
   <indexterm zone="ch-bootable-fstab">
     <primary sortas="e-/etc/fstab">/etc/fstab</primary>
+    <secondary>bootable</secondary>
   </indexterm>
 
@@ -41 +42 @@
   xpointer="xpointer(//*[@os='b'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
 </sect1>

BOOK/bootable/sparc/kernel.xml

@@ -93 +93 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='t'])"/>
-    
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86/kernel.xml"

BOOK/bootable/x86_64/kernel.xml

@@ -93 +93 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='t'])"/>
-    
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86/kernel.xml"