From owner-cvs-user  Sun Jan 19 01:59:49 1997
Return-Path: <owner-cvs-user>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id BAA25318
          for cvs-user-outgoing; Sun, 19 Jan 1997 01:59:49 -0800 (PST)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id BAA25309;
          Sun, 19 Jan 1997 01:59:48 -0800 (PST)
Date: Sun, 19 Jan 1997 01:59:48 -0800 (PST)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199701190959.BAA25309@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/release/sysinstall attr.c config.c devices.c disks.c dist.c doc.c dos.c floppy.c ftp.c install.c installUpgrade.c main.c media.c network.c nfs.c options.c samba.c sysinstall.h system.c tape.c tcpip.c uc_main.c
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         97/01/19 01:59:47

  Branch:      release/sysinstall  RELENG_2_2
  Modified:    release/sysinstall  attr.c config.c devices.c disks.c dist.c
                        doc.c dos.c floppy.c  ftp.c install.c
                        installUpgrade.c main.c media.c network.c  nfs.c
                        options.c samba.c sysinstall.h system.c tape.c
                        tcpip.c  uc_main.c
  Log:
  Syncronize with -current; too many merge lines to really put here.
  
  Revision  Changes    Path
  1.8.2.3   +2 -9      src/release/sysinstall/attr.c
  1.51.2.16 +2 -2      src/release/sysinstall/config.c
  1.49.2.12 +2 -2      src/release/sysinstall/devices.c
  1.70.2.8  +2 -2      src/release/sysinstall/disks.c
  1.73.2.14 +52 -10    src/release/sysinstall/dist.c
  1.19.2.1  +3 -3      src/release/sysinstall/doc.c
  1.14.2.2  +2 -3      src/release/sysinstall/dos.c
  1.16.2.2  +4 -3      src/release/sysinstall/floppy.c
  1.18.2.6  +19 -14    src/release/sysinstall/ftp.c
  1.134.2.21 +27 -18    src/release/sysinstall/install.c
  1.33.2.6  +8 -8      src/release/sysinstall/installUpgrade.c
  1.28.2.5  +2 -2      src/release/sysinstall/main.c
  1.62.2.9  +64 -28    src/release/sysinstall/media.c
  1.16.2.9  +7 -5      src/release/sysinstall/network.c
  1.11.2.3  +3 -3      src/release/sysinstall/nfs.c
  1.44.2.4  +4 -1      src/release/sysinstall/options.c
  1.9.2.3   +2 -3      src/release/sysinstall/samba.c
  1.82.2.14 +8 -1      src/release/sysinstall/sysinstall.h
  1.66.2.5  +27 -1     src/release/sysinstall/system.c
  1.13.2.2  +7 -3      src/release/sysinstall/tape.c
  1.48.2.10 +2 -2      src/release/sysinstall/tcpip.c
  1.13.4.3  +2 -2      src/release/sysinstall/uc_main.c