MFV: Import atf-0.18.

Approved by:	rpaulo (mentor)

2 files changed, 2 insertions, 52 deletions

diff --git a/contrib/atf/doc/Makefile.am.inc b/contrib/atf/doc/Makefile.am.inc
deleted file mode 100644
index 858ff04..0000000
--- a/contrib/atf/doc/Makefile.am.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# Copyright (c) 2007 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-dist_man_MANS += doc/atf-test-case.4 \
-                 doc/atf-test-program.1
-
-if ENABLE_TOOLS
-
-man_MANS += doc/atf.7
-CLEANFILES += doc/atf.7
-EXTRA_DIST += doc/atf.7.in
-
-dist_man_MANS += doc/atf-formats.5
-
-doc/atf.7: $(srcdir)/doc/atf.7.in
-	test -d doc || mkdir -p doc
-	sed -e 's#__DOCDIR__#$(docdir)#g' \
-	    -e 's#__TESTSDIR__#$(testsdir)#g' \
-	    <$(srcdir)/doc/atf.7.in >doc/atf.7.tmp
-	mv doc/atf.7.tmp doc/atf.7
-
-endif
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/doc/atf.7.in b/contrib/atf/doc/atf.7.in
index 5fcca44..b11054c 100644
--- a/contrib/atf/doc/atf.7.in
+++ b/contrib/atf/doc/atf.7.in
@@ -34,9 +34,9 @@
 .Nd introduction to the Automated Testing Framework
 .Sh DESCRIPTION
 .Em IMPORTANT: If you are here because you want to know how to run the tests in
-.Em Pa __TESTSDIR__ ,
+.Pa __TESTSDIR__ ,
 .Em you most likely want to read the
-.Em Xr tests 7
+.Xr tests 7
 .Em manual page instead.
 .Pp
 The Automated Testing Framework