From owner-svn-src-all@freebsd.org Wed Nov 22 18:06:42 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9C0FDF161A; Wed, 22 Nov 2017 18:06:42 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 73B6D3FBD; Wed, 22 Nov 2017 18:06:42 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAMI6fYv008378; Wed, 22 Nov 2017 18:06:41 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAMI6fCx008377; Wed, 22 Nov 2017 18:06:41 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201711221806.vAMI6fCx008377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 22 Nov 2017 18:06:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326099 - head/usr.bin/iscsictl X-SVN-Group: head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: head/usr.bin/iscsictl X-SVN-Commit-Revision: 326099 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Nov 2017 18:06:42 -0000 Author: zeising (doc,ports committer) Date: Wed Nov 22 18:06:41 2017 New Revision: 326099 URL: https://svnweb.freebsd.org/changeset/base/326099 Log: Fix language in a bunch of error messages. Reviewed by: emaste Approved by: emaste MFC after: 1 month Differential Revision: D13193 Modified: head/usr.bin/iscsictl/iscsictl.c Modified: head/usr.bin/iscsictl/iscsictl.c ============================================================================== --- head/usr.bin/iscsictl/iscsictl.c Wed Nov 22 16:45:27 2017 (r326098) +++ head/usr.bin/iscsictl/iscsictl.c Wed Nov 22 18:06:41 2017 (r326099) @@ -813,41 +813,41 @@ main(int argc, char **argv) if (Aflag != 0) { if (aflag != 0) { if (enable != ENABLE_UNSPECIFIED) - xo_errx(1, "-a and -e and mutually exclusive"); + xo_errx(1, "-a and -e are mutually exclusive"); if (portal != NULL) - xo_errx(1, "-a and -p and mutually exclusive"); + xo_errx(1, "-a and -p are mutually exclusive"); if (target != NULL) - xo_errx(1, "-a and -t and mutually exclusive"); + xo_errx(1, "-a and -t are mutually exclusive"); if (user != NULL) - xo_errx(1, "-a and -u and mutually exclusive"); + xo_errx(1, "-a and -u are mutually exclusive"); if (secret != NULL) - xo_errx(1, "-a and -s and mutually exclusive"); + xo_errx(1, "-a and -s are mutually exclusive"); if (nickname != NULL) - xo_errx(1, "-a and -n and mutually exclusive"); + xo_errx(1, "-a and -n are mutually exclusive"); if (discovery_host != NULL) - xo_errx(1, "-a and -d and mutually exclusive"); + xo_errx(1, "-a and -d are mutually exclusive"); if (rflag != 0) - xo_errx(1, "-a and -r and mutually exclusive"); + xo_errx(1, "-a and -r are mutually exclusive"); } else if (nickname != NULL) { if (enable != ENABLE_UNSPECIFIED) - xo_errx(1, "-n and -e and mutually exclusive"); + xo_errx(1, "-n and -e are mutually exclusive"); if (portal != NULL) - xo_errx(1, "-n and -p and mutually exclusive"); + xo_errx(1, "-n and -p are mutually exclusive"); if (target != NULL) - xo_errx(1, "-n and -t and mutually exclusive"); + xo_errx(1, "-n and -t are mutually exclusive"); if (user != NULL) - xo_errx(1, "-n and -u and mutually exclusive"); + xo_errx(1, "-n and -u are mutually exclusive"); if (secret != NULL) - xo_errx(1, "-n and -s and mutually exclusive"); + xo_errx(1, "-n and -s are mutually exclusive"); if (discovery_host != NULL) - xo_errx(1, "-n and -d and mutually exclusive"); + xo_errx(1, "-n and -d are mutually exclusive"); if (rflag != 0) - xo_errx(1, "-n and -r and mutually exclusive"); + xo_errx(1, "-n and -r are mutually exclusive"); } else if (discovery_host != NULL) { if (portal != NULL) - xo_errx(1, "-d and -p and mutually exclusive"); + xo_errx(1, "-d and -p are mutually exclusive"); if (target != NULL) - xo_errx(1, "-d and -t and mutually exclusive"); + xo_errx(1, "-d and -t are mutually exclusive"); } else { if (target == NULL && portal == NULL) xo_errx(1, "must specify -a, -n or -t/-p"); @@ -874,15 +874,15 @@ main(int argc, char **argv) if (nickname != NULL) { if (enable != ENABLE_UNSPECIFIED) - xo_errx(1, "-n and -e and mutually exclusive"); + xo_errx(1, "-n and -e are mutually exclusive"); if (portal != NULL) - xo_errx(1, "-n and -p and mutually exclusive"); + xo_errx(1, "-n and -p are mutually exclusive"); if (target != NULL) - xo_errx(1, "-n and -t and mutually exclusive"); + xo_errx(1, "-n and -t are mutually exclusive"); if (user != NULL) - xo_errx(1, "-n and -u and mutually exclusive"); + xo_errx(1, "-n and -u are mutually exclusive"); if (secret != NULL) - xo_errx(1, "-n and -s and mutually exclusive"); + xo_errx(1, "-n and -s are mutually exclusive"); } if (aflag != 0) @@ -899,16 +899,16 @@ main(int argc, char **argv) } else if (Rflag != 0) { if (aflag != 0) { if (portal != NULL) - xo_errx(1, "-a and -p and mutually exclusive"); + xo_errx(1, "-a and -p are mutually exclusive"); if (target != NULL) - xo_errx(1, "-a and -t and mutually exclusive"); + xo_errx(1, "-a and -t are mutually exclusive"); if (nickname != NULL) - xo_errx(1, "-a and -n and mutually exclusive"); + xo_errx(1, "-a and -n are mutually exclusive"); } else if (nickname != NULL) { if (portal != NULL) - xo_errx(1, "-n and -p and mutually exclusive"); + xo_errx(1, "-n and -p are mutually exclusive"); if (target != NULL) - xo_errx(1, "-n and -t and mutually exclusive"); + xo_errx(1, "-n and -t are mutually exclusive"); } else if (target == NULL && portal == NULL) { xo_errx(1, "must specify either -a, -n, -t, or -p"); }