[PATCH v3] you_still_use_that(): reword the instructions

[Junio C Hamano <gitster@pobox.com>]

The message is overly long and may mislead readers into thinking
there is recourse other than adopting the new workflow.  Clarify
that the message is there merely to help them find a replacement
workflow, and is not offering to reconsider a decision that has
already taken effect.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 * The text is unchanged from v2 except for fixing "mailing list";
   two tests that looked for "nominated for removal" string have
   been corrected.

 t/t4013-diff-various.sh   |  2 +-
 t/t5323-pack-redundant.sh |  2 +-
 usage.c                   | 16 +++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index d35695f5b0..93d6e6e975 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -478,7 +478,7 @@ EOF
 
 test_expect_success !WITH_BREAKING_CHANGES 'whatchanged needs --i-still-use-this' '
 	test_must_fail git whatchanged >message 2>&1 &&
-	test_grep "nominated for removal" message
+	test_grep "will be removed soon" message
 '
 
 test_expect_success 'log -m matches pure log' '
diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
index 2d96afd6f7..aff0bce099 100755
--- a/t/t5323-pack-redundant.sh
+++ b/t/t5323-pack-redundant.sh
@@ -47,7 +47,7 @@ shared_repo=shared.git
 
 test_expect_success 'pack-redundant needs --i-still-use-this' '
 	test_must_fail git pack-redundant >message 2>&1 &&
-	test_grep "nominated for removal" message
+	test_grep "will be removed soon" message
 '
 
 git_pack_redundant='git pack-redundant --i-still-use-this'
diff --git a/usage.c b/usage.c
index 527edb1e79..90f392e89e 100644
--- a/usage.c
+++ b/usage.c
@@ -386,21 +386,19 @@ NORETURN void you_still_use_that(const char *command_name, const char *hint)
 				 STRBUF_ENCODE_SLASH);
 
 	fprintf(stderr,
-		_("'%s' is nominated for removal.\n"), command_name);
+		_("'%s' will be removed soon.\n"), command_name);
 
 	if (hint)
 		fputs(hint, stderr);
 
 	fprintf(stderr,
-		_("If you still use this command, here's what you can do:\n"
+		_("If you need a replacement:\n"
 		  "\n"
-		  "- read https://git-scm.com/docs/BreakingChanges.html\n"
-		  "- check if anyone has discussed this on the mailing\n"
-		  "  list and if they came up with something that can\n"
-		  "  help you: https://lore.kernel.org/git/?q=%s\n"
-		  "- send an email to <git@vger.kernel.org> to let us\n"
-		  "  know that you still use this command and were unable\n"
-		  "  to determine a suitable replacement\n"
+		  "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"
+		  "- Check what others on the mailing list suggest as a replacement:\n"
+		  "  https://lore.kernel.org/git/?q=%s\n\n"
+		  "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
+		  "  suggestions by others do not work for you.\n"
 		  "\n"),
 		percent_encoded.buf);
 	strbuf_release(&percent_encoded);

Interdiff:
  diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
  index d35695f5b0..93d6e6e975 100755
  --- a/t/t4013-diff-various.sh
  +++ b/t/t4013-diff-various.sh
  @@ -478,7 +478,7 @@ EOF
   
   test_expect_success !WITH_BREAKING_CHANGES 'whatchanged needs --i-still-use-this' '
   	test_must_fail git whatchanged >message 2>&1 &&
  -	test_grep "nominated for removal" message
  +	test_grep "will be removed soon" message
   '
   
   test_expect_success 'log -m matches pure log' '
  diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
  index 2d96afd6f7..aff0bce099 100755
  --- a/t/t5323-pack-redundant.sh
  +++ b/t/t5323-pack-redundant.sh
  @@ -47,7 +47,7 @@ shared_repo=shared.git
   
   test_expect_success 'pack-redundant needs --i-still-use-this' '
   	test_must_fail git pack-redundant >message 2>&1 &&
  -	test_grep "nominated for removal" message
  +	test_grep "will be removed soon" message
   '
   
   git_pack_redundant='git pack-redundant --i-still-use-this'
  diff --git a/usage.c b/usage.c
  index d421ca426b..90f392e89e 100644
  --- a/usage.c
  +++ b/usage.c
  @@ -395,7 +395,7 @@ NORETURN void you_still_use_that(const char *command_name, const char *hint)
   		_("If you need a replacement:\n"
   		  "\n"
   		  "- Read https://git-scm.com/docs/BreakingChanges.html.\n\n"
  -		  "- Check what others on the mailing suggest as a replacement:\n"
  +		  "- Check what others on the mailing list suggest as a replacement:\n"
   		  "  https://lore.kernel.org/git/?q=%s\n\n"
   		  "- Send an email to <git@vger.kernel.org> asking for help, only if\n"
   		  "  suggestions by others do not work for you.\n"
-- 
2.55.0-862-g3c6f97f7b9