From 0d1d7560b1b0ebbe90692c887b0bf04a03609eaa Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Thu, 21 Jan 1999 01:49:15 +0000
Subject: [PATCH] Sync with the 3.0-stable branch event.

---
 en/docs.sgml                 |  6 +++---
 en/internal/machines.sgml    | 12 ++++++------
 en/news/newsflash.sgml       |  8 ++++++--
 en/ports/ports.inc           |  8 ++++----
 en/security/programmers.sgml |  8 ++++----
 en/where.sgml                |  6 +++---
 6 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/en/docs.sgml b/en/docs.sgml
index f63bf6cd4d..c38629421b 100644
--- a/en/docs.sgml
+++ b/en/docs.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$Date: 1999-01-12 23:28:46 $">
+<!ENTITY date "$Date: 1999-01-21 01:49:14 $">
 <!ENTITY title "Documentation">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $Id: docs.sgml,v 1.59 1999-01-12 23:28:46 wosch Exp $ -->
+<!-- $Id: docs.sgml,v 1.60 1999-01-21 01:49:14 jkh Exp $ -->
 
 <html>
 &header;
@@ -183,7 +183,7 @@ the FAQ (EUC encoding) is also available.</p>
     <a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.2.7-RELEASE">2.2.7</a>,
     <a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+2.2.8-RELEASE">2.2.8</a>,
     <a
-    href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+3.0-current">3.0-current</a>,
+    href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+4.0-current">4.0-current</a>,
     <a href="http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+Ports">Ports</a>.
     </dd>
     
diff --git a/en/internal/machines.sgml b/en/internal/machines.sgml
index 2ccdf4b410..f69104eb75 100644
--- a/en/internal/machines.sgml
+++ b/en/internal/machines.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$Date: 1998-11-12 00:34:37 $">
+<!ENTITY date "$Date: 1999-01-21 01:49:14 $">
 <!ENTITY title "The FreeBSD.org Network">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $Id: machines.sgml,v 1.8 1998-11-12 00:34:37 jkh Exp $ -->
+<!-- $Id: machines.sgml,v 1.9 1999-01-21 01:49:14 jkh Exp $ -->
 
 <html>
 &header;
@@ -32,15 +32,15 @@ available and the sorts of jobs they are being provided for.</p>
 
 <tr>
 <td>beast</td>
-<td>3.0-current</td>
+<td>4.0-current</td>
 <td>Alpha box for FreeBSD/alpha testing</td>
 <td>jkh</td>
 </tr>
 
 <tr>
 <td>bento</td>
-<td>3.0-current</td>
-<td>3.0-current package building</td>
+<td>3.0-stable</td>
+<td>3.0-stable package building</td>
 <td>ports team</td>
 </tr>
 
@@ -60,7 +60,7 @@ available and the sorts of jobs they are being provided for.</p>
 
 <tr>
 <td>kickme</td>
-<td>3.0-current</td>
+<td>4.0-current</td>
 <td>Bleeding edge testing</td>
 <td>open</td>
 </tr>
diff --git a/en/news/newsflash.sgml b/en/news/newsflash.sgml
index 28a66b2064..25e10483f2 100644
--- a/en/news/newsflash.sgml
+++ b/en/news/newsflash.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$Date: 1999-01-13 23:04:52 $">
+<!ENTITY date "$Date: 1999-01-21 01:49:14 $">
 <!ENTITY title "FreeBSD News flash!">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
 ]>
-<!-- $Id: newsflash.sgml,v 1.111 1999-01-13 23:04:52 wosch Exp $ -->
+<!-- $Id: newsflash.sgml,v 1.112 1999-01-21 01:49:14 jkh Exp $ -->
 
 <html>
 &header;
@@ -29,6 +29,10 @@ Information</a></strong> page.</p>
 
     <h2>January 1999</h2>
     <ul>
+      <li><b>20-Jan-1999</b> 3.0-stable has now departed the -current
+      branch.  The next release on this branch will be 3.1-RELEASE, in
+      mid-February 1999.</li>
+
       <li><b>13-Jan-1999</b> The <a
       href="http://www.freebsdzine.org/">FreeBSD ezine</a> is a
       monthly collection of easy to read (we hope) articles written by
diff --git a/en/ports/ports.inc b/en/ports/ports.inc
index b190ac42f9..1d29f85428 100644
--- a/en/ports/ports.inc
+++ b/en/ports/ports.inc
@@ -1,4 +1,4 @@
-<!-- $Id: ports.inc,v 1.28 1999-01-14 08:31:34 asami Exp $ -->
+<!-- $Id: ports.inc,v 1.29 1999-01-21 01:49:14 jkh Exp $ -->
 <p>The FreeBSD Ports and Packages Collection offers a simple way for
 users and administrators to install applications.  Each ``port'' listed here
 contains any patches necessary to make the original application source
@@ -56,15 +56,15 @@ to 2.2-stable upgrade kit</a>
 2.2-stable after 2.2.6-release
 <dt><a
 href="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-current/Latest/30upgrade.tgz">3.0
-to 3.0-current upgrade kit</a>
-<dd>For users of 3.0-release or 3.0-current after 3.0-release
+to 3.0-stable upgrade kit</a>
+<dd>For users of 3.0-release or 3.0-stable after 3.0-release
 </dl>
 
 <p>These
 are FreeBSD packages; please use <strong>pkg_add</strong> to install them.  That
 should enable you to use all the ports listed here.  Note that it will
 only change just enough files to enable ports/packages to be used; for
-a full upgrade to 2.2-stable or 3.0-current, please refer to the <a
+a full upgrade to 2.2-stable or 3.0-stable, please refer to the <a
 href="../handbook/synching.html">synchronizing your source tree</a>
 section of the handbook.  A full upgrade is recommended, especially if
 you are still using anything earlier than 2.2.7-release.</p>
diff --git a/en/security/programmers.sgml b/en/security/programmers.sgml
index 6693385090..a9105bbcaf 100644
--- a/en/security/programmers.sgml
+++ b/en/security/programmers.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$Date: 1998-06-24 12:24:54 $">
+<!ENTITY date "$Date: 1999-01-21 01:49:15 $">
 <!ENTITY title "Security Do's and Don'ts for Programmers">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $Id: programmers.sgml,v 1.1 1998-06-24 12:24:54 wosch Exp $ -->
+<!-- $Id: programmers.sgml,v 1.2 1999-01-21 01:49:15 jkh Exp $ -->
 
 <html>
     &header;
@@ -124,7 +124,7 @@
    use context or unidiff format diffs which may be easily fed to patch(1).
    Do not simply send whole files!  Diffs are much easier to read and apply to
    local sources (especially those in which multiple, simultaneous changes
-   may be taking place).  All changes should be relative to 3.0-current
+   may be taking place).  All changes should be relative to 4.0-current
    just so we can all be working from a common base, unless there is strong
    reason in a specific instance to do otherwise.
 
@@ -134,7 +134,7 @@
    being sent obviously broken stuff for review, and it just makes it appear
    as though the submitter didn't even really look at what he was
    doing (which is hardly confidence-building).  If you need accounts
-   on a 2.1, 2.2 or 3.0 machine in order to do proper testing, just
+   on a 2.1, 2.2, 3.0 or 4.0 machine in order to do proper testing, just
    ask - the project has such resources available for just such
    purposes.
 
diff --git a/en/where.sgml b/en/where.sgml
index deb53d3b27..85f5736c93 100644
--- a/en/where.sgml
+++ b/en/where.sgml
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
-<!ENTITY date "$Date: 1998-09-16 08:45:08 $">
+<!ENTITY date "$Date: 1999-01-21 01:49:14 $">
 <!ENTITY title "Getting FreeBSD">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
-<!-- $Id: where.sgml,v 1.27 1998-09-16 08:45:08 wosch Exp $ -->
+<!-- $Id: where.sgml,v 1.28 1999-01-21 01:49:14 jkh Exp $ -->
 
 <html>
 &header;
@@ -52,7 +52,7 @@ CDROM</a></li>
       href="releases/">release information page</a>.
 
     <p>If you're interesting in a purely experimental <strong>snapshot</strong>
-      release of FreeBSD-current (AKA 3.0-current), aimed at developers
+      release of FreeBSD-current (AKA 4.0-current), aimed at developers
       and bleeding-edge testers only, then please see the 
       <a href="ftp://current.freebsd.org/pub/FreeBSD/">daily snapshot
       server</A> FTP site.  This site also contains daily snapshots of
