From owner-cvs-user  Sun Dec 15 10:29:58 1996
Return-Path: <owner-cvs-user>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id KAA19014
          for cvs-user-outgoing; Sun, 15 Dec 1996 10:29:58 -0800 (PST)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id KAA19005;
          Sun, 15 Dec 1996 10:29:56 -0800 (PST)
Date: Sun, 15 Dec 1996 10:29:56 -0800 (PST)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199612151829.KAA19005@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/release/sysinstall/help readme.hlp relnotes.hlp slice.hlp upgrade.hlp usage.hlp usermgmt.hlp src/release/sysinstall installUpgrade.c
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/12/15 10:29:56

  Branch:      release/sysinstall  RELENG_2_2
               release/sysinstall/help  RELENG_2_2
  Modified:    release/sysinstall  installUpgrade.c
               release/sysinstall/help  readme.hlp relnotes.hlp slice.hlp
                        upgrade.hlp usage.hlp  usermgmt.hlp
  Log:
  Merge from HEAD.
  
  Also forgot to mention in previous commit that all the help changes are
  my attempt to update things a bit before 2.2 BETA.
  
  Revision  Changes    Path
  1.33.2.2  +14 -6     src/release/sysinstall/installUpgrade.c
  1.12.2.3  +1 -1      src/release/sysinstall/help/readme.hlp
  1.17.2.5  +8 -3      src/release/sysinstall/help/relnotes.hlp
  1.3.2.1   +18 -19    src/release/sysinstall/help/slice.hlp
  1.6.2.4   +4 -4      src/release/sysinstall/help/upgrade.hlp
  1.4.2.1   +28 -29    src/release/sysinstall/help/usage.hlp
  1.1.2.2   +5 -12     src/release/sysinstall/help/usermgmt.hlp