jtc
Wed Nov 30 10:53:14 PST 1994
Update of /b/source/CVS/src/share/man/man7
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/share/man/man7/Makefile
C src/share/man/man7/ascii.7
C src/share/man/man7/environ.7
C src/share/man/man7/hier.7
C src/share/man/man7/hostname.7
C src/share/man/man7/intro.7
C src/share/man/man7/mailaddr.7
N src/share/man/man7/mdoc.7
C src/share/man/man7/mdoc.samples.7
C src/share/man/man7/operator.7

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

	cvs checkout -jCSRG:yesterday -jCSRG src/share/man/man7