From: Tim Gerundt <tim@gerundt.de>
Date: Wed, 18 Sep 2019 22:18:28 +0000 (+0200)
Subject: Manual: Use &WinMergeVersion; ENTITY for pasting the version number (drop replaceable... 
X-Git-Tag: 2.16.5~80
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c35a0c480f21c446f88431ca651b58a282a52e1f;p=winmerge-jp%2Fwinmerge-jp.git

Manual: Use &WinMergeVersion; ENTITY for pasting the version number (drop replaceables.xml)
---

diff --git a/Docs/Manual/EN/About_Doc.xml b/Docs/Manual/EN/About_Doc.xml
index f87e29e5b..8776e8287 100644
--- a/Docs/Manual/EN/About_Doc.xml
+++ b/Docs/Manual/EN/About_Doc.xml
@@ -2,9 +2,7 @@
 <article id="About_Doc">
   <title>About WinMerge Help</title>
 
-  <para>This is Help for WinMerge <xi:include href="replaceables.xml"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(version)" />.</para>
+  <para>This is Help for WinMerge &WinMergeVersion;.</para>
 
   <section>
     <title>Audience and scope</title>
diff --git a/Docs/Manual/EN/Index.xml b/Docs/Manual/EN/Index.xml
index adad475e0..b7e8aaed2 100644
--- a/Docs/Manual/EN/Index.xml
+++ b/Docs/Manual/EN/Index.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "../Tools/dtd/docbookx.dtd" [
+<!ENTITY % VersionNumbers SYSTEM "../Shared/VersionNumbers.xml">
+  %VersionNumbers;
 <!ENTITY About_Doc SYSTEM "About_Doc.xml">
 <!ENTITY Quick_start SYSTEM "Quick_start.xml">
 <!ENTITY Introduction SYSTEM "Introduction.xml">
@@ -22,9 +24,7 @@
 ]>
 <book id="index">
   <bookinfo>
-    <title>WinMerge <xi:include href="replaceables.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(version)" />
-    Help</title>
+    <title>WinMerge &WinMergeVersion; Help</title>
 
     <productname>WinMerge</productname>
 
@@ -94,8 +94,7 @@
 
   <!-- Note to maintainers:
   Not all doc files are included in this file. There are also fragment files 
-  included at the topic level. For example, several files include elements from 
-  replaceables.xml. Other fragment file is select-unpacker.xml.
+  included at the topic level. A fragment file is for example select-unpacker.xml.
   Please do not delete xml files in this directory unless you know for sure 
   that they are not used. -->
 
diff --git a/Docs/Manual/EN/Introduction.xml b/Docs/Manual/EN/Introduction.xml
index 576aafe1b..02941a0b6 100644
--- a/Docs/Manual/EN/Introduction.xml
+++ b/Docs/Manual/EN/Introduction.xml
@@ -23,8 +23,7 @@
   <para>The goal of WinMerge development is to make comparing, synchronizing,
   and merging folders and files easy and fast, while maintaining maximum
   reliability. Ease of use is of key importance for reducing errors. The latest
-  version, <xi:include href="replaceables.xml"
-  xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(version)" /> is
+  version, &WinMergeVersion; is
   considered a stable and reliable program to use.</para>
 
   <para>Please note that WinMerge is not freeware (as many sites on the Web have
diff --git a/Docs/Manual/EN/replaceables.xml b/Docs/Manual/EN/replaceables.xml
deleted file mode 100644
index 545bdcbcc..000000000
--- a/Docs/Manual/EN/replaceables.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"../Tools/dtd/docbookx.dtd">
-<section>
-  <title>Replaceable phrases</title>
-
-  <informaltable>
-    <tgroup cols="2">
-      <tbody>
-        <row>
-          <entry>WinMerge product name</entry>
-
-          <entry><phrase id="wm-prodname">WinMerge</phrase></entry>
-        </row>
-
-        <row>
-          <entry>Current version (minor)</entry>
-
-          <entry><phrase id="version-full">2.16.4</phrase></entry>
-        </row>
-
-        <row>
-          <entry>Current version (major)</entry>
-
-          <entry><phrase id="version">2.16</phrase></entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</section>
diff --git a/Docs/Manual/JP/About_Doc.xml b/Docs/Manual/JP/About_Doc.xml
index 5f5c0dca2..7477b4127 100644
--- a/Docs/Manual/JP/About_Doc.xml
+++ b/Docs/Manual/JP/About_Doc.xml
@@ -2,9 +2,7 @@
 <article id="About_Doc">
   <title>WinMergeヘルプについて</title>
 
-  <para>このドキュメントはWinMerge <xi:include href="replaceables.xml"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(version)" />のヘルプです。</para>
+  <para>このドキュメントはWinMerge &WinMergeVersion; のヘルプです。</para>
 
   <section>
     <title>対象読者と範囲</title>
diff --git a/Docs/Manual/JP/Introduction.xml b/Docs/Manual/JP/Introduction.xml
index 60e621ef7..0a243cacb 100644
--- a/Docs/Manual/JP/Introduction.xml
+++ b/Docs/Manual/JP/Introduction.xml
@@ -21,7 +21,7 @@
   <para>WinMerge開発のゴールは、フォルダやファイルを比較、同期、
   そして、マージを簡単かつ迅速に行えるようにすることです。
   使い易さは、間違いを減らすために重要なことです。
-  最新版<xi:include href="replaceables.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(version)" />は、
+  最新版 &WinMergeVersion; は、
   安定性と信頼性が考慮されています。</para>
 
   <para>WinMergeは、( 多くのWebサイトで言及されているように)フリーウェアでないことに注意してください。
diff --git a/Docs/Manual/JP/replaceables.xml b/Docs/Manual/JP/replaceables.xml
deleted file mode 100644
index cba135088..000000000
--- a/Docs/Manual/JP/replaceables.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"../Tools/dtd/docbookx.dtd">
-<section>
-  <title>置換可能な句</title>
-
-  <informaltable>
-    <tgroup cols="2">
-      <tbody>
-        <row>
-          <entry>製品名</entry>
-
-          <entry><phrase id="wm-prodname">WinMerge</phrase></entry>
-        </row>
-
-        <row>
-          <entry>現在のバージョン(マイナー)</entry>
-
-          <entry><phrase id="version-full">2.16.0</phrase></entry>
-        </row>
-
-        <row>
-          <entry>現在のバージョン(メジャー)</entry>
-
-          <entry><phrase id="version">2.16</phrase></entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</section>
\ No newline at end of file
diff --git a/Docs/Manual/Shared/VersionNumbers.xml b/Docs/Manual/Shared/VersionNumbers.xml
new file mode 100644
index 000000000..8ec9fbca3
--- /dev/null
+++ b/Docs/Manual/Shared/VersionNumbers.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!ENTITY WinMergeVersion "2.16">
\ No newline at end of file