Changeset 03e6a40 for BOOK/prologue/common/prerequisites.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (12 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/prologue/common/prerequisites.xml (modified) (1 diff)

BOOK/prologue/common/prerequisites.xml

@@ -41 +41 @@
     <listitem>
       <para remap="verbatim">The Linux Users' Guide
-      <ulink url="http://www.linuxhq.com/guides/LUG/guide.html"/></para>
+      <ulink url="http://www.tldp.org/pub/Linux/docs/ldp-archived/users-guide/"/></para>
 
       <para>This guide covers the usage of assorted Linux software.</para>