From 185834a1ccfed5e96e8269e352b10d58c6a96baa Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 31 Oct 2005 14:37:45 +0000
Subject: [PATCH] Update the release branch diagrams and add one for RELENG_6.

---
 en_US.ISO8859-1/articles/releng/Makefile      |  1 +
 en_US.ISO8859-1/articles/releng/article.sgml  |  9 +++++++++
 .../images/articles/releng/branches-head.pic  | 13 ++++++++++++-
 .../articles/releng/branches-releng5.pic      | 10 +++++++++-
 .../articles/releng/branches-releng6.pic      | 19 +++++++++++++++++++
 5 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 share/images/articles/releng/branches-releng6.pic

diff --git a/en_US.ISO8859-1/articles/releng/Makefile b/en_US.ISO8859-1/articles/releng/Makefile
index 9f5157c8c0..9a8189d236 100644
--- a/en_US.ISO8859-1/articles/releng/Makefile
+++ b/en_US.ISO8859-1/articles/releng/Makefile
@@ -16,6 +16,7 @@ IMAGES_EN=	branches-head.pic
 IMAGES_EN+=	branches-releng3.pic
 IMAGES_EN+=	branches-releng4.pic
 IMAGES_EN+=	branches-releng5.pic
+IMAGES_EN+=	branches-releng6.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 c20861ea69..23234fe132 100644
--- a/en_US.ISO8859-1/articles/releng/article.sgml
+++ b/en_US.ISO8859-1/articles/releng/article.sgml
@@ -296,6 +296,15 @@
         </textobject>
       </mediaobject>
 
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="branches-releng6" align="center">
+        </imageobject>
+
+        <textobject>
+          <phrase>FreeBSD 6.x STABLE Branch</phrase>
+        </textobject>
+      </mediaobject>
     </sect3>
 
     <sect3 id="versionbump">
diff --git a/share/images/articles/releng/branches-head.pic b/share/images/articles/releng/branches-head.pic
index d94ef2ecf3..368e08b0d8 100644
--- a/share/images/articles/releng/branches-head.pic
+++ b/share/images/articles/releng/branches-head.pic
@@ -74,7 +74,18 @@ RELENG_5:
 	box width 1.0 "\s-3RELENG_5\s+3" dashed rad 45
 
 	line -> down from RELENG_5_3_0_RELEASE.s
-HEAD_6_0:
+HEAD_6:
 	box width 1.0 "\s-36.0-CURRENT\s+3" dashed
 
+	line -> right from HEAD_6.e
+RELENG_6_0_0_RELEASE:
+	ellipse width .5 "\s-26.0R\s+2"
+
+	line -> right from RELENG_6_0_0_RELEASE.e
+RELENG_6:
+	box width 1.0 "\s-3RELENG_6\s+3" dashed rad 45
+
+	line -> down from RELENG_6_0_0_RELEASE.s
+HEAD_7:
+	box width 1.0 "\s-37.0-CURRENT\s+3" dashed
 .PE
diff --git a/share/images/articles/releng/branches-releng5.pic b/share/images/articles/releng/branches-releng5.pic
index 063c2e0f50..4dd9563b40 100644
--- a/share/images/articles/releng/branches-releng5.pic
+++ b/share/images/articles/releng/branches-releng5.pic
@@ -14,6 +14,14 @@ RELENG_5_3:
 	box width .9 "\s-3RELENG_5_3\s+3" dashed
 
 	line -> right from RELENG_5_3_0_RELEASE.e
-RELENG_4:box "\s-25-STABLE\s+2"
+RELENG_5_4_0_RELEASE:
+	ellipse width .9 "\s-25.4-RELEASE\s+2"
+
+	line -> down from RELENG_5_4_0_RELEASE.s
+RELENG_5_4:
+	box width .9 "\s-3RELENG_5_4\s+3" dashed
+
+	line -> right from RELENG_5_4_0_RELEASE.e
+RELENG_5:box "\s-25-STABLE\s+2"
 
 .PE
diff --git a/share/images/articles/releng/branches-releng6.pic b/share/images/articles/releng/branches-releng6.pic
new file mode 100644
index 0000000000..d0dfe00111
--- /dev/null
+++ b/share/images/articles/releng/branches-releng6.pic
@@ -0,0 +1,19 @@
+.\" -*- nroff -*-
+.\" $FreeBSD$
+
+.PS 6
+
+RELENG_6_0_0_RELEASE:
+	ellipse width .9 "\s-26.0-RELEASE\s+2"
+        move right 4
+        move up .5
+        "\s-1RELENG_6 (6.x STABLE Branch)\s+1"
+
+	line -> down from RELENG_6_0_0_RELEASE.s
+RELENG_6_0:
+	box width .9 "\s-3RELENG_6_0\s+3" dashed
+
+	line -> right from RELENG_6_0_0_RELEASE.e
+RELENG_5:box "\s-26-STABLE\s+2"
+
+.PE