Changeset 50836740 for general.ent

Timestamp:

10/16/2021 08:17:34 PM (3 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

82b7eff2

Parents:

49661ec

git-author:

Xi Ruoyao <xry111@…> (10/16/2021 07:53:42 PM)

git-committer:

Xi Ruoyao <xry111@…> (10/16/2021 08:17:34 PM)

Message:

merge conditional XML from LFS

There was some consistency issues in URLs to LFS. For example, in
systemd revision the URL to LFS "General Network Configuration" points
to the sysv book, this can be really troubling to new readers.

Instead of fixing them one by one, merge conditional XML developed by
Pierre from LFS.

File:

• general.ent (modified) (2 diffs)

general.ent

@@ -1 @@
-<!-- version info generated from git commit,
-     comment out the following two lines for release. -->
+<!-- Editing  up to the line of ==== should be enough
+     to generate a book for development, release, or rc-->
+<!ENTITY % development "INCLUDE"><!-- set to INCLUDE for development,
+                                      set to IGNORE for release or rc -->
+<!ENTITY % release     "IGNORE"> <!-- set to INCLUDE for release,
+                                      set to IGNORE for development or rc -->
+<!ENTITY % relyear    "2022">
+<!ENTITY % relnum     "11.1">
+<!ENTITY % reldate    "March 1st, 2022">
+<!ENTITY % relpubdate "2022-03-01">
+<!-- ================================================================== -->
+<!-- Do not change anything below unless the www or book layouts change -->
+
+<!-- Automatically generated by git-version.sh. Used for release or dev -->
+<!ENTITY % conditional-entities SYSTEM "conditional.ent">
+%conditional-entities;
+
+<![ %development; [
+<!-- version info automatically generated by git -->
 <!ENTITY % version-entities SYSTEM "version.ent">
 %version-entities;
+<![ %sysv; [
+<!ENTITY lfs-version  "development">
+<!ENTITY blfs-version "svn">
+]]>
+<![ %systemd; [
+<!ENTITY lfs-version  "systemd">
+<!ENTITY blfs-version "systemd">
+]]>
+]]><!-- End %development -->
 
-<!-- uncomment the following entities and modify them for release,
-     month and year should be always 2 digits. -->
-<!--
-<!ENTITY day            "01">
-<!ENTITY month          "09">
-<!ENTITY year           "2021">
-<!ENTITY copyrightdate  "2001-2021">
-<!ENTITY version        "11.0">
-<!ENTITY releasedate    "September 1st, &year;">
-<!ENTITY pubdate        "&year;-&month;-&day;">
--->
+<![ %release; [
+<![ %sysv; [
+<!ENTITY lfs-version  "%relnum;">
+<!ENTITY blfs-version "%relnum;">
+]]>
+<![ %systemd; [
+<!ENTITY lfs-version  "%relnum;-systemd">
+<!ENTITY blfs-version "%relnum;-systemd">
+]]>
 
-<!ENTITY copyholder   "The BLFS Development Team">
-<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
-<!ENTITY lfs-version  "development">          <!-- x.y|development -->
-<!ENTITY lfs-versiond "systemd">              <!-- x.y-systemd|systemd -->
-<!ENTITY lfs-domainname       "linuxfromscratch.org">
+<!ENTITY year           "%relyear;">
+<!ENTITY version        "%relnum">
+<!ENTITY releasedate    "%reldate;">
+<!ENTITY pubdate        "%relpubdate;">
+]]><!-- End %release -->
+
+<!ENTITY copyrightdate  "1999-&year;">
+<!ENTITY copyholder     "The BLFS Development Team">
+<!ENTITY lfs-domainname "linuxfromscratch.org">
 
 <!ENTITY maintainer-fullname  "The BLFS Team">
@@ -46 +74 @@
 
 <!ENTITY lfs-root             "../../../../lfs/view/&lfs-version;">
-<!ENTITY lfs-rootd            "../../../../lfs/view/&lfs-versiond;">
 <!ENTITY lfs-dev              "../../../../lfs/view/development">
 <!ENTITY gnu-http             "https://ftp.gnu.org/gnu">