From 070ee439e817f07a73ec480748fe924ba728fb01 Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@FreeBSD.org>
Date: Sun, 15 Mar 1998 15:10:21 +0000
Subject: [PATCH] Add a new (small) section to the handbook, which links to my
 'make world' tutorial. Update various places in the handbook that say 'make
 world' to link to this new section.

PR:		docs/5853
Reviewed by:	jkh (sort of)
---
 handbook/Makefile       |  4 ++--
 handbook/current.sgml   | 10 +++++-----
 handbook/handbook.sgml  |  3 ++-
 handbook/hw.sgml        | 12 ++++++------
 handbook/makeworld.sgml | 26 ++++++++++++++++++++++++++
 handbook/sections.sgml  |  3 ++-
 handbook/stable.sgml    | 14 +++++++-------
 7 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 handbook/makeworld.sgml

diff --git a/handbook/Makefile b/handbook/Makefile
index 64f57df3d7..49665c5440 100644
--- a/handbook/Makefile
+++ b/handbook/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.29 1998-02-19 06:45:26 asami Exp $
+# $Id: Makefile,v 1.30 1998-03-15 15:10:01 nik Exp $
 
 SGMLOPTS=-links
 SRCS= authors.sgml basics.sgml bibliography.sgml boothelp.sgml
@@ -8,7 +8,7 @@ SRCS+= diskless.sgml dma.sgml eresources.sgml esdi.sgml
 SRCS+= firewalls.sgml german.sgml glossary.sgml goals.sgml
 SRCS+= handbook.sgml history.sgml hw.sgml install.sgml isdn.sgml 
 SRCS+= kerberos.sgml kernelconfig.sgml kerneldebug.sgml kernelopts.sgml
-SRCS+= lists.sgml mail.sgml memoryuse.sgml
+SRCS+= lists.sgml mail.sgml makeworld.sgml memoryuse.sgml
 SRCS+= mirrors.sgml nfs.sgml nutshell.sgml pgpkeys.sgml policies.sgml
 SRCS+= porting.sgml ports.sgml ppp.sgml printing.sgml 
 SRCS+= quotas.sgml relnotes.sgml routing.sgml russian.sgml
diff --git a/handbook/current.sgml b/handbook/current.sgml
index a832e198c9..4fbcfae241 100644
--- a/handbook/current.sgml
+++ b/handbook/current.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: current.sgml,v 1.23 1997-09-02 08:22:31 jkh Exp $ -->
+<!-- $Id: current.sgml,v 1.24 1998-03-15 15:10:05 nik Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 
@@ -10,7 +10,7 @@
 
                         THE FREEBSD CURRENT POLICY 
 
-Last updated: $Date: 1997-09-02 08:22:31 $
+Last updated: $Date: 1998-03-15 15:10:05 $
 
 This document attempts to explain the rationale behind
 FreeBSD-current, what you should expect should you decide to run it,
@@ -143,9 +143,9 @@ subscribe cvs-all
     guaranteed to get you into trouble.
 
     <item>  Before compiling current, 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 the &a.current will keep you up-to-date on other
+        carefully.  You should at least run a `<ref id="makeworld"
+        name="make world">' the first time through as part of the upgrading
+        process. Reading the &a.current will keep you up-to-date on other
         bootstrapping procedures that sometimes become necessary as we move
         towards	the next release.
 
diff --git a/handbook/handbook.sgml b/handbook/handbook.sgml
index e0344a9989..45cf460ae6 100644
--- a/handbook/handbook.sgml
+++ b/handbook/handbook.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: handbook.sgml,v 1.81 1997-11-18 16:06:08 wosch Exp $ -->
+<!-- $Id: handbook.sgml,v 1.82 1998-03-15 15:10:06 nik Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -153,6 +153,7 @@ name="FreeBSD FTP server"> or one of the numerous
       &current;
       &stable;
       &synching; 
+      &makeworld;
     </chapt>
 
     &submitters;
diff --git a/handbook/hw.sgml b/handbook/hw.sgml
index d9dd4397f3..e5112c2cc7 100644
--- a/handbook/hw.sgml
+++ b/handbook/hw.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: hw.sgml,v 1.79 1998-02-19 06:45:27 asami Exp $ -->
+<!-- $Id: hw.sgml,v 1.80 1998-03-15 15:10:11 nik Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
@@ -86,11 +86,11 @@ Slippery when wet.  Beware of dog.
     drops have dropped P6 systems into a very affordable price bracket,
     at least in the United States, and for serious server applications you
     may wish to look no further than the Pentium Pro.  My personal
-    `make world' times dropped from 3 hours and 40 minutes with a P5/166
-    to 1 hour and 22 minutes when I upgraded to a P6/200 machine - not
-    a fair comparison, to be sure, but just to note that in terms of
-    increased productivity, the P6/200 has definitely been worth the upgrade
-    for me.
+    `<ref id="makeworld" name="make world">' times dropped from 3 hours and
+    40 minutes with a P5/166 to 1 hour and 22 minutes when I upgraded to a
+    P6/200 machine - not a fair comparison, to be sure, but just to note
+    that in terms of increased productivity, the P6/200 has definitely been
+    worth the upgrade for me.
 
     NOTE: The Intel motherboards are designed to a different form-factor
     and hence require <em>an entirely different PC case</em>, the so-called
diff --git a/handbook/makeworld.sgml b/handbook/makeworld.sgml
new file mode 100644
index 0000000000..c2eab39013
--- /dev/null
+++ b/handbook/makeworld.sgml
@@ -0,0 +1,26 @@
+<!-- $Id: makeworld.sgml,v 1.1 1998-03-15 15:10:16 nik Exp $ -->
+<!-- The FreeBSD Documentation Project -->
+
+<sect><heading>Using <bf>make world</bf> to rebuild your system<label id="makeworld"></heading>
+
+<p><em>Contributed by &a.nik;.</em>
+
+<!--
+
+Last updated: $Date: 1998-03-15 15:10:16 $
+
+This document is a placeholder for the "How to run 'make world'" section.
+Currently, it just links to my tutorial. It is intended that, once the
+Handbook has been converted, the tutorial referenced here will be slightly
+rewritten and used here.    
+-->
+
+    <p>Once you have synchronised your local source tree against a particular
+      version of FreeBSD (<tt>stable</tt>, <tt>current</tt> and so on) you
+      must then use the source tree to rebuild the system.</p>
+
+    <p>Currently, the best source of information on how to do that is a
+      tutorial available from <htmlurl
+        url="http://www.nothing-going-on.demon.co.uk/FreeBSD/make-world/make-world.html" name="http://www.nothing-going-on.demon.co.uk/FreeBSD/make-world/make-world.html">.</p>
+
+    <p>A successor to this tutorial will be integrated into the handbook.</p>
diff --git a/handbook/sections.sgml b/handbook/sections.sgml
index 0bbf888961..8033f8bab8 100644
--- a/handbook/sections.sgml
+++ b/handbook/sections.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: sections.sgml,v 1.27 1998-02-19 06:45:30 asami Exp $ -->
+<!-- $Id: sections.sgml,v 1.28 1998-03-15 15:10:18 nik Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- Entities containing all the pieces of the handbook are -->
@@ -35,6 +35,7 @@
 <!ENTITY kernelopts SYSTEM "kernelopts.sgml">
 <!ENTITY linuxemu SYSTEM "linuxemu.sgml">
 <!ENTITY mail SYSTEM "mail.sgml">
+<!ENTITY makeworld SYSTEM "makeworld.sgml">
 <!ENTITY memoryuse SYSTEM "memoryuse.sgml">
 <!ENTITY mirrors SYSTEM "mirrors.sgml">
 <!ENTITY nfs SYSTEM "nfs.sgml">
diff --git a/handbook/stable.sgml b/handbook/stable.sgml
index 09fe68c103..d08d0cb6fb 100644
--- a/handbook/stable.sgml
+++ b/handbook/stable.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: stable.sgml,v 1.16 1997-10-21 16:14:26 max Exp $ -->
+<!-- $Id: stable.sgml,v 1.17 1998-03-15 15:10:21 nik Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 
@@ -10,7 +10,7 @@
 
                         THE FREEBSD STABLE POLICY 
 
-Last updated: $Date: 1997-10-21 16:14:26 $
+Last updated: $Date: 1998-03-15 15:10:21 $
 
 This document attempts to explain the rationale behind
 FreeBSD-stable, what you should expect should you decide to run it,
@@ -100,9 +100,9 @@ next section).
     Otherwise, use CTM.
 
     <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 the &a.stable will keep you up-to-date on other bootstrapping
-        procedures that sometimes become necessary as we move towards the next
-        release.
+      carefully.  You should at least run a `<ref id="makeworld"
+      name="make world">' the first time through as part of the upgrading
+      process. 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>