release/6.0.0

4 files changed, 46 insertions, 8 deletions

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
diff --git a/share/sgml/freebsd.ent b/share/sgml/freebsd.ent
index a85b195e35..41726c756f 100644
--- a/share/sgml/freebsd.ent
+++ b/share/sgml/freebsd.ent
@@ -36,24 +36,24 @@ used in both environments.
 <!-- The currently released version of FreeBSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
      it's really release time -->
-<!ENTITY rel.current "5.4">
-<!ENTITY rel.current.date "May 2005">
+<!ENTITY rel.current "6.0">
+<!ENTITY rel.current.date "Oct 2005">
 <!ENTITY rel.current.notes 'http://www.FreeBSD.org/releases/&rel.current;R/notes.html'>
 <!ENTITY rel.current.hardware 'http://www.FreeBSD.org/releases/&rel.current;R/hardware.html'>
 <!ENTITY rel.current.errata 'http://www.FreeBSD.org/releases/&rel.current;R/errata.html'>
 
 <!-- Entities for multiple "latest" versions of FreeBSD -->
-<!ENTITY rel2.current "4.11">
-<!ENTITY rel2.current.date "Jan 2005">
+<!ENTITY rel2.current "5.4">
+<!ENTITY rel2.current.date "May 2005">
 <!ENTITY rel2.current.notes 'http://www.FreeBSD.org/releases/&rel2.current;R/notes.html'>
 <!ENTITY rel2.current.hardware 'http://www.FreeBSD.org/releases/&rel2.current;R/hardware.html'>
 <!ENTITY rel2.current.errata 'http://www.FreeBSD.org/releases/&rel2.current;R/errata.html'>
 
 <!-- Entities for the snapshots -->
 <!ENTITY snapshots.stable
-  'ftp://snapshots.jp.freebsd.org/pub/FreeBSD/snapshots/i386/4-LATEST'>
-<!ENTITY snapshots.current
   'ftp://snapshots.jp.freebsd.org/pub/FreeBSD/snapshots/i386/5-LATEST'>
+<!ENTITY snapshots.current
+  'ftp://snapshots.jp.freebsd.org/pub/FreeBSD/snapshots/i386/6-LATEST'>
 
 <!-- Sections that we don't want to be published -->
 <!ENTITY % not.published 	"IGNORE">