From f71287a5d1bfde5eb334062a989284121eaaba79 Mon Sep 17 00:00:00 2001
From: jmc <jmc@openbsd.org>
Date: Thu, 16 Apr 2015 20:01:39 +0000
Subject: [PATCH] firmware, not firmwares;

---
 usr.sbin/pkg_add/package.5 | 6 +++---
 usr.sbin/pkg_add/pkg_add.1 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr.sbin/pkg_add/package.5 b/usr.sbin/pkg_add/package.5
index cf9f056b736..477871da212 100644
--- a/usr.sbin/pkg_add/package.5
+++ b/usr.sbin/pkg_add/package.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: package.5,v 1.22 2014/08/10 11:26:07 jasper Exp $
+.\"	$OpenBSD: package.5,v 1.23 2015/04/16 20:01:39 jmc Exp $
 .\" Copyright (c) 2005-2006 Marc Espie <espie@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -12,7 +12,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: August 10 2014 $
+.Dd $Mdocdate: April 16 2015 $
 .Dt PACKAGE 5
 .Os
 .Sh NAME
@@ -178,7 +178,7 @@ Some options are automatically inserted by the package tools:
 Set by
 .Xr fw_update 1
 to trigger firmware-specific handling.
-In particular, firmwares are hidden from normal updates.
+In particular, firmware is hidden from normal updates.
 .It Ar manual-installation
 Record that a package has been explicitly installed by the user,
 and not as a result of a dependency look-up.
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index ed7a9b12df6..58d2bfcb27a 100644
--- a/usr.sbin/pkg_add/pkg_add.1
+++ b/usr.sbin/pkg_add/pkg_add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_add.1,v 1.131 2015/04/16 14:11:29 espie Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.132 2015/04/16 20:01:39 jmc Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -285,7 +285,7 @@ don't filter out package versions older than what's currently installed.
 .It Ar FW_UPDATE
 set by
 .Xr fw_update 1
-to separate firmwares from normal packages.
+to separate firmware from normal packages.
 .It Ar installed
 in update mode, reinstall an existing package with the same update signature.
 .It Ar libdepends
@@ -310,7 +310,7 @@ Defaults to any key matching
 .Sq *pkg
 for packages, and any key matching
 .Sq *fw
-for firmwares.
+for firmware.
 .It Ar unsigned
 allow the installation of unsigned packages without warnings/errors
 (necessary for
-- 
2.20.1