Remove all versiond entities

chapter01/askforhelp.xml

@@ -38,9 +38,7 @@
 
     <itemizedlist>
       <listitem>
-        <para>The version of the book being used (in this case
+        <para>The version of the book being used (in this case &version;</para>
-              <phrase revision="sysv">&version;</phrase>
-              <phrase revision="systemd">&versiond;</phrase>)</para>
       </listitem>
       <listitem>
         <para>The host distribution and version being used to create LFS</para>

chapter01/changelog.xml

@@ -10,10 +10,7 @@
 
   <title>Changelog</title>
 
-  <para>This is version
+  <para>This is version &version; of the Linux From Scratch book, dated
-        <phrase revision="sysv">&version;</phrase>
-        <phrase revision="systemd">&versiond;</phrase>
-  of the Linux From Scratch book, dated
   &releasedate;. If this book is more than six months old, a newer and better
   version is probably already available. To find out, please check one of the
   mirrors via <ulink url="&lfs-root;mirrors.html"/>.</para>

chapter07/cleanup.xml

@@ -127,12 +127,9 @@ umount $LFS/{sys,proc,run,dev}</userinput></screen>
        </para>
     </note>
 
-<screen role="nodump" revision="sysv"><userinput>cd $LFS
+<screen role="nodump"><userinput>cd $LFS 
 tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
 
-<screen role="nodump" revision="systemd"><userinput>cd $LFS
-tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
-
   </sect2>
 
   <sect2>
@@ -157,14 +154,10 @@ tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
     environment variable is not set for the root user, it will destroy
     your entire host system.  YOU ARE WARNED.</para></warning>
 
-<screen role="nodump" revision="sysv"><computeroutput>cd $LFS
+<screen role="nodump"><computeroutput>cd $LFS 
-rm -rf ./*
+rm -rf ./* 
 tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</computeroutput></screen>
 
-<screen role="nodump" revision="systemd"><computeroutput>cd $LFS
-rm -rf ./*
-tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</computeroutput></screen>
-
     <para>
        Again, double check that the environment has been setup properly
        and continue building the rest of the system.

chapter10/grub.xml

@@ -156,8 +156,8 @@ set timeout=5
 insmod ext2
 set root=(hd0,2)
 
-menuentry "GNU/Linux, Linux &linux-version;-lfs-&versiond;" {
+menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
-        linux   /boot/vmlinuz-&linux-version;-lfs-&versiond; root=/dev/sda2 ro
+        linux   /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro
 }</literal>
 EOF</userinput></screen>
 

chapter10/kernel.xml

@@ -227,7 +227,7 @@ File systems  --->
 
 <screen revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
 
-<screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
+<screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
 
     <para><filename>System.map</filename> is a symbol file for the kernel.
     It maps the function entry points of every function in the kernel API,
@@ -336,8 +336,7 @@ EOF</userinput></screen>
 
       <seglistitem>
         <seg>config-&linux-version;,
-        <phrase revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase>
+        vmlinuz-&linux-version;-lfs-&version;
-        <phrase revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase>
         and System.map-&linux-version;</seg>
         <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
       </seglistitem>
@@ -359,8 +358,7 @@ EOF</userinput></screen>
       </varlistentry>
 
       <varlistentry id="lfskernel">
-        <term revision="sysv"><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
+        <term><filename>vmlinuz-&linux-version;-lfs-&version;</filename></term>
-        <term revision="systemd"><filename>vmlinuz-&linux-version;-lfs-&versiond;</filename></term>
         <listitem>
           <para>The engine of the Linux system. When turning on the computer,
           the kernel is the first part of the operating system that gets loaded.

chapter11/theend.xml

@@ -31,50 +31,33 @@
   out which LFS version is installed on the system. Create this file by
   running:</para>
 
-<screen revision="sysv"><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
+<screen><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
 
-<screen revision="systemd"><userinput>echo &versiond; &gt; /etc/lfs-release</userinput></screen>
+  <para>Two files describing the installed system may be used by packages that
-
+  can be installed on the system later, either in binary form or by building
-  <para>Two files describing the installed system may be used by packages
-  that can be installed on the system later, either in binary form or by building
   them.</para>
 
   <para>The first one shows the status of your
   new system with respect to the Linux Standards Base (LSB).  To create
   this file, run:</para>
 
-<screen revision="sysv"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
+<screen><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
 DISTRIB_ID="Linux From Scratch"
 DISTRIB_RELEASE="&version;"
 DISTRIB_CODENAME="&lt;your name here&gt;"
 DISTRIB_DESCRIPTION="Linux From Scratch"
-EOF</userinput></screen>
-
-<screen revision="systemd"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
-DISTRIB_ID="Linux From Scratch"
-DISTRIB_RELEASE="&versiond;"
-DISTRIB_CODENAME="&lt;your name here&gt;"
-DISTRIB_DESCRIPTION="Linux From Scratch"
 EOF</userinput></screen>
 
   <para>The second one contains roughly the same information, and is used
   by systemd and some graphical desktop environments.  To create
   this file, run:</para>
 
-<screen revision="sysv"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
+<screen><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
 NAME="Linux From Scratch"
 VERSION="&version;"
 ID=lfs
 PRETTY_NAME="Linux From Scratch &version;"
 VERSION_CODENAME="&lt;your name here&gt;"
-EOF</userinput></screen>
-
-<screen revision="systemd"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
-NAME="Linux From Scratch"
-VERSION="&versiond;"
-ID=lfs
-PRETTY_NAME="Linux From Scratch &versiond;"
-VERSION_CODENAME="&lt;your name here&gt;"
 EOF</userinput></screen>
 
   <para>Be sure to put some sort of customization for the fields

prologue/bookinfo.xml

@@ -7,8 +7,7 @@
 
 <bookinfo>
   <title>Linux From Scratch</title>
-  <subtitle revision='sysv'   >Version &version; </subtitle>
+  <subtitle>Version &version; </subtitle>
-  <subtitle revision='systemd'>Version &versiond;</subtitle>
   <subtitle>Published &releasedate;</subtitle>
 
   <authorgroup>