mrg
Fri Oct 17 02:51:21 PDT 1997
Update of /cvsroot/src/share/doc
In directory netbsd1:/home/mrg/share/doc/shadow

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/share/doc/smm/01.setup/6.t
U src/share/doc/smm/01.setup/3.t
U src/share/doc/smm/01.setup/2.t
U src/share/doc/smm/01.setup/0.t
C src/share/doc/usd/Makefile
U src/share/doc/usd/19.memacros/intro.me
U src/share/doc/usd/20.meref/ref.me
C src/share/doc/psd/Makefile
U src/share/doc/psd/21.ipc/2.t
U src/share/doc/psd/21.ipc/3.t
U src/share/doc/psd/21.ipc/4.t
U src/share/doc/psd/21.ipc/5.t
U src/share/doc/psd/20.ipctut/tutor.me
U src/share/doc/psd/05.sysman/0.t
U src/share/doc/psd/05.sysman/1.0.t
U src/share/doc/psd/05.sysman/1.1.t
U src/share/doc/psd/05.sysman/1.4.t
U src/share/doc/psd/05.sysman/1.5.t
U src/share/doc/psd/05.sysman/1.2.t
U src/share/doc/psd/05.sysman/a.t
U src/share/doc/psd/05.sysman/1.3.t
U src/share/doc/psd/05.sysman/2.3.t
U src/share/doc/psd/05.sysman/1.6.t
U src/share/doc/psd/05.sysman/1.7.t
U src/share/doc/psd/05.sysman/2.0.t
U src/share/doc/psd/05.sysman/2.1.t
U src/share/doc/psd/05.sysman/2.2.t
U src/share/doc/psd/05.sysman/2.4.t
U src/share/doc/psd/05.sysman/2.5.t
U src/share/doc/psd/05.sysman/spell.ok
U src/share/doc/psd/05.sysman/Makefile

2 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/share/doc


lukem
Fri Oct 17 02:54:38 PDT 1997
Update of /cvsroot/src/usr.sbin/iteconfig
In directory netbsd1:/var/slash-tmp/cvs-serv22295

Modified Files:
	iteconfig.8 iteconfig.c 
Log Message:
WARNSify, getopt returns -1 not EOF

mrg
Fri Oct 17 02:59:31 PDT 1997
Update of /cvsroot/src/share/doc/psd
In directory netbsd1:/var/slash-tmp/cvs-serv25270

Modified Files:
	Makefile 
Log Message:
merge lite-2.