Ignore:
Timestamp:
05/17/14 08:41:51 (10 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
3205da5
Parents:
b4badbd (diff), 156c0fe (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:

Fix conflicts with merge.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/bootable/x86/kernel.xml

    rb4badbd r1ab9a96  
    4242
    4343    <para>Be sure to enable or disable following features or the system might
    44     not work correctly or boot at all.<!-- Refer to
    45     <filename>/usr/share/doc/systemd-&systemd-version;/README</filename> -->:</para>
     44    not work correctly or boot at all:</para>
    4645
    4746    <screen role="nodump">Device Drivers  ---&gt;
    … …  
    5352    <note os="kd"><para>While "The IPv6 Protocol" is not strictly required, it
    5453    is highly recommended by the Systemd developers. "EFI Variable support" and
    55     "EFI GUID Partition support" are for UEFI systems. "Collect scheduler
    56     debugging info" and "Collect scheduler statistics" is for systemd-bootchart.
    57     </para></note>
     54    "EFI GUID Partition support" are for UEFI systems.</para></note>
    5855
    5956    <para os="h">Configure the kernel via a menu-driven interface.
Note: See TracChangeset for help on using the changeset viewer.