From 92ee29d2a59b9864be5b69f5ec9d249421f9b0ef Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 24 Nov 2000 10:05:30 +0000
Subject: [PATCH] Reimplement the groff(1) warnings elimination fixes in a
 better way.

---
 share/doc/psd/12.make/Makefile           |  2 +-
 usr.bin/make/PSD.doc/{stubs.ms => stubs} |  1 +
 usr.bin/make/PSD.doc/tutorial.ms         | 14 ++++----------
 3 files changed, 6 insertions(+), 11 deletions(-)
 rename usr.bin/make/PSD.doc/{stubs.ms => stubs} (75%)

diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile
index c975c7941c4..b266f9b6f95 100644
--- a/share/doc/psd/12.make/Makefile
+++ b/share/doc/psd/12.make/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 VOLUME=	psd/12.make
-SRCS=	stubs.ms tutorial.ms
+SRCS=	tutorial.ms
 MACROS=	-ms
 SRCDIR=	${.CURDIR}/../../../../usr.bin/make/PSD.doc
 
diff --git a/usr.bin/make/PSD.doc/stubs.ms b/usr.bin/make/PSD.doc/stubs
similarity index 75%
rename from usr.bin/make/PSD.doc/stubs.ms
rename to usr.bin/make/PSD.doc/stubs
index 63c4c144167..39d8defe2e1 100644
--- a/usr.bin/make/PSD.doc/stubs.ms
+++ b/usr.bin/make/PSD.doc/stubs
@@ -6,3 +6,4 @@
 ..
 .de Rm
 ..
+.if n .ftr CR R
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index 052ba581dac..db2d04eb2fd 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -37,6 +37,7 @@
 .\"	@(#)tutorial.ms	8.1 (Berkeley) 8/18/93
 .\" $FreeBSD$
 .\"
+.so stubs
 .EH 'PSD:12-%''PMake \*- A Tutorial'
 .OH 'PMake \*- A Tutorial''PSD:12-%'
 .\" xH is a macro to provide numbered headers that are automatically stuffed
@@ -59,22 +60,15 @@
 .XE
 .nr PD .3v
 ..
+.ig
 .\" CW is used to place a string in fixed-width or switch to a
 .\" fixed-width font.
 .\" C is a typewriter font for a laserwriter. Use something else if
 .\" you don't have one...
-.ie n \{\
 .de CW
-.ie !\\n(.$ .ft R
-.el \&\\$3\fR\\$1\fP\\$2
+.ie !\\n(.$ .ft S
+.el \&\\$3\fS\\$1\fP\\$2
 ..
-.\}
-.el \{\
-.de CW
-.ie !\\n(.$ .ft C
-.el \&\\$3\fC\\$1\fP\\$2
-..
-.\}
 .\" Anything I put in a display I want to be in fixed-width
 .am DS
 .CW