Changeset 229ed25 for BOOK/appendices/acronymlist.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/appendices/acronymlist.xml (modified) (7 diffs)

BOOK/appendices/acronymlist.xml

@@ -24 +24 @@
 
     <varlistentry>
-      <term><emphasis role="bold">ALFS</emphasis></term>
-      <listitem>
-        <para>Automated Linux From Scratch</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term><emphasis role="bold">ALSA</emphasis></term>
       <listitem>
@@ -73 +66 @@
 
     <varlistentry>
-      <term><emphasis role="bold">BLFS</emphasis></term>
-      <listitem>
-        <para>Beyond Linux From Scratch</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term><emphasis role="bold">BSD</emphasis></term>
       <listitem>
@@ -87 +73 @@
 
     <varlistentry>
+      <term><emphasis role="bold">CBLFS</emphasis></term>
+      <listitem>
+        <para>Community Driven Beyond Linux From Scratch</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><emphasis role="bold">chroot</emphasis></term>
       <listitem>
@@ -171 +164 @@
 
     <varlistentry>
-      <term><emphasis role="bold">EVMS</emphasis></term>
-      <listitem>
-        <para>Enterprise Volume Management System</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term><emphasis role="bold">ext2</emphasis></term>
       <listitem>
@@ -388 +374 @@
 
     <varlistentry>
-      <term><emphasis role="bold">NNTP</emphasis></term>
-      <listitem>
-        <para>Network News Transport Protocol</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term><emphasis role="bold">NPTL</emphasis></term>
       <listitem>
@@ -423 +402 @@
 
     <varlistentry>
-      <term><emphasis role="bold">PCRE</emphasis></term>
-      <listitem>
-        <para>Perl Compatible Regular Expression</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term><emphasis role="bold">PID</emphasis></term>
       <listitem>
@@ -507 +479 @@
 
     <varlistentry>
-      <term><emphasis role="bold">SMP</emphasis></term>
-      <listitem>
-        <para>Symmetric Multi-Processor</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term><emphasis role="bold">TLDP</emphasis></term>
       <listitem>