check_http: -u is misleading. Changed help text

Fix for issue https://github.com/nagios-plugins/nagios-plugins/issues/128

NEWS

@@ -2,12 +2,13 @@ This file documents the major additions and syntax changes between releases.
 
 2.1.x 2016-xx-xx
 	FIXES
-	check_http - Don't include default Accept header if one is provided
-	check_disk - added "fuse.gvfsd-fuse" to list of fs types to ignore
-	check_http - Fixed non-text chunked-encoded decoding
-	check_http - segmentation fault (FreeBSD)
-	check_dns - Update IF_RECORD to not erase query_found
-	check_http - SSL Certificate check returns 12:00:00AM <local timezone>
+	check_http: Don't include default Accept header if one is provided
+	check_disk: added "fuse.gvfsd-fuse" to list of fs types to ignore
+	check_http: Fixed non-text chunked-encoded decoding
+	check_http: segmentation fault (FreeBSD)
+	check_dns: Update IF_RECORD to not erase query_found
+	check_http: SSL Certificate check returns 12:00:00AM <local timezone>
+	check_http: -u is misleading. Changed help text
 
 
 2.1.3 2016-09-12

plugins/check_http.c

@@ -214,6 +214,7 @@ process_arguments (int argc, char **argv)
     {"method", required_argument, 0, 'j'},
     {"IP-address", required_argument, 0, 'I'},
     {"url", required_argument, 0, 'u'},
+    {"uri", required_argument, 0, 'u'},
     {"port", required_argument, 0, 'p'},
     {"authorization", required_argument, 0, 'a'},
     {"proxy-authorization", required_argument, 0, 'b'},
@@ -1668,8 +1669,10 @@ print_help (void)
   printf ("    %s\n", _("String to expect in the response headers"));
   printf (" %s\n", "-s, --string=STRING");
   printf ("    %s\n", _("String to expect in the content"));
-  printf (" %s\n", "-u, --url=PATH");
-  printf ("    %s\n", _("URL to GET or POST (default: /)"));
+  printf (" %s\n", "-u, --uri=PATH");
+  printf ("    %s\n", _("URI to GET or POST (default: /)"));
+  printf (" %s\n", "--url=PATH");
+  printf ("    %s\n", _("(deprecated) URL to GET or POST (default: /)"));
   printf (" %s\n", "-P, --post=STRING");
   printf ("    %s\n", _("URL encoded http POST data"));
   printf (" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT)");

po/fr.po

@@ -1409,8 +1409,12 @@ msgid "String to expect in the content"
 msgstr "Chaîne de caractère attendue dans le contenu"
 
 #: plugins/check_http.c:1355
-msgid "URL to GET or POST (default: /)"
-msgstr "URL pour le GET ou le POST (défaut: /)"
+msgid "(deprecated) URL to GET or POST (default: /)"
+msgstr "(obsolète) URL pour le GET ou le POST (défaut: /)"
+
+#: plugins/check_http.c:1355
+msgid "URI to GET or POST (default: /)"
+msgstr "URI pour le GET ou le POST (défaut: /)"
 
 #: plugins/check_http.c:1357
 msgid "URL encoded http POST data"