Merge branch 'master' of http://git.centreon.com/centreon-plugins

2014-09-15 18:06:33 +02:00 · 2014-09-15 18:06:33 +02:00 · ddd0c3c683
parent 0b8c4575e5 746103390c
commit ddd0c3c683
2 changed files with 4 additions and 8 deletions
--- a/apps/protocols/ftp/mode/date.pm
+++ b/apps/protocols/ftp/mode/date.pm
@ -200,14 +200,6 @@ Connection timeout in seconds (Default: 30)

 =item B<--warning>

-Threshold warning in seconds
-
-=item B<--critical>
-
-Threshold critical in seconds
-
-=item B<--warning>
-
 Threshold warning in seconds for each files (diff time)

 =item B<--critical>
--- a/apps/protocols/http/mode/expectedcontent.pm
+++ b/apps/protocols/http/mode/expectedcontent.pm
@ -184,6 +184,10 @@ Specify password for basic authentification (Mandatory if --credentials is speci

 Threshold for HTTP timeout

+=item B<--expected-string>
+
+Specify String to check on the Webpage
+
 =back

 =cut