X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fgeneral.ch;h=ed33366216423532174e57bd712d014db84aba86;hb=61181f03cb757c4c8f3e4ceeb51c9c8b002ca4a5;hp=f1eb74f61e84947ead7fcf28d8d24d5110496ec0;hpb=12b0f19128cb20fd1e9447de911374b858ca0f6d;p=lfsbookja%2Flfsja-git.git

diff --git a/src/general.ch b/src/general.ch
index f1eb74f6..ed333662 100644
--- a/src/general.ch
+++ b/src/general.ch
@@ -4,29 +4,52 @@
 % This is a CTIE change file for the original XML source of the LFSbook.
 %
 @x
-<!-- version info automatically generated by git
+<!-- Editing  up to the line of ==== should be enough
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- version info automatically generated by git
+<!-- Editing  up to the line of ==== should be enough
 @z
 
 @x
-<!--
-<!ENTITY version         "10.2-rc1">
-<!ENTITY versiond        "10.2-systemd-rc1">
-<!ENTITY releasedate     "August 26th, 2021">
-<!ENTITY copyrightdate   "1999-2021">
--->
+<![ %rc; [
+<![ %sysv; [
+<!ENTITY version         "%relnum;-rc%rcnum;">
+<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; -->
+]]>
+<![ %systemd; [
+<!ENTITY version         "%relnum;-systemd-rc%rcnum;">
+<!ENTITY short-version   "systemd">  <!-- Used below in &blfs-book; -->
+]]>
+<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
+<!ENTITY generic-version "%relnum;-rc%rcnum;"> <!-- Used below in
+                                                    &patches-root;,
+                                                    &downloads-root;, and
+                                                    &test-results; -->
+<!ENTITY releasedate     "%reldate;">
+<!ENTITY copyrightdate   "%crdate;">
+]]>
 @y
-<!--
-<!ENTITY version         "10.2-rc1">
-<!ENTITY versiond        "10.2-systemd-rc1">
-<!ENTITY releasedate     "August 26th, 2021">
-<!ENTITY copyrightdate   "1999-2021">
--->
-<!ENTITY jversion        "20210916">
-<!ENTITY jversiond       "20210916">
-<!ENTITY jcorrespondSHA  "43b6ecdc1"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
+<![ %rc; [
+<![ %sysv; [
+<!ENTITY version         "%relnum;-rc%rcnum;">
+<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; -->
+]]>
+<![ %systemd; [
+<!ENTITY version         "%relnum;-systemd-rc%rcnum;">
+<!ENTITY short-version   "systemd">  <!-- Used below in &blfs-book; -->
+]]>
+<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
+<!ENTITY generic-version "%relnum;-rc%rcnum;"> <!-- Used below in
+                                                    &patches-root;,
+                                                    &downloads-root;, and
+                                                    &test-results; -->
+<!ENTITY releasedate     "%reldate;">
+<!ENTITY copyrightdate   "%crdate;">
+]]>
+
+<!ENTITY jversion        "20220812">
+<!ENTITY jversiond       "20220812">
+<!ENTITY jcorrespondSHA  "c25dd3fc1"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
 <!ENTITY dir-jversion    "git-ja">
 <!ENTITY dir-jversiond   "git-sysdja">
 @z
@@ -45,14 +68,6 @@
 <!ENTITY download-scripts  "&lfs-rootja;&dir-jversion;/">
 @z
 
-% systemd版には lfs-bootscripts が不要なので以下も不要
-%@x
-%<!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">
-%@y
-%<!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">
-%<!ENTITY download-scriptsd "&lfs-rootja;&dir-jversiond;/">
-%@z
-
 @x
 <!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">
 @y