diff options
author | obrien <obrien@FreeBSD.org> | 1999-03-15 09:18:28 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 1999-03-15 09:18:28 +0000 |
commit | ff0a2d0776901e085004ea2ac05b99f8b4228d13 (patch) | |
tree | 0527d0049f5bd713565fed6066e33a7177d83c81 /contrib | |
parent | fa973cd0a2206f5cdac3b6822b8d7737a38ffd39 (diff) | |
download | FreeBSD-src-ff0a2d0776901e085004ea2ac05b99f8b4228d13.zip FreeBSD-src-ff0a2d0776901e085004ea2ac05b99f8b4228d13.tar.gz |
Fix conflicts.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/groff/groff/groff.man | 3 | ||||
-rw-r--r-- | contrib/groff/src/roff/groff/groff.man | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/contrib/groff/groff/groff.man b/contrib/groff/groff/groff.man index ab12494..9858f71 100644 --- a/contrib/groff/groff/groff.man +++ b/contrib/groff/groff/groff.man @@ -100,6 +100,9 @@ For typewriter-like devices .TP .B latin1 For typewriter-like devices using the ISO Latin-1 character set. +.TP +.B lj4 +For an HP LaserJet4-compatible (or other PCL5-compatible) printer. .TP .B koi8-r For typewriter-like devices using the russian KOI8-R character set. diff --git a/contrib/groff/src/roff/groff/groff.man b/contrib/groff/src/roff/groff/groff.man index ab12494..9858f71 100644 --- a/contrib/groff/src/roff/groff/groff.man +++ b/contrib/groff/src/roff/groff/groff.man @@ -100,6 +100,9 @@ For typewriter-like devices .TP .B latin1 For typewriter-like devices using the ISO Latin-1 character set. +.TP +.B lj4 +For an HP LaserJet4-compatible (or other PCL5-compatible) printer. .TP .B koi8-r For typewriter-like devices using the russian KOI8-R character set. |