[Kernel-handbook-general] [PATCH 03/15] Update 'Linus version format' to begin with 4

[Ben Hutchings]

---
 chapter-versions.dbk       | 4 ++--
 debian/changelog           | 1 +
 po4a/kernel-handbook.ja.po | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/chapter-versions.dbk b/chapter-versions.dbk
index 423eedc..201fa80 100644
--- a/chapter-versions.dbk
+++ b/chapter-versions.dbk
@@ -11,9 +11,9 @@
 <para>
 The version that Linus or a stable series maintainer uses for a release.
 Currently Linus will use the version format:
-3.<replaceable>x</replaceable>[-rc<replaceable>y</replaceable>].  Stable series
+4.<replaceable>x</replaceable>[-rc<replaceable>y</replaceable>].  Stable series
 maintainers use the version format:
-3.<replaceable>x</replaceable>.<replaceable>y</replaceable>.
+4.<replaceable>x</replaceable>.<replaceable>y</replaceable>.
 </para>
 </listitem>
 </varlistentry>
diff --git a/debian/changelog b/debian/changelog
index 1711126..6aea765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ kernel-handbook (1.0.17) UNRELEASED; urgency=medium
     - Makefile,debian/control: Use xmlto to build from DocBook
     - Update Japanese translation for the format conversion
   * Remove statement that the final '.0' will be removed from upstream versions
+  * Update 'Linus version format' to begin with 4
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 30 Aug 2015 13:21:25 +0100
 
diff --git a/po4a/kernel-handbook.ja.po b/po4a/kernel-handbook.ja.po
index bec7b67..2bde67c 100644
--- a/po4a/kernel-handbook.ja.po
+++ b/po4a/kernel-handbook.ja.po
@@ -3341,14 +3341,14 @@ msgstr "アップストリームバージョン"
 #: chapter-versions.dbk:12
 msgid ""
 "The version that Linus or a stable series maintainer uses for a release.  "
-"Currently Linus will use the version format: 3.<replaceable>x</replaceable>[-"
+"Currently Linus will use the version format: 4.<replaceable>x</replaceable>[-"
 "rc<replaceable>y</replaceable>].  Stable series maintainers use the version "
-"format: 3.<replaceable>x</replaceable>.<replaceable>y</replaceable>."
+"format: 4.<replaceable>x</replaceable>.<replaceable>y</replaceable>."
 msgstr ""
 "Linus や安定版のメンテナがリリースに使用するバージョンです。現在 Linus はバー"
-"ジョンナンバに 3.<replaceable>x</replaceable>[-rc<replaceable>y</"
+"ジョンナンバに 4.<replaceable>x</replaceable>[-rc<replaceable>y</"
 "replaceable>] というフォーマットを使用しています。安定版のメンテナはバージョ"
-"ンナンバに 3.<replaceable>x</replaceable>.<replaceable>y</replaceable>. とい"
+"ンナンバに 4.<replaceable>x</replaceable>.<replaceable>y</replaceable>. とい"
 "うフォーマットを使用しています。"
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-- 
Ben Hutchings
For every action, there is an equal and opposite criticism. - Harrison
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 811 bytes
Desc: This is a digitally signed message part
URL: <http://lists.alioth.debian.org/pipermail/kernel-handbook-general/attachments/20151114/ff45f190/attachment-0001.sig>