Ignore:
Timestamp:
Jan 29, 2011, 4:28:46 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
d2759bb
Parents:
f33b74f (diff), 9fedd70f (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:

Merge branch 'master' into systemd

Conflicts:

BOOK/final-system/multilib/util-linux-64bit.xml
BOOK/final-system/multilib/util-linux-n32.xml
BOOK/final-system/multilib/util-linux.xml

Location:
BOOK/final-system/multilib
Files:
3 moved

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/multilib/util-linux-64bit.xml

    rf33b74f r4ce7c10  
    66]>
    77
    8 <sect1 id="ch-system-util-linux-ng" role="wrap">
    9   <?dbhtml filename="util-linux-ng-64bit.html"?>
     8<sect1 id="ch-system-util-linux" role="wrap">
     9  <?dbhtml filename="util-linux-64bit.html"?>
    1010
    11   <title>Util-linux-ng-&util-linux-ng-version; 64 Bit</title>
     11  <title>Util-linux-&util-linux-version; 64 Bit</title>
    1212
    13   <indexterm zone="ch-system-util-linux-ng">
    14     <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
     13  <indexterm zone="ch-system-util-linux">
     14    <primary sortas="a-Util-linux">Util-linux</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    18   href="../common/util-linux-ng.xml"
     18  href="../common/util-linux.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    22   href="../common/util-linux-ng.xml"
    23   xpointer="xpointer(//*[@id='fhs-util-linux-ng'])"/>
     22  href="../common/util-linux.xml"
     23  xpointer="xpointer(//*[@id='fhs-util-linux'])"/>
    2424
    2525  <sect2 role="installation">
    26     <title>Installation of Util-linux-ng</title>
     26    <title>Installation of Util-linux</title>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    29     href="../common/util-linux-ng.xml"
     29    href="../common/util-linux.xml"
    3030    xpointer="xpointer(//*[@os='a'])"/>
    3131
    … …  
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    36     href="../common/util-linux-ng.xml"
     36    href="../common/util-linux.xml"
    3737    xpointer="xpointer(//*[@os='c'])"/>
    3838
    3939    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    40     href="../common/util-linux-ng.xml"
     40    href="../common/util-linux.xml"
    4141    xpointer="xpointer(//*[@os='d'])"/>
    4242
    4343    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    44     href="../common/util-linux-ng.xml"
     44    href="../common/util-linux.xml"
    4545    xpointer="xpointer(//*[@os='e'])"/>
    4646
    4747    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    48     href="../common/util-linux-ng.xml"
     48    href="../common/util-linux.xml"
    4949    xpointer="xpointer(//*[@os='f'])"/>
    5050
    5151    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    52     href="../common/util-linux-ng.xml"
     52    href="../common/util-linux.xml"
    5353    xpointer="xpointer(//*[@os='g'])"/>
    5454
    5555    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    56     href="../common/util-linux-ng.xml"
     56    href="../common/util-linux.xml"
    5757    xpointer="xpointer(//*[@os='h'])"/>
    5858
    … …  
    6060
    6161  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    62   href="../common/util-linux-ng.xml"
    63   xpointer="xpointer(id('contents-util-linux-ng'))"/>
     62  href="../common/util-linux.xml"
     63  xpointer="xpointer(id('contents-util-linux'))"/>
    6464
    6565</sect1>

  • BOOK/final-system/multilib/util-linux-n32.xml

    rf33b74f r4ce7c10  
    66]>
    77
    8 <sect1 id="ch-system-util-linux-ng-n32" role="wrap">
    9   <?dbhtml filename="util-linux-ng-n32.html"?>
     8<sect1 id="ch-system-util-linux-n32" role="wrap">
     9  <?dbhtml filename="util-linux-n32.html"?>
    1010
    11   <title>Util-linux-ng-&util-linux-ng-version; N32 Libraries</title>
     11  <title>Util-linux-&util-linux-version; N32 Libraries</title>
    1212
    13   <indexterm zone="ch-system-util-linux-ng-n32">
    14     <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
     13  <indexterm zone="ch-system-util-linux-n32">
     14    <primary sortas="a-Util-linux">Util-linux</primary>
    1515    <secondary>N32</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    19   href="../common/util-linux-ng.xml"
     19  href="../common/util-linux.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of Util-linux-ng</title>
     23    <title>Installation of Util-linux</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    26     href="../common/util-linux-ng.xml"
     26    href="../common/util-linux.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    … …  
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="../common/util-linux-ng.xml"
     33    href="../common/util-linux.xml"
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/util-linux-ng.xml"
     37    href="../common/util-linux.xml"
    3838    xpointer="xpointer(//*[@os='d'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/util-linux-ng.xml"
     41    href="../common/util-linux.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/util-linux-ng.xml"
     45    href="../common/util-linux.xml"
    4646    xpointer="xpointer(//*[@os='f'])"/>
    4747
    4848    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/util-linux-ng.xml"
     49    href="../common/util-linux.xml"
    5050    xpointer="xpointer(//*[@os='g'])"/>
    5151
    5252    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    53     href="../common/util-linux-ng.xml"
     53    href="../common/util-linux.xml"
    5454    xpointer="xpointer(//*[@os='h'])"/>
    5555
    … …  
    6060
    6161    <para>Details on this package are located in <xref
    62     linkend="contents-util-linux-ng" role="."/></para>
     62    linkend="contents-util-linux" role="."/></para>
    6363
    6464  </sect2>

  • BOOK/final-system/multilib/util-linux.xml

    rf33b74f r4ce7c10  
    66]>
    77
    8 <sect1 id="ch-system-util-linux-ng-32" role="wrap">
    9   <?dbhtml filename="util-linux-ng.html"?>
     8<sect1 id="ch-system-util-linux-32" role="wrap">
     9  <?dbhtml filename="util-linux.html"?>
    1010
    11   <title>Util-linux-ng-&util-linux-ng-version;</title>
     11  <title>Util-linux-&util-linux-version;</title>
    1212
    13   <indexterm zone="ch-system-util-linux-ng-32">
    14     <primary sortas="a-Util-linux-ng">Util-linux-ng 32 Bit Libraries</primary>
     13  <indexterm zone="ch-system-util-linux-32">
     14    <primary sortas="a-Util-linux">Util-linux 32 Bit Libraries</primary>
    1515    <secondary>32 Bit</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    19   href="../common/util-linux-ng.xml"
     19  href="../common/util-linux.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of Util-linux-ng</title>
     23    <title>Installation of Util-linux</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    26     href="../common/util-linux-ng.xml"
     26    href="../common/util-linux.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    … …  
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="../common/util-linux-ng.xml"
     33    href="../common/util-linux.xml"
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/util-linux-ng.xml"
     37    href="../common/util-linux.xml"
    3838    xpointer="xpointer(//*[@os='d'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/util-linux-ng.xml"
     41    href="../common/util-linux.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/util-linux-ng.xml"
     45    href="../common/util-linux.xml"
    4646    xpointer="xpointer(//*[@os='f'])"/>
    4747
    4848    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/util-linux-ng.xml"
     49    href="../common/util-linux.xml"
    5050    xpointer="xpointer(//*[@os='g'])"/>
    5151
    5252    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    53     href="../common/util-linux-ng.xml"
     53    href="../common/util-linux.xml"
    5454    xpointer="xpointer(//*[@os='h'])"/>
    5555
    … …  
    6060
    6161    <para>Details on this package are located in <xref
    62     linkend="contents-util-linux-ng" role="."/></para>
     62    linkend="contents-util-linux" role="."/></para>
    6363
    6464  </sect2>
Note: See TracChangeset for help on using the changeset viewer.