From owner-freebsd-commit  Mon Aug 14 03:46:29 1995
Return-Path: commit-owner
Received: (from majordom@localhost)
          by freefall.FreeBSD.org (8.6.11/8.6.6) id DAA11200
          for commit-outgoing; Mon, 14 Aug 1995 03:46:29 -0700
Received: (from majordom@localhost)
          by freefall.FreeBSD.org (8.6.11/8.6.6) id DAA11187
          for cvs-user-outgoing; Mon, 14 Aug 1995 03:46:25 -0700
Received: from gndrsh.aac.dev.com (gndrsh.aac.dev.com [198.145.92.241])
          by freefall.FreeBSD.org (8.6.11/8.6.6) with ESMTP id DAA11137
          ; Mon, 14 Aug 1995 03:46:13 -0700
Received: (from rgrimes@localhost) by gndrsh.aac.dev.com (8.6.11/8.6.9) id DAA12869; Mon, 14 Aug 1995 03:44:57 -0700
From: "Rodney W. Grimes" <rgrimes@gndrsh.aac.dev.com>
Message-Id: <199508141044.DAA12869@gndrsh.aac.dev.com>
Subject: Re: cvs commit: src/release/sysinstall/help/en_US.ISO_8859-1 hardware.hlp
To: jkh@time.cdrom.com (Jordan K. Hubbard)
Date: Mon, 14 Aug 1995 03:44:57 -0700 (PDT)
Cc: rgrimes@freefall.FreeBSD.org, CVS-commiters@freefall.FreeBSD.org,
        cvs-user@freefall.FreeBSD.org
In-Reply-To: <1243.808379744@time.cdrom.com> from "Jordan K. Hubbard" at Aug 13, 95 10:55:44 pm
X-Mailer: ELM [version 2.4 PL24]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Length: 1229      
Sender: commit-owner@FreeBSD.org
Precedence: bulk

> 
> > rgrimes     95/08/13 18:32:11
> > 
> >   Modified:    release/sysinstall/help/en_US.ISO_8859-1  hardware.hlp
> >   Log:
> >   Add a blurb about running Intel softset.exe to set shared memory address
> >   and amount for EtherExpress 16 cards.
> 
> Was this done in the RELENG_2_1_0 branch?  Now you're starting to
> confuse *me*! :)

No, it was done on the main branch, to the 2.2 version of the file, and
now I see the confusion point:
gndrsh# locate hardware.hlp
/b/ncvs/src/release/sysinstall/help/en_US.ISO8859-1/Attic/hardware.hlp,v
/b/ncvs/src/release/sysinstall/help/en_US.ISO_8859-1/hardware.hlp,v
/usr/src/release/sysinstall/help/en_US.ISO8859-1/hardware.hlp
gndrsh#

I knew there was some reason I just stuck that on the ``do this
some time in the future'' stack.  Arghh.. okay, I am going go pull
the diff out of HEAD, apply it to RELENEG_2_1_0 and smash it off
of HEAD so when we do the merge it will be a copy operation of
en_US.ISO* to en_US.ISO_* again.

Sorry, forgot about this little mess and was trying to clean my pending
stack down to size :-(.


-- 
Rod Grimes                                      rgrimes@gndrsh.aac.dev.com
Accurate Automation Company                 Reliable computers for FreeBSD