summaryrefslogtreecommitdiffstats
path: root/usr.sbin/makefs
diff options
context:
space:
mode:
authoryasuoka <yasuoka@openbsd.org>2017-11-07 00:22:40 +0000
committeryasuoka <yasuoka@openbsd.org>2017-11-07 00:22:40 +0000
commit7fcce3e82dc46e0e09100552cb9cf0f15ad3ec89 (patch)
treeb1a5e73c6faca6f22cde0d717c6740a66542e5c1 /usr.sbin/makefs
parentUse %s and __func__ in DPRINTF() to reduce false positive with grep(1). (diff)
downloadwireguard-openbsd-7fcce3e82dc46e0e09100552cb9cf0f15ad3ec89.tar.xz
wireguard-openbsd-7fcce3e82dc46e0e09100552cb9cf0f15ad3ec89.zip
Tweak the man page and warning message, revert the comma.
Diffstat (limited to 'usr.sbin/makefs')
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_eltorito.c4
-rw-r--r--usr.sbin/makefs/makefs.86
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
index 15712d23f36..cec8a8e3664 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd9660_eltorito.c,v 1.12 2017/10/31 13:36:23 yasuoka Exp $ */
+/* $OpenBSD: cd9660_eltorito.c,v 1.13 2017/11/07 00:22:40 yasuoka Exp $ */
/* $NetBSD: cd9660_eltorito.c,v 1.20 2013/01/28 21:03:28 christos Exp $ */
/*
@@ -108,7 +108,7 @@ cd9660_add_boot_disk(iso9660_disk *diskStructure, const char *boot_info)
new_image->system = ET_SYS_EFI;
else {
warnx("boot disk system must be "
- "i386, macppc, powerpc or efi");
+ "i386, macppc, powerpc, or efi");
free(temp);
free(new_image);
return 0;
diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8
index d4f522e376f..fc623d1f862 100644
--- a/usr.sbin/makefs/makefs.8
+++ b/usr.sbin/makefs/makefs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: makefs.8,v 1.19 2017/10/31 13:36:22 yasuoka Exp $
+.\" $OpenBSD: makefs.8,v 1.20 2017/11/07 00:22:40 yasuoka Exp $
.\" $NetBSD: makefs.8,v 1.55 2015/11/25 16:32:00 wiz Exp $
.\"
.\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: October 31 2017 $
+.Dd $Mdocdate: November 7 2017 $
.Dt MAKEFS 8
.Os
.Sh NAME
@@ -215,7 +215,7 @@ where
is one of
.Ql i386 ,
.Ql macppc ,
-.Ql powerpc
+.Ql powerpc ,
or
.Ql efi .
.It Sy generic-bootimage