From 5807fcab1d3e494ff867fb5933ba9019436f068f Mon Sep 17 00:00:00 2001 From: John Fieber Date: Fri, 2 May 1997 14:15:35 +0000 Subject: [PATCH] Merge "staying current", "staying stable" and "synching" into a single chapter. Move "source tree guidelines and policies" out of the dark dungeon of the Appendix. --- handbook/ctm.sgml | 18 +++++++++--------- handbook/current.sgml | 14 +++++++------- handbook/cvsup.sgml | 16 ++++++++-------- handbook/handbook.sgml | 22 ++++++++++++++++------ handbook/stable.sgml | 12 ++++++------ handbook/sup.sgml | 8 ++++---- handbook/synching.sgml | 6 +++--- 7 files changed, 53 insertions(+), 43 deletions(-) diff --git a/handbook/ctm.sgml b/handbook/ctm.sgml index aac742974e..4ee9fcc14a 100644 --- a/handbook/ctm.sgml +++ b/handbook/ctm.sgml @@ -3,7 +3,7 @@ # # Converted by Ollivier Robert # -# $Id: ctm.sgml,v 1.16 1997-04-19 10:40:45 gpalmer Exp $ +# $Id: ctm.sgml,v 1.17 1997-05-02 14:15:33 jfieber Exp $ # # ---------------------------------------------------------------------------- # "THE BEER-WARE LICENSE" (Revision 42): @@ -14,7 +14,7 @@ # --> -CTM +CTM

Contributed by &a.phk;. Updated 16-Mar-1995. @@ -25,7 +25,7 @@ this time on the process of creating deltas, so talk to &a.phk; for more information should you wish to use Why should I use + Why should I use

. - What do I need to use + What do I need to use

You will need two things: The ``Starting off with + Starting off with

Before you can start using Using + Using

To apply the deltas, simply say cd /where/ever/you/want/the/stuff @@ -136,7 +136,7 @@ make a copy. - Future plans for + Future plans for

Tons of them: @@ -161,7 +161,7 @@ The bad news is that I am very busy, so any help in doing this will be most welcome. And do not forget to tell me what you want also... - Miscellaneous stuff + Miscellaneous stuff

All the ``DES infected'' (e.g. export controlled) source is not included. You will get the ``international'' version only. If @@ -184,7 +184,7 @@ for details. - Thanks! + Thanks!

+ -Staying current with FreeBSD +Staying current with FreeBSD

Contributed by &a.jkh;. @@ -10,7 +10,7 @@ THE FREEBSD CURRENT POLICY -Last updated: $Date: 1997-02-22 12:58:16 $ +Last updated: $Date: 1997-05-02 14:15:34 $ This document attempts to explain the rationale behind FreeBSD-current, what you should expect should you decide to run it, @@ -18,7 +18,7 @@ and states some prerequisites for making sure the process goes as smoothly as possible. --> -What is FreeBSD-current? +What is FreeBSD-current?

FreeBSD-current is, quite literally, nothing more than a daily snapshot of the working sources for FreeBSD. These include work in @@ -37,7 +37,7 @@ getting something tested, not because we are in the business of providing binary releases of current. If we do not offer, please do not ask! It takes far too much time to do this as a general task. -Who needs FreeBSD-current? +Who needs FreeBSD-current?

FreeBSD-current is made generally available for 3 primary interest groups: @@ -57,7 +57,7 @@ ask! It takes far too much time to do this as a general task. people also make the occasional comment or contribute code. -What is FreeBSD-current NOT? +What is FreeBSD-current NOT?

A fast-track to getting pre-release bits because you heard there is @@ -79,7 +79,7 @@ ask! It takes far too much time to do this as a general task. improve FreeBSD, most of you would vote for us improving it. -Using FreeBSD-current +Using FreeBSD-current

Join the &a.current and the &a.cvsall . This is not just a good idea, it is essential. diff --git a/handbook/cvsup.sgml b/handbook/cvsup.sgml index 2251aa5f12..36715f251f 100644 --- a/handbook/cvsup.sgml +++ b/handbook/cvsup.sgml @@ -1,11 +1,11 @@ - + -CVSup +CVSup

Contributed by &a.jdp;. -Introduction +Introduction

CVSup is a software package for distributing and updating source trees from a master CVS repository on a remote server host. The @@ -33,7 +33,7 @@ way as sup and, in fact, uses configuration files which are backward-compatible with sup's. Sup is no longer used in the FreeBSD project, however, because CVSup is both faster and more flexible. -Installation +Installation

The easiest way to install CVSup if you are running FreeBSD 2.2 or later is to use either FreeBSD-2.1.5 or earlier: static binary -Configuration +Configuration

CVSup's operation is controlled by a configuration file called the "supfile". Beginning with FreeBSD-2.2, there are some sample supfiles @@ -340,7 +340,7 @@ substantially. -Running CVSup +Running CVSup

You are now ready to try an update. The command line for doing this is quite simple: @@ -398,7 +398,7 @@ type "cvsup -H". For more detailed descriptions, see the manual page. for regular runs of cvsup using cron(8). Obviously, you should not let cvsup use its GUI when running it from cron. -CVSup File Collections +CVSup File Collections

The file collections available via CVSup are organized hierarchically. There are a few large collections, and they are @@ -558,7 +558,7 @@ The CVS repository for the SMP project. The installed World Wide Web data. Used by WWW mirror sites. -Announcements, Questions, and Bug Reports +Announcements, Questions, and Bug Reports

Most FreeBSD-related discussion of CVSup takes place on the &a.hackers;. New versions of the software are announced there, as diff --git a/handbook/handbook.sgml b/handbook/handbook.sgml index e8ea0b416c..3fd0773bb5 100644 --- a/handbook/handbook.sgml +++ b/handbook/handbook.sgml @@ -1,4 +1,4 @@ - + or one of the numerous Advanced topics - ¤t; - &stable; - &synching; + The Cutting Edge: FreeBSD-current and FreeBSD-stable +

FreeBSD is under constant development between releases. For + people who want to be on the cutting edge, there are several + easy mechanisms for keeping your system in sync with the latest + developments. Be warned: the cutting edge is not for everyone! + This chapter will help you decide if you want to track the development + system, or stick with one of the released versions.

+ + ¤t; + &stable; + &synching; + + &submitters; - &kerneldebug; + &policies; &kernelopts; + &kerneldebug; &linuxemu; FreeBSD internals &booting; @@ -164,7 +175,6 @@ name="FreeBSD FTP server"> or one of the numerous &bibliography; &eresources; &contrib; - &policies; &pgpkeys; diff --git a/handbook/stable.sgml b/handbook/stable.sgml index 73e75b274c..26ce64629a 100644 --- a/handbook/stable.sgml +++ b/handbook/stable.sgml @@ -1,8 +1,8 @@ - + -Staying stable with FreeBSD +Staying stable with FreeBSD

Contributed by &a.jkh;. @@ -10,7 +10,7 @@ THE FREEBSD STABLE POLICY -Last updated: $Date: 1997-03-19 03:22:29 $ +Last updated: $Date: 1997-05-02 14:15:34 $ This document attempts to explain the rationale behind FreeBSD-stable, what you should expect should you decide to run it, @@ -18,14 +18,14 @@ and states some prerequisites for making sure the process goes as smoothly as possible. --> -What is FreeBSD-stable? +What is FreeBSD-stable?

FreeBSD-stable is our development branch for a more low-key and conservative set of changes intended for our next mainstream release. Changes of an experimental or untested nature do not go into this branch (see ). -Who needs FreeBSD-stable? +Who needs FreeBSD-stable?

If you are a commercial user or someone who puts maximum stability of their FreeBSD system before all other concerns, you should consider tracking @@ -43,7 +43,7 @@ our tests fail to catch every case. If something breaks for you in stable, please let us know immediately! (see next section). -Using FreeBSD-stable +Using FreeBSD-stable

Join the &a.stable . This will keep you informed of build-dependencies that may appear in diff --git a/handbook/sup.sgml b/handbook/sup.sgml index dbc1b9c5f3..a51aa710a3 100644 --- a/handbook/sup.sgml +++ b/handbook/sup.sgml @@ -1,15 +1,15 @@ - + -SUP +SUP

Contributed by &a.jkh; and &a.gclarkii;. SUP is a network based software update tool developed at CMU. The purpose of this document is get the beginner up and running with sup. -Configuration +Configuration

SUP gets the information it needs to run from a configuration file called a supfile. There are different example supfiles provided @@ -69,7 +69,7 @@ a -current user. If you are using the stable-supfile, please join the &a.stable and read . -Distributions

For the main FreeBSD distribution using the standard-supfile: diff --git a/handbook/synching.sgml b/handbook/synching.sgml index a982366e76..c0957924d6 100644 --- a/handbook/synching.sgml +++ b/handbook/synching.sgml @@ -1,13 +1,13 @@ - + -Synchronizing source trees over the Internet +Synchronizing source trees over the Internet

Contributed by &a.jkh;.