Merge branch 'maint'

* maint:
  NEWS: Modify list of changes for 2.1.1 release
  Prepare release
  THANKS.in: Add new authors
  NEWS: Updating all the fixes
  check_tcp: fix help description regarding escape option
  check_ntp: Nul-terminate jitter data
  Revert "plugins/check_ntp.c - Verify struct from response"
  check_real: fix null termination
  check_ntp: fix null termination
  check_apt: fix memset

Conflicts:
	NEWS

1 files changed, 1 insertions, 1 deletions

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index fc0adba..63f9fd9 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -643,7 +643,7 @@ print_help (void)
         printf (UT_IPv46);
 
         printf (" %s\n", "-E, --escape");
-  printf ("    %s\n", _("Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or quit option"));
+  printf ("    %s\n", _("Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send or quit option"));
   printf ("    %s\n", _("Default: nothing added to send, \\r\\n added to end of quit"));
   printf (" %s\n", "-s, --send=STRING");
   printf ("    %s\n", _("String to send to the server"));