Changeset 229ed25 for BOOK/bootscripts/common/symlinks.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 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/bootscripts/common/symlinks.xml (modified) (3 diffs)

BOOK/bootscripts/common/symlinks.xml

@@ -45 +45 @@
     <note>
       <para>Although the examples in this book work properly, be aware
-      that Udev does not recognize the backslash for line continuation.
-      If modifying Udev rules with an editor, be sure to leave each rule
+      that Eudev does not recognize the backslash for line continuation.
+      If modifying Eudev rules with an editor, be sure to leave each rule
       on one physical line.</para>
     </note>
@@ -89 +89 @@
     <title>Dealing with duplicate devices</title>
 
-    <para>As explained in <xref linkend="ch-scripts-udev"/>, the order in
+    <para>As explained in <xref linkend="ch-scripts-eudev"/>, the order in
     which devices with the same function appear in
     <filename class="directory">/dev</filename> is essentially random.
@@ -134 +134 @@
     device.</para>
 
-    <para>More information on writing Udev rules can be found in
+    <para>More information on writing Eudev rules can be found in
     <filename>/usr/share/doc/udev/writing_udev_rules/index.html</filename>.</para>