From 31b2958c804dfae040ef542ff7ddedaf56166b34 Mon Sep 17 00:00:00 2001
From: Alexey Zelkin <phantom@FreeBSD.org>
Date: Thu, 8 Apr 2004 08:31:49 +0000
Subject: [PATCH] Update article to use 3 branches diagram instead of one.

Also remove branches.ascii file.  This file is highly outdated, and
I was failed to understand how it was used in article at all.  All
my attempts to get it *really* included into generated html were failed.

If someone feels that it should not be remove, feel free to re-add
it back and update it to current state of the world.
---
 en_US.ISO8859-1/articles/releng/Makefile      |  5 ++--
 en_US.ISO8859-1/articles/releng/article.sgml  | 25 ++++++++++++----
 .../articles/releng/branches.ascii            | 30 -------------------
 3 files changed, 22 insertions(+), 38 deletions(-)
 delete mode 100644 en_US.ISO8859-1/articles/releng/branches.ascii

diff --git a/en_US.ISO8859-1/articles/releng/Makefile b/en_US.ISO8859-1/articles/releng/Makefile
index 61addbfee3..5a25b1d4f5 100644
--- a/en_US.ISO8859-1/articles/releng/Makefile
+++ b/en_US.ISO8859-1/articles/releng/Makefile
@@ -12,8 +12,9 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 SRCS=		article.sgml
-SRCS+=		branches.ascii
-IMAGES_EN=	branches.pic
+IMAGES_EN=	branches-head.pic
+IMAGES_EN+=	branches-releng3.pic
+IMAGES_EN+=	branches-releng4.pic
 
 CSS_SHEET_ADDITIONS= extra.css
 
diff --git a/en_US.ISO8859-1/articles/releng/article.sgml b/en_US.ISO8859-1/articles/releng/article.sgml
index 2290d89091..3a7c809d9e 100644
--- a/en_US.ISO8859-1/articles/releng/article.sgml
+++ b/en_US.ISO8859-1/articles/releng/article.sgml
@@ -3,7 +3,6 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY branches.ascii SYSTEM "branches.ascii">
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
@@ -269,17 +268,31 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="branches" align="center">
+          <imagedata fileref="branches-head" align="center">
         </imageobject>
 
         <textobject>
-          <literallayout>
-          &branches.ascii;
-          </literallayout>
+          <phrase>FreeBSD Development Branch</phrase>
         </textobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="branches-releng3" align="center">
+        </imageobject>
 
         <textobject>
-          <phrase>FreeBSD Development Branches</phrase>
+          <phrase>FreeBSD 3.x STABLE Branche</phrase>
+        </textobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="branches-releng4" align="center">
+        </imageobject>
+
+        <textobject>
+          <phrase>FreeBSD 4.x STABLE Branche</phrase>
         </textobject>
       </mediaobject>
 
diff --git a/en_US.ISO8859-1/articles/releng/branches.ascii b/en_US.ISO8859-1/articles/releng/branches.ascii
deleted file mode 100644
index 531bed46bf..0000000000
--- a/en_US.ISO8859-1/articles/releng/branches.ascii
+++ /dev/null
@@ -1,30 +0,0 @@
-$FreeBSD$
-
-           |                    FreeBSD Development Branches                 
-    +--------------+
-    | 3.0-RELEASE  |
-    |              |
-    +--------------+
-           |                                   RELENG_3
-H    ______|____   _ _ _   _ _ _   _ _ _   _ _ _   _ _ _ _    + - - - - - - +
-E   /           \ |     | |     | |     | |     | |       |   |             |
-A   |3.1-RELEASE|-|3.2R |-|3.3R |-|3.4R |-|3.5R |-| 3.5.1R|---| 3.X-STABLE  |
-D   \___________/ |_ _ _| |_ _ _| |_ _ _| |_ _ _| |_ _ _ _|   |             |
-          |                                                   + - - - - - - +
-          |
-    + - - - - - - - +
-    |  4.0-CURRENT  |
-    |               |
-    + - - - - - - - +
-          |                                    RELENG_4 
-     _____|_____   _ _ _   _ _ _ _   _ _ _   _ _ _   _ _ _    + - - - - - - +
-    /           \ |     | |       | |     | |     | |     |   |             |
-    |4.0-RELEASE|-|4.1R |-|4.1.1R |-|4.2R |-|4.3R |-|4.4R |---| 4.X-STABLE  |
-    \___________/ |_ _ _| |_ _ _ _| |_ _ _| |_ _ _| |_ _ _|   |             |
-          |                                 ___|      |__     + - - - - - - +
-          |                          _ _ _ | _ _ _   _ _ |_ _ _ __
-          |                         |             | |             |
-    + - - - - - - - +               | RELENG_4_3  | | RELENG_4_4  |
-    |  5.0-CURRENT  |               |_ _ _ _ _ _ _| |_ _ _ _ _ _ _|
-    |               |
-    + - - - - - - - +