Ignore:
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/sparc
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • BOOK/bootable/sparc/fstab.xml

    r5c8e74d r350ab24  
    1313  <indexterm zone="ch-bootable-fstab">
    1414    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
     15    <secondary>bootable</secondary>
    1516  </indexterm>
    1617
    … …  
    4142  xpointer="xpointer(//*[@os='b'])"/>
    4243
    43   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44   href="../common/fstab.xml"
    45   xpointer="xpointer(//*[@os='c'])"/>
    46 
    4744</sect1>

  • BOOK/bootable/sparc/kernel.xml

    r5c8e74d r350ab24  
    9393    href="../x86/kernel.xml"
    9494    xpointer="xpointer(//*[@os='t'])"/>
    95    
     95
    9696    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9797    href="../x86/kernel.xml"
Note: See TracChangeset for help on using the changeset viewer.