diff --git a/handbook/Makefile b/handbook/Makefile index 6839fbab81..47f6900be3 100644 --- a/handbook/Makefile +++ b/handbook/Makefile @@ -1,18 +1,18 @@ -# $Id: Makefile,v 1.19 1996-11-28 18:09:24 jfieber Exp $ +# $Id: Makefile,v 1.20 1996-12-19 20:24:36 jkh Exp $ SRCS= authors.sgml basics.sgml bibliography.sgml boothelp.sgml -SRCS+= booting.sgml contrib.sgml crypt.sgml ctm.sgml current.sgml +SRCS+= booting.sgml contrib.sgml crypt.sgml ctm.sgml current.sgml cvsup.sgml SRCS+= cyclades.sgml development.sgml dialup.sgml dialout.sgml SRCS+= diskless.sgml dma.sgml eresources.sgml esdi.sgml SRCS+= firewalls.sgml glossary.sgml goals.sgml SRCS+= handbook.sgml history.sgml hw.sgml install.sgml isdn.sgml SRCS+= kerberos.sgml kernelconfig.sgml kerneldebug.sgml SRCS+= lists.sgml mail.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 SRCS+= serial.sgml scsi.sgml sections.sgml sio.sgml skey.sgml slipc.sgml SRCS+= slips.sgml stable.sgml submitters.sgml sup.sgml synching.sgml SRCS+= term.sgml troubleshooting.sgml userppp.sgml uart.sgml linuxemu.sgml .include diff --git a/handbook/sections.sgml b/handbook/sections.sgml index 4dbb1067e5..b24f2ab2f8 100644 --- a/handbook/sections.sgml +++ b/handbook/sections.sgml @@ -1,60 +1,61 @@ - + + diff --git a/handbook/sup.sgml b/handbook/sup.sgml index ed7a9dd834..a64f0ab4f8 100644 --- a/handbook/sup.sgml +++ b/handbook/sup.sgml @@ -1,158 +1,159 @@ - + 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. -Getting setup +Configuration

SUP gets the information it needs to run from a configuration file called a supfile. There are different example supfiles provided for different source releases of FreeBSD. The - file, for example, contains sup information for the latest standard FreeBSD source distributions - it tells sup what collections it will be updating and/or installing and where they go. Someone using this particular supfile is said to be supping .

For ports, please have a look at -.

If you are interested in obtaining the - files + files that make up the source tree, refer to -.

If you would rather track changes to the -stable branch, refer to - instead. If you are inside the United States, you may also uncomment the `secure' and `eBones' collection lines to grab the DES code. If you are outside the U.S., you should NOT sup this code from sup.FreeBSD.ORG as this will violate U.S. export restrictions. Instead you should use the - in the sup examples directory. This will connect you to the international sup site that contains a secure distribution. Any distributions you do not wish to receive can be commented out with a # at the beginning of the distribution line. Please consult the file - for a list of alternate sup servers. The default sup server (sup.FreeBSD.ORG) listed in the above example files is currently overloaded and any traffic that can be transfered to a different host will help relieve some of the strain. Once this is setup, you are ready to go. To start sup type: sup supfile If you wish to see what sup is doing "verbosely", give it the -v option, like so: sup -v supfile Thats all there is to it! Remember that if you are running current, which is what you will have if you sup with the standard-supfile, please join the &a.current . You should also be sure to read for important information on just what we can and cannot do for you as a -current user. If you are using the stable-supfile, please join the &a.stable and read . -Description of FreeBSD SUP distributions +Distributions

For the main FreeBSD distribution using the standard-supfile: src-base: /usr/src/... misc files at the top of /usr/src src-bin: /usr/src/bin user and system binaries src-secure: /usr/src/secure DES Sources (US/Canada ONLY) src-eBones: /usr/src/eBones Kerberos and DES (US/Canada ONLY) src-etc: /usr/src/etc system files src-games: /usr/src/games games src-gnu: /usr/src/gnu sources under the GNU Public License src-include: /usr/src/include include files src-sys: /usr/src/sys kernel sources src-lib: /usr/src/lib libraries src-libexec: /usr/src/libexec system binaries src-release: /usr/src/release sources required to build a release src-share: /usr/src/share various shared resources src-sbin: /usr/src/sbin single user system binaries src-tools: /usr/src/tools various management tools src-usrbin: /usr/src/usr.bin user binaries src-usrsbin: /usr/src/usr.sbin system binaries

For the international FreeBSD distribution using the secure-supfile: src-secure: /usr/src/secure DES Sources src-eBones: /usr/src/eBones Kerberos and DES

There is also a collection including all of the above, except for either (domestic or international) versions of the export-restricted software (i.e., src-secure and src-eBones collections): src-all: /usr/src the whole operating system (almost)

And for the ports collection: ports-base: /usr/ports/... misc files at the top of /usr/ports ports-archivers: /usr/ports/archivers archiving tools ports-astro: /usr/ports/astro astronomical ports ports-audio: /usr/ports/audio sound support ports-benchmarks: /usr/ports/benchmarks benchmarks ports-cad: /usr/ports/cad CAD tools ports-chinese: /usr/ports/chinese Chinese support ports-comms: /usr/ports/comms communication software ports-databases: /usr/ports/databases databases ports-devel: /usr/ports/devel development utilities ports-editors: /usr/ports/editors editors ports-emulators: /usr/ports/emulators emulators for other OSes ports-games: /usr/ports/games games ports-graphics: /usr/ports/graphics various graphics utilities ports-japanese: /usr/ports/japanese Japanese support ports-lang: /usr/ports/lang programming languages ports-mail: /usr/ports/mail mail software ports-math: /usr/ports/math numerical computation software ports-mbone: /usr/ports/mbone MBone applications ports-misc: /usr/ports/misc miscellaneous utilities ports-net: /usr/ports/net networking software ports-news: /usr/ports/news USENET news software ports-plan9: /usr/ports/plan9 various programs from Plan9 ports-print: /usr/ports/print printing software ports-russian: /usr/ports/russian Russian support ports-security: /usr/ports/security ``security'' utilities, for better or for worse ports-shells: /usr/ports/shells various UN*X shells ports-sysutils: /usr/ports/sysutils system utilities ports-vietnamese: /usr/ports/vietnamese Vietnamese support ports-www: /usr/ports/www software related to the world wide web ports-x11: /usr/ports/x11 X11 software

There is also a collection including all of the above: ports-all: /usr/ports the whole ports tree diff --git a/handbook/synching.sgml b/handbook/synching.sgml index d9eb695ec8..8a13fc89fd 100644 --- a/handbook/synching.sgml +++ b/handbook/synching.sgml @@ -1,68 +1,50 @@ - + Synchronizing source trees over the Internet

Contributed by &a.jkh;.

There are various ways of using an Internet (or email) connection to stay up-to-date with any given area of the FreeBSD project sources, or all areas, depending on what interests you. The primary -services we offer are CTM, SUP and CVSup (new). +services we offer are CVSup and CTM. -

It's been suggested by some that CTM obsoletes SUP. This isn't quite -true, in fact, because each tool was originally designed to serve a -different constituency and, although they have both undergone significant -improvement since first going into service, they take fundamentally -different approaches in trying to solve the source synchronization problem. -SUP was originally designed to support those who had dedicated (or at -least fast) Internet connections whereas CTM was originally aimed at -supporting those who's access was limited to email only. - -

SUP (Software Update Protocol) is a system that tracks a local -copy of the FreeBSD sources on your local disk and, using configuration files -the user sets up, makes requests over the network to fetch and update any -files which have changed on the FreeBSD master archive. +

CVSup is the new kid on the block, it does everything that sup +did and more, doing it also far more effeciently in terms of its demands +on server disk space and network resources. Because of this, CVSup has +largely replaced in the FreeBSD Project. Like sup, it also +operates on a pull syncronization model.

CTM, on the other hand, does not interactively compare -the sources you have with those on the master archive. -Instead, a script which identifies changes in files since its previous run -is executed several times a day on the master archive, any detected changes -being compressed, stamped with a sequence-number and encoded for transmission -over email (printable ASCII only). Once received, these "CTM deltas" can then -be handed to the ctm_rmail(1) utility which will automatically decode, verify +the sources you have with those on the master archive. Instead, a script +which identifies changes in files since its previous run is executed several +times a day on the master archive, any detected changes being compressed, +stamped with a sequence-number and encoded for transmission over email +(printable ASCII only). Once received, these "CTM deltas" can then be +handed to the ctm_rmail(1) utility which will automatically decode, verify and apply the changes to the user's copy of the sources. This process is -far more efficient than SUP, and places less strain on our server resources +far more efficient than CVSup, and places less strain on our server resources since it's a push rather than a pull model. -

There are other trade-offs, of course. With SUP, you can also -inadvertently wipe out portions of your archive and SUP will detect +

There are other trade-offs, of course. With CVSup, you can also +inadvertently wipe out portions of your archive and CVSup will detect and rebuild the damaged portions for you. CTM won't do this, and if you wipe some portion of your source tree out (and don't have it backed up) then you will have to start from scratch (from the most recent CVS "base delta") and rebuild it all. -

More recently, the waters have been muddied even more by -the introduction of the CVSup utility, a highly efficient -replacement for SUP which also offers access to any branch of FreeBSD -development from a single CVS repository (which, in turn, can also be -transferred non-destructively with CVSup - any local developer work on -independent branches is preserved). It overcomes many of SUP's shortcomings -and may be from our development server, where additional documentation -is also provided. Both the CVSup client and server are compatible with -the sup and supfilesrv distribution file formats. - -For more information on SUP and CTM, please see one of the following -sections: +For more information on CTM, CVSup or the now largely-obsolete sup, please +see one of the following sections: - ⊃ &ctm; + &cvsup; + ⊃