From b1517a4f6ce95d50e0693393b0611192cee2c240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Mon, 20 Jan 2020 11:17:30 -0400 Subject: [PATCH] errors: make use of "cannot" consistent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/31420 Reviewed-By: Colin Ihrig Reviewed-By: Anna Henningsen Reviewed-By: Sam Roberts Reviewed-By: Ruben Bridgewater Reviewed-By: Michaƫl Zasso Reviewed-By: Rich Trott Reviewed-By: Michael Dawson --- doc/api/errors.md | 2 +- lib/internal/errors.js | 2 +- test/parallel/test-console-tty-colors.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/api/errors.md b/doc/api/errors.md index 26d5edd0f8fbe2..2e2033a1e583ad 100644 --- a/doc/api/errors.md +++ b/doc/api/errors.md @@ -1166,7 +1166,7 @@ To fix the error, open an issue at https://github.com/nodejs/node/issues. ### `ERR_INCOMPATIBLE_OPTION_PAIR` -An option pair is incompatible with each other and can not be used at the same +An option pair is incompatible with each other and cannot be used at the same time. diff --git a/lib/internal/errors.js b/lib/internal/errors.js index 8020042d2ab609..97069fc6ef7bfc 100644 --- a/lib/internal/errors.js +++ b/lib/internal/errors.js @@ -904,7 +904,7 @@ E('ERR_HTTP_INVALID_STATUS_CODE', 'Invalid status code: %s', RangeError); E('ERR_HTTP_TRAILER_INVALID', 'Trailers are invalid with this transfer encoding', Error); E('ERR_INCOMPATIBLE_OPTION_PAIR', - 'Option "%s" can not be used in combination with option "%s"', TypeError); + 'Option "%s" cannot be used in combination with option "%s"', TypeError); E('ERR_INPUT_TYPE_NOT_ALLOWED', '--input-type can only be used with string ' + 'input via --eval, --print, or STDIN', Error); E('ERR_INSPECTOR_ALREADY_CONNECTED', '%s is already connected', Error); diff --git a/test/parallel/test-console-tty-colors.js b/test/parallel/test-console-tty-colors.js index 85a0e61e381170..41e72c3c8513bc 100644 --- a/test/parallel/test-console-tty-colors.js +++ b/test/parallel/test-console-tty-colors.js @@ -86,7 +86,7 @@ check(false, false, false); }); }, { - message: 'Option "inspectOptions.color" can not be used in ' + + message: 'Option "inspectOptions.color" cannot be used in ' + 'combination with option "colorMode"', code: 'ERR_INCOMPATIBLE_OPTION_PAIR' }