summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2014-02-11 08:58:35 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2014-02-11 08:58:35 +0000
commitb37dfde00c21e172ed31d8c129ac831fd64b6d21 (patch)
treeb9a2ccf7fcf9ce18172f29c6458fb23d55fc7ed2
parent328d3819b373681695aa379fd5199f57eee1d980 (diff)
s/anyways/anyway/, ok espie@
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PkgAdd.pm8
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PkgDelete.pm4
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Replace.pm4
-rw-r--r--usr.sbin/pkg_add/pkg_check.86
4 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index a1087148dcf..89c490eee35 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: PkgAdd.pm,v 1.60 2014/02/08 12:18:14 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.61 2014/02/11 08:58:34 sthen Exp $
#
# Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
#
@@ -520,7 +520,7 @@ sub check_forward_dependencies
$state->errsay("Forcing update");
return $no_merge;
} elsif ($state->{interactive}) {
- if ($state->confirm("Proceed with update anyways", 0)) {
+ if ($state->confirm("Proceed with update anyway", 0)) {
return $no_merge;
} else {
return undef;
@@ -635,7 +635,7 @@ sub iterate
}
}
} while ($something_done);
- # if we can't do stuff in order, do it anyways
+ # if we can't do stuff in order, do it anyway
for my $c (@_) {
next if $done->{$c->pkgname};
&$sub($c);
@@ -668,7 +668,7 @@ sub check_digital_signature
if ($state->{interactive}) {
$state->errprint('UNSIGNED PACKAGE #1: ',
$pkgname);
- $okay = $state->confirm("install anyways", 0);
+ $okay = $state->confirm("install anyway", 0);
}
if (!$okay) {
$state->fatal("Unsigned package #1", $pkgname);
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
index b959b9aebaf..c79f09f49d8 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: PkgDelete.pm,v 1.31 2014/02/08 16:21:54 espie Exp $
+# $OpenBSD: PkgDelete.pm,v 1.32 2014/02/11 08:58:34 sthen Exp $
#
# Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
#
@@ -282,7 +282,7 @@ sub fix_bad_dependencies
return 1;
}
if ($state->{interactive}) {
- return $state->confirm("Delete anyways", 0);
+ return $state->confirm("Delete anyway", 0);
}
return 0;
}
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm
index f9ae8d4b10c..5fdaeb14401 100644
--- a/usr.sbin/pkg_add/OpenBSD/Replace.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Replace.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Replace.pm,v 1.87 2014/01/11 11:54:43 espie Exp $
+# $OpenBSD: Replace.pm,v 1.88 2014/02/11 08:58:34 sthen Exp $
#
# Copyright (c) 2004-2014 Marc Espie <espie@openbsd.org>
#
@@ -114,7 +114,7 @@ sub is_set_safe
return 1;
} elsif ($state->{interactive}) {
- if ($state->confirm("proceed with update anyways", 0)) {
+ if ($state->confirm("proceed with update anyway", 0)) {
return 1;
} else {
return 0;
diff --git a/usr.sbin/pkg_add/pkg_check.8 b/usr.sbin/pkg_add/pkg_check.8
index c9300aab703..ec0445d9d7e 100644
--- a/usr.sbin/pkg_add/pkg_check.8
+++ b/usr.sbin/pkg_add/pkg_check.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pkg_check.8,v 1.5 2012/11/06 08:06:14 espie Exp $
+.\" $OpenBSD: pkg_check.8,v 1.6 2014/02/11 08:58:34 sthen Exp $
.\"
.\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 6 2012 $
+.Dd $Mdocdate: February 11 2014 $
.Dt PKG_CHECK 8
.Os
.Sh NAME
@@ -69,7 +69,7 @@ By default,
will only perform very safe transformations, such as the removal of core-dumps.
.Nm
will ask the user for more permanent changes in interactive mode,
-or perform them anyways with option
+or perform them anyway with option
.Fl f .
.Pp
The options are as follows: