Changes in general.ent [900cbcc:4458e3d]

File:

• general.ent (modified) (5 diffs)

general.ent

@@ -1 @@
-<!-- Automatically generated by git-version.sh -->
-<!ENTITY % conditional-entities SYSTEM "conditional.ent">
-%conditional-entities;
-
 <!-- version info automatically generated by git
-     comment out the following two lines for release -->
+     comment the following two lines for release -->
 <!ENTITY % version-entities SYSTEM "version.ent">
 %version-entities;
@@ -11 +7 @@
      for releases (including -rc) -->
 <!--
-<![ %sysv; [
 <!ENTITY version         "10.2-rc1">
-]]>
-<![ %systemd; [
-<!ENTITY version         "10.2-systemd-rc1">
-]]>
+<!ENTITY versiond        "10.2-systemd-rc1">
 <!ENTITY releasedate     "August 26th, 2021">
 <!ENTITY copyrightdate   "1999-2021">
@@ -22 +14 @@
 <!-- jhalfs needs a literal dash, not &ndash; -->
 
-<![ %sysv; [
-<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
+<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
                                       Change to x.y for release but not -rc releases -->
-]]>
-<![ %systemd; [
-<!ENTITY short-version  "systemd">  <!--Change to stable-systemd for release  -->
-]]>
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
+
+<!ENTITY short-versiond  "systemd">  <!--Change to stable-systemd for release  -->
+<!ENTITY generic-versiond "systemd">
 
 <!ENTITY lfs-root        "https://www.linuxfromscratch.org/">
 <!ENTITY blfs-root       "&lfs-root;blfs/">
 <!ENTITY blfs-book       "&blfs-root;view/&short-version;/">
+<!ENTITY blfs-systemd-book "&blfs-root;view/&short-versiond;/">
 <!ENTITY faq-root        "&lfs-root;faq/">
 <!ENTITY hints-root      "&lfs-root;hints/downloads/files/">
@@ -41 +32 @@
 <!ENTITY livecd-root     "&lfs-root;livecd/">
 <!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
-<![ %sysv; [
 <!ENTITY errata          "&lfs-root;lfs/errata/&generic-version;/">
-]]>
-<![ %systemd; [
-<!ENTITY errata          "&lfs-root;lfs/errata/&short-version;/">
-]]>
 <!ENTITY secadv          "&lfs-root;lfs/advisories/">
 <!ENTITY min-kernel      "3.2">
-<!--
+
 <!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-versiond;/">
 <!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">
 <!ENTITY test-resultsd   "&lfs-root;lfs/build-logs/&generic-versiond;/">
 <!ENTITY erratad         "&lfs-root;lfs/errata/&generic-versiond;/">
--->
+
 <!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">
 
@@ -66 +52 @@
 <!ENTITY before          "Must be installed before">
 <!ENTITY external        "Optional dependencies">
-                         
+
 <!ENTITY gnu             "https://ftp.gnu.org/gnu/">
 <!ENTITY gnu-software    "https://www.gnu.org/software/">