From fb59877ae1da602ee03f8876cfeba9d3d50fc322 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Thu, 12 Jan 2012 20:42:22 +0000
Subject: [PATCH] 9.0-RELEASE is officially released!

Hat on:	re
---
 .../books/handbook/mirrors/chapter.sgml         | 17 +++++++++++++++++
 share/sgml/freebsd.ent                          | 12 ++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index f9829f9d64..3df0cf918f 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -2410,6 +2410,15 @@ doc/zh_*</screen>
 	</listitem>
       </varlistentry>
 
+      <varlistentry>
+	<term>RELENG_9_0</term>
+
+	<listitem>
+	  <para>The release branch for &os;-9.0, used only for
+	    security advisories and other critical fixes.</para>
+	</listitem>
+      </varlistentry>
+
       <varlistentry>
 	<term>RELENG_8</term>
 
@@ -2747,6 +2756,14 @@ doc/zh_*</screen>
 	tagged with any special name for releases.</para>
 
     <variablelist>
+      <varlistentry>
+	<term>RELENG_9_0_0_RELEASE</term>
+
+	<listitem>
+	  <para>&os; 9.0</para>
+	</listitem>
+      </varlistentry>
+
       <varlistentry>
 	<term>RELENG_8_2_0_RELEASE</term>
 
diff --git a/share/sgml/freebsd.ent b/share/sgml/freebsd.ent
index 4ba32f2a6c..74fef2f7b4 100644
--- a/share/sgml/freebsd.ent
+++ b/share/sgml/freebsd.ent
@@ -59,18 +59,26 @@ 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 "8.2">
-<!ENTITY rel.current.date "February 2011">
+<!ENTITY rel.current "9.0">
+<!ENTITY rel.current.date "January 2012">
 <!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 "8.2">
+<!ENTITY rel2.current.date "February 2011">
+<!ENTITY rel2.current.notes 'http://www.FreeBSD.org/releases/&rel.current;R/notes.html'>
+<!ENTITY rel2.current.hardware 'http://www.FreeBSD.org/releases/&rel.current;R/hardware.html'>
+<!ENTITY rel2.current.errata 'http://www.FreeBSD.org/releases/&rel.current;R/errata.html'>
+
+<!--
 <!ENTITY rel2.current "7.4">
 <!ENTITY rel2.current.date "February 2011">
 <!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