Date: Mon, 20 Oct 2003 16:29:39 +0100 From: Ceri Davies <ceri@FreeBSD.org> To: "Bruce A. Mah" <bmah@freebsd.org> Cc: freebsd-doc@freebsd.org Subject: Re: HEADS-UP: doc/ tree slushie Message-ID: <20031020152939.GE3708@submonkey.net> In-Reply-To: <20031020151209.GA55608@intruder.kitchenlab.org> References: <200310190613.h9J6DAnB035928@intruder.kitchenlab.org> <200310200414.h9K4EInB049618@intruder.kitchenlab.org> <3F936C7E.9020904@centtech.com> <20031020151209.GA55608@intruder.kitchenlab.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--h3LYUU6HlUDSAOzy
Content-Type: multipart/mixed; boundary="f5QefDQHtn8hx44O"
Content-Disposition: inline
--f5QefDQHtn8hx44O
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Mon, Oct 20, 2003 at 08:12:09AM -0700, Bruce A. Mah wrote:
> If memory serves me right, Eric Anderson wrote:
> > Bruce A. Mah wrote:
>=20
> [snip]
>=20
> > >Barring any complications or major objections, I'll tag the doc/ tree=
=20
> > >around 1600, 20 September (PST). (That's 2300, 20 September UTC.)
> > >
> > >Thanks for bearing with us...
> > >
> >=20
> > Must be a rough night - I think you mean October.. :)
>=20
> Grrmph. Yes to both counts. :-)
>=20
> I intend to tag doc/ about eight hours from now.
Could I throw out the idea of committing the attached diff before that
happens? I know that we normally do this after doc/ has been tagged,
but that has always seemed strange to me, as the documentation tagged
as 4.9-RELEASE doesn't contain any references to it.
Of course, the downside is that the website will reflect things that
don't exist yet.
Just an idea,
Ceri
--=20
--f5QefDQHtn8hx44O
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="4.9.diff"
Content-Transfer-Encoding: quoted-printable
Index: en_US.ISO8859-1/articles/hubs/article.sgml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/hubs/article.sgml,v
retrieving revision 1.36
diff -u -r1.36 article.sgml
--- en_US.ISO8859-1/articles/hubs/article.sgml 14 Aug 2003 19:54:05 -0000 1=
=2E36
+++ en_US.ISO8859-1/articles/hubs/article.sgml 20 Oct 2003 15:17:52 -0000
@@ -79,7 +79,7 @@
complete. The CVS repository and the web pages should
always be mirrored completely. Also note that the
numbers stated here are reflecting the current
- state (at 4.8-RELEASE/5.1-RELEASE). Further development and
+ state (at 4.9-RELEASE/5.1-RELEASE). Further development and
releases will only increase the required amount.
Also make sure to keep some (ca. 10-20%) extra space
around just to be sure.
Index: en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgm=
l,v
retrieving revision 1.326
diff -u -r1.326 chapter.sgml
--- en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml 10 Oct 2003 19:54:3=
1 -0000 1.326
+++ en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml 20 Oct 2003 15:21:3=
5 -0000
@@ -4292,6 +4292,15 @@
</varlistentry>
=20
<varlistentry>
+ <term>RELENG_4_9</term>
+
+ <listitem>
+ <para>The release branch for FreeBSD-4.9, used only=20
+ for security advisories and other seriously critical fixes.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>RELENG_4_8</term>
=20
<listitem>
@@ -4380,6 +4389,14 @@
=20
<listitem>
<para>FreeBSD 5.1</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>RELENG_4_9_0_RELEASE</term>
+
+ <listitem>
+ <para>FreeBSD 4.9</para>
</listitem>
</varlistentry>
=20
Index: en_US.ISO8859-1/books/porters-handbook/book.sgml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v
retrieving revision 1.334
diff -u -r1.334 book.sgml
--- en_US.ISO8859-1/books/porters-handbook/book.sgml 17 Oct 2003 17:33:38 -=
0000 1.334
+++ en_US.ISO8859-1/books/porters-handbook/book.sgml 20 Oct 2003 15:22:14 -=
0000
@@ -5169,6 +5169,11 @@
</row>
=20
<row>
+ <entry>4.9-RELEASE</entry>
+ <entry>490000</entry>
+ </row>
+
+ <row>
<entry>5.0-CURRENT</entry>
<entry>500000</entry>
</row>
Index: share/sgml/freebsd.ent
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/doc/share/sgml/freebsd.ent,v
retrieving revision 1.37
diff -u -r1.37 freebsd.ent
--- share/sgml/freebsd.ent 14 Sep 2003 21:21:12 -0000 1.37
+++ share/sgml/freebsd.ent 20 Oct 2003 15:22:35 -0000
@@ -30,8 +30,8 @@
<!ENTITY rel.current.errata 'http://www.FreeBSD.org/releases/&rel.current;=
R/errata.html'>
=20
<!-- Entities for multiple "latest" versions of FreeBSD -->
-<!ENTITY rel2.current CDATA "4.8">
-<!ENTITY rel2.current.date CDATA "March 2003">
+<!ENTITY rel2.current CDATA "4.9">
+<!ENTITY rel2.current.date CDATA "October 2003">
<!ENTITY rel2.current.notes 'http://www.FreeBSD.org/releases/&rel2.current=
;R/notes.html'>
<!ENTITY rel2.current.hardware 'http://www.FreeBSD.org/releases/&rel2.curr=
ent;R/hardware.html'>
<!ENTITY rel2.current.errata 'http://www.FreeBSD.org/releases/&rel2.curren=
t;R/errata.html'>
--f5QefDQHtn8hx44O--
--h3LYUU6HlUDSAOzy
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQE/k/9jocfcwTS3JF8RAjeuAJ9Tv2PEPP7SVybAvZm6A1M5HKt+TQCfeqg5
XaBWVm2a9vGmy1rFBzfmCRU=
=rZiu
-----END PGP SIGNATURE-----
--h3LYUU6HlUDSAOzy--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031020152939.GE3708>