Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/man/man7/hier.7,v
rcsdiff: /ftp/cvs/cvsroot/src/share/man/man7/hier.7,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.99.6.1
retrieving revision 1.100
diff -u -p -r1.99.6.1 -r1.100
--- src/share/man/man7/hier.7	2012/06/23 22:54:56	1.99.6.1
+++ src/share/man/man7/hier.7	2012/04/21 12:27:29	1.100
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.99.6.1 2012/06/23 22:54:56 riz Exp $
+.\"	$NetBSD: hier.7,v 1.100 2012/04/21 12:27:29 roy Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)hier.7	8.5 (Berkeley) 6/1/94
 .\"
-.Dd June 3, 2012
+.Dd April 5, 2012
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -321,9 +321,6 @@ database form of master.passwd file; see
 .Xr syslogd 8
 configuration file; see
 .Xr syslog.conf 5
-.It Sy termcap
-terminal type database; see
-.Xr termcap 3
 .It Sy ttys
 terminal initialization information; see
 .Xr ttys 5
@@ -572,23 +569,14 @@ macro package
 .It Sy misc/
 miscellaneous system-wide text files
 .Pp
-<<<<<<< hier.7
-.Bl -tag -width "termcap" -compact
-.It Sy termcap
-=======
-.Bl -tag -width "terminfo.cdb" -compact
+.Bl -tag -width "terminfo.db" -compact
 .It Sy terminfo
->>>>>>> 1.101
 terminal characteristics database;
 see
-<<<<<<< hier.7
-.Xr termcap 5
-=======
 .Xr terminfo 5
-.It Sy terminfo.cdb
+.It Sy terminfo.db
 database form of terminfo file; see
 .Xr tic 1
->>>>>>> 1.101
 .El
 .Pp
 .It Sy mk/
@@ -603,11 +591,6 @@ message catalogs; see
 .Xr catgets 3
 .It Sy skel/
 sample initialization files for new user accounts
-.It Sy tabset/
-tab description files for a variety of terminals, used in
-the termcap file;
-see
-.Xr termcap 5
 .It Sy tmac/
 text processing macros;
 see