From fd43c46559b816aa1cc770b519ce90f6e9cbf936 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Fri, 5 Jul 1996 11:30:22 +0000
Subject: Merge.

---
 handbook/stable.sgml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'handbook/stable.sgml')

diff --git a/handbook/stable.sgml b/handbook/stable.sgml
index 0ca1f74526..784f61b8a7 100644
--- a/handbook/stable.sgml
+++ b/handbook/stable.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: stable.sgml,v 1.2 1996-05-16 23:18:19 mpp Exp $ -->
+<!-- $Id: stable.sgml,v 1.2.2.1 1996-07-05 11:30:22 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 
@@ -10,7 +10,7 @@
 
                         THE FREEBSD STABLE POLICY 
 
-Last updated: $Date: 1996-05-16 23:18:19 $
+Last updated: $Date: 1996-07-05 11:30:22 $
 
 This document attempts to explain the rationale behind
 FreeBSD-stable, what you should expect should you decide to run it,
@@ -45,7 +45,7 @@ next section).
 
 <sect><heading>Using FreeBSD-stable</heading>
 
-    <p><enum><item> Join the freebsd-stable mailing list.  This will
+    <p><enum><item> Join the &a.stable .  This will
     keep you informed of build-dependencies that may appear in
     <em>stable</em> or any other issues requring special attention.
     Developers will also make announcements in this mailing list when
@@ -65,12 +65,12 @@ next section).
         three ways:
 
     <enum>
-	<item> Using the CTM facility described below.  Unless you 
+	<item> Use the <ref id="ctm" name="CTM"> facility.  Unless you 
             have a good TCP/IP connection at a flat rate, this is 
             the way to do it.
 
-        <item>  Use the CMU `sup' program (Software Update
-	     Protocol), also described below.
+        <item>  Use the CMU <ref id="sup"> program (Software Update
+	     Protocol).
             This is the second most recommended method, since it allows 
 	    you to grab the entire collection once and then only what has
             changed from then on.  Many people run sup from cron
@@ -102,7 +102,7 @@ next section).
     <item>  Before compiling stable, read the Makefile in /usr/src
 	carefully.  You should at least run a `make world' the first time
         through as part of the upgrading process.
-        Reading freebsd-stable will keep you up-to-date on other bootstrapping
+        Reading the &a.stable will keep you up-to-date on other bootstrapping
         procedures that sometimes become necessary as we move towards the next
         release.
 </enum>
-- 
cgit v1.2.3