Module Name: src
Committed By: msaitoh
Date: Fri Dec 27 10:13:59 UTC 2019
Modified Files:
src/lib/libpuffs: puffs.3
src/share/man/man4/man4.amiga: p5pb.4
Log Message:
s/conjuction/conjunction/
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/lib/libpuffs/puffs.3
cvs rdiff -u -r1.15 -r1.16 src/share/man/man4/man4.amiga/p5pb.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpuffs/puffs.3
diff -u src/lib/libpuffs/puffs.3:1.63 src/lib/libpuffs/puffs.3:1.64
--- src/lib/libpuffs/puffs.3:1.63 Mon Jul 3 21:32:51 2017
+++ src/lib/libpuffs/puffs.3 Fri Dec 27 10:13:59 2019
@@ -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 @@ takes execution context away from the ca
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.
Index: src/share/man/man4/man4.amiga/p5pb.4
diff -u src/share/man/man4/man4.amiga/p5pb.4:1.15 src/share/man/man4/man4.amiga/p5pb.4:1.16
--- src/share/man/man4/man4.amiga/p5pb.4:1.15 Sat Feb 18 22:39:00 2017
+++ src/share/man/man4/man4.amiga/p5pb.4 Fri Dec 27 10:13:59 2019
@@ -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 @@ BlizzardVisionPPC, allowing the attachme
.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
