Changeset 350ab24 for BOOK/materials

Timestamp:

Apr 28, 2014, 8:56:46 PM (12 years ago)

Author:

Chris Staub <chris@…>

Parents:

5c8e74d (diff), 31cfd067 (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:

Merged latest systemd branch changes

Location:

BOOK/materials/common

Files:

• introduction.xml (modified) (2 diffs)
• packages.xml (modified) (3 diffs)
• patches.xml (modified) (1 diff)

BOOK/materials/common/introduction.xml

@@ -47 +47 @@
 
   <para>You can download all needed packages and patches into this directory
-either by using the links on the following pages in this section, or by passing 
+either by using the links on the following pages in this section, or by passing
 the <ulink url="../dl.list">download list</ulink> to <command>wget</command>:</para>
 
@@ -64 +64 @@
 
 <screen><userinput>pushd ${CLFS}/sources
-sha1sum -c SHA1SUMS 
+sha1sum -c SHA1SUMS
 popd</userinput></screen>
 

BOOK/materials/common/packages.xml

@@ -88 +88 @@
 
     <varlistentry>
-      <term>Bootscripts for CLFS (&bootscripts-clfs-version;) - <token>&bootscripts-clfs-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bootscripts-clfs-home;"/></para>
-        <para>Download: <ulink url="&bootscripts-clfs-url;"/></para>
-        <para>MD5 sum: <literal>&bootscripts-clfs-md5;</literal></para>
+      <term>Boot-scripts for CLFS (&boot-scripts-clfs-version;) - <token>&boot-scripts-clfs-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&boot-scripts-clfs-home;"/></para>
+        <para>Download: <ulink url="&boot-scripts-clfs-url;"/></para>
+        <para>MD5 sum: <literal>&boot-scripts-clfs-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -608 +608 @@
     </varlistentry>
 
-    <varlistentry> 
-      <term>Time Zone Data (&tzdata-version;) - <token>&tzdata-size;</token>:</term> 
-      <listitem> 
-        <para>Home page: <ulink url="&tzdata-home;"/></para> 
-        <para>Download: <ulink url="&tzdata-url;"/></para> 
-        <para>MD5 sum: <literal>&tzdata-md5;</literal></para> 
-      </listitem> 
+    <varlistentry>
+      <term>Time Zone Data (&tzdata-version;) - <token>&tzdata-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&tzdata-home;"/></para>
+        <para>Download: <ulink url="&tzdata-url;"/></para>
+        <para>MD5 sum: <literal>&tzdata-md5;</literal></para>
+      </listitem>
     </varlistentry>
 
@@ -620 +620 @@
       <term>Util-linux (&util-linux-version;) - <token>&util-linux-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&util-linux-home;"/></para>
         <para>Download: <ulink url="&util-linux-url;"/></para>
         <para>MD5 sum: <literal>&util-linux-md5;</literal></para>

BOOK/materials/common/patches.xml

@@ -25 +25 @@
         url="&patches-root;&bash-branch_update-patch;"/></para>
         <para>MD5 sum: <literal>&bash-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bootscripts Updates Patch - <token>&bootscripts-clfs-updates-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&bootscripts-clfs-updates-patch;"/></para>
-        <para>MD5 sum: <literal>&bootscripts-clfs-updates-patch-md5;</literal></para>
       </listitem>
     </varlistentry>