From d41e7ea6357bfc4e0576cf56760b2b49f5cae4e0 Mon Sep 17 00:00:00 2001
From: gjb
Date: Tue, 8 Jul 2014 16:31:59 +0000
Subject: [PATCH] In errata/article.xml, update the document will be maintained
until the EoL of the stable/9 branch.
In share/xml/release.xsl update the recommended mailing list
from -current to -stable.
In share/examples/Makefile.relnotesng, update the branch name
convention from CVS-style to SVN-style.
In installation/article.xml:
- Use descriptive text for the synching.html and the
makeworld.html pages to fix how the URLs are displayed.
- Remove a reference to 7.x.
- Change a reference from 8.2-RELEASE to 8.4-RELEASE.
In readme/article.xml:
- Change the recommended mailing list from -current
to -stable.
- Replace send-pr(1) references to Bugzilla equivalents.
- Note that send-pr(1) is a stub shell script now.
- Use descriptive text in a link to fix the URL.
In share/xml/release.ent:
- Update release.type from 'snapshot' to 'release.'
- Set IGNORE on release.type.snapshot, and INCLUDE on
release.type.release.
- Update release.manpath.freebsd to 9.3-RELEASE.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
git-svn-id: svn://svn.freebsd.org/base/releng/9.3@268417 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
.../doc/en_US.ISO8859-1/errata/article.xml | 2 +-
.../en_US.ISO8859-1/installation/article.xml | 8 +++----
.../doc/en_US.ISO8859-1/readme/article.xml | 24 +++++++++----------
.../doc/en_US.ISO8859-1/share/xml/release.xsl | 2 +-
.../doc/share/examples/Makefile.relnotesng | 2 +-
release/doc/share/xml/release.ent | 8 +++----
6 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index a3509489a..48336b155 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -49,7 +49,7 @@
&os;.
This errata document for &os; &release.current;
- will be maintained until the release of &os; &release.next;.
+ will be maintained until the EoL of &os; &release.branch;.
diff --git a/release/doc/en_US.ISO8859-1/installation/article.xml b/release/doc/en_US.ISO8859-1/installation/article.xml
index 914af52e5..381b24e04 100644
--- a/release/doc/en_US.ISO8859-1/installation/article.xml
+++ b/release/doc/en_US.ISO8859-1/installation/article.xml
@@ -56,8 +56,8 @@
The procedure for doing a source code based update is
described in
- &url.books.handbook;/synching.html and
- &url.books.handbook;/makeworld.html.
+ Synchronizing Source and
+ Rebuilding World.
For SVN use the releng/9.3 branch
which will be where any upcoming Security Advisories or Errata
@@ -93,7 +93,7 @@
Due to changes in the way that &os; is packaged on the
release media, two complications may arise in this process if
- upgrading from FreeBSD 7.x or 8.x:
+ upgrading from FreeBSD 8.x:
@@ -134,7 +134,7 @@
&prompt.root; freebsd-update installAt this point, users of systems being upgraded from &os;
- 8.2-RELEASE or earlier will be prompted by
+ 8.4-RELEASE or earlier will be prompted by
&man.freebsd-update.8; to rebuild all third-party applications
(e.g., ports installed from the ports tree) due to updates in
system libraries.
diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml
index d75ba1cdd..bdb610a84 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
@@ -195,7 +195,7 @@
please send mail to the &a.questions;.
If you're tracking the &release.branch; development efforts, you
- must join the &a.current;, in order to
+ must join the &a.stable;, in order to
keep abreast of recent developments and changes that may
affect the way you use and maintain the system.
@@ -235,22 +235,20 @@
problems you may find. Bug reports with attached fixes are of
course even more welcome.
- The preferred method to submit bug reports from a machine
- with Internet mail connectivity is to use the &man.send-pr.1;
- command.
+ The method to submit bug reports from a machine
+ with Internet mail connectivity is to use the Bugzilla web
+ interface.
Problem Reports (PRs) submitted in this way
will be filed and their progress tracked; the &os; developers
will do their best to respond to all reported bugs as soon as
- possible. A list
- of all active PRs is available on the &os; Web site;
- this list is useful to see what potential problems other users
+ possible. A search
+ interface of all active PRs is available;
+ this list is useful to find what potential problems other users
have encountered.
- Note that &man.send-pr.1; itself is a shell script that
- should be easy to move even onto a non-&os; system. Using
- this interface is highly preferred. If, for some reason, you
- are unable to use &man.send-pr.1; to submit a bug report, you
- can try to send it to the &a.bugs;.
+ Note that &man.send-pr.1; is a stub shell script, and
+ instructs to use the Bugzilla interface.For more information, Writing
&os; Problem Reports, available on the &os; Web
@@ -320,7 +318,7 @@
other copies are kept updated on the Internet and should be
consulted as the current errata for this
release. These other copies of the errata are located at
- &url.base;/releases/ (as
+ the &os; releases page (as
well as any sites which keep up-to-date mirrors of this
location).
diff --git a/release/doc/en_US.ISO8859-1/share/xml/release.xsl b/release/doc/en_US.ISO8859-1/share/xml/release.xsl
index f1d14795f..e2cdd08e8 100644
--- a/release/doc/en_US.ISO8859-1/share/xml/release.xsl
+++ b/release/doc/en_US.ISO8859-1/share/xml/release.xsl
@@ -18,7 +18,7 @@
contacting <questions@FreeBSD.org>.