From 5227bbd60f1caa0350c553677572c210c4e7dda0 Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 26 Sep 2013 14:39:13 +0000
Subject: [PATCH] - Bump Copyright year - Trim old entries from releng/9.1 -
 Update URLs for 9.2 where needed - Note CVS/cvsup are not supported methods
 to update src/

Approved by:	re (implicit)


git-svn-id: svn://svn.freebsd.org/base/releng/9.2@255884 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 .../en_US.ISO8859-1/installation/article.xml  | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/release/doc/en_US.ISO8859-1/installation/article.xml b/release/doc/en_US.ISO8859-1/installation/article.xml
index 130e84f7..afe5b224 100644
--- a/release/doc/en_US.ISO8859-1/installation/article.xml
+++ b/release/doc/en_US.ISO8859-1/installation/article.xml
@@ -14,7 +14,7 @@
     <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
-      <year>2012</year>
+      <year>2013</year>
 
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
@@ -51,7 +51,7 @@
 
     <para>If you are upgrading from a previous release of &os;, please
       read <ulink
-      url="http://www.FreeBSD.org/releases/9.1R/relnotes-detailed.html#upgrade">upgrading
+      url="http://www.FreeBSD.org/releases/9.2R/relnotes-detailed.html#upgrade">upgrading
       section in the Release Notes</ulink> for notable
       incompatibilities carefully.</para>
 
@@ -63,10 +63,15 @@
 	<ulink url="&url.books.handbook;/synching.html"></ulink> and
 	<ulink url="&url.books.handbook;/makeworld.html"></ulink>.</para>
 
-      <para>For SVN use the <filename>releng/9.1</filename> branch
+      <para>For SVN use the <filename>releng/9.2</filename> branch
 	which will be where any upcoming Security Advisories or Errata
-	Notices will be applied.  The branch tag to use for updating
-	the source is <literal>RELENG_9_1</literal> for CVS.</para>
+	Notices will be applied.</para>
+
+      <note>
+	<para>CVS and cvsup are both deprecated, and not supported
+	  methods for updating the <filename role="directory">src/</filename>
+	  tree.</para>
+      </note>
     </sect2>
 
     <sect2>
@@ -76,17 +81,10 @@
 	upgrades of &arch.i386; and &arch.amd64; systems running
 	earlier FreeBSD releases. Systems running
 	<literal>7.[34]-RELEASE</literal>,
-	<literal>8.[12]-RELEASE</literal>,
+	<literal>8.[1234]-RELEASE</literal>,
 	<literal>9.0-RELEASE</literal>,
-	<literal>9.1-BETA1</literal>, or
-	<literal>9.1-RC[123]</literal> can upgrade as follows:</para>
-
-      <para>First, ensure that your current system is up to date; a
-	change was recently made to &man.freebsd-update.8; (Errata
-	Notice <ulink
-	  url="http://security.FreeBSD.org/advisories/FreeBSD-EN-12:01.freebsd-update.asc">FreeBSD-EN-12:01.freebsd-update</ulink>)
-	which is needed in order to upgrade to &os;
-	&release.current;.</para>
+	<literal>9.1-RELEASE</literal>, or
+	<literal>9.2-RC[1234]</literal> can upgrade as follows:</para>
 
       <screen>&prompt.root; freebsd-update fetch
 &prompt.root; freebsd-update install</screen>
@@ -96,7 +94,7 @@
 	&man.freebsd-update.8; will ask for help in merging
 	configuration files.</para>
 
-      <screen>&prompt.root; freebsd-update upgrade -r 9.1-RELEASE</screen>
+      <screen>&prompt.root; freebsd-update upgrade -r 9.2-RELEASE</screen>
 
       <para>Due to changes in the way that &os; is packaged on the
 	release media, two complications may arise in this process if
-- 
2.44.0