[src/trunk]: src s/conjuction/conjunction/

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cb021479cb30
branches:  trunk
changeset: 1005951:cb021479cb30
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Dec 27 10:13:59 2019 +0000

description:
s/conjuction/conjunction/

diffstat:

 lib/libpuffs/puffs.3             |  4 ++--
 share/man/man4/man4.amiga/p5pb.4 |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r e3b6680e3bad -r cb021479cb30 lib/libpuffs/puffs.3
--- a/lib/libpuffs/puffs.3      Fri Dec 27 09:50:27 2019 +0000
+++ b/lib/libpuffs/puffs.3      Fri Dec 27 10:13:59 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: puffs.3,v 1.63 2017/07/03 21:32:51 wiz Exp $
+.\"    $NetBSD: puffs.3,v 1.64 2019/12/27 10:13:59 msaitoh Exp $
 .\"
 .\" Copyright (c) 2006, 2007, 2008 Antti Kantee.  All rights reserved.
 .\"
@@ -107,7 +107,7 @@
 all requests by using the callbacks.
 By using
 .Xr puffs_framebuf 3
-in conjuction with
+in conjunction with
 .Fn puffs_mainloop ,
 it is possible to handle I/O to and from file descriptors.
 This is suited e.g. for distributed file servers.
diff -r e3b6680e3bad -r cb021479cb30 share/man/man4/man4.amiga/p5pb.4
--- a/share/man/man4/man4.amiga/p5pb.4  Fri Dec 27 09:50:27 2019 +0000
+++ b/share/man/man4/man4.amiga/p5pb.4  Fri Dec 27 10:13:59 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: p5pb.4,v 1.15 2017/02/18 22:39:00 wiz Exp $
+.\" $NetBSD: p5pb.4,v 1.16 2019/12/27 10:13:59 msaitoh Exp $
 .\"
 .\" Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -53,7 +53,7 @@
 .Xr genfb 4
 driver.
 3Dfx Voodoo 3 boards installed in G-REX are also supported as console by
-this option in conjuction with the
+this option in conjunction with the
 .Xr voodoofb 4
 driver.
 .Pp