Merge branch 'master' into mfriedrich/compatido

2012-09-25 15:29:49 +02:00 · 2012-09-25 15:29:49 +02:00 · e9f8f6c768
parent d0ed2a4840 8114cb7f1c
commit e9f8f6c768
1 changed files with 1 additions and 1 deletions
--- a/docs/icinga2-config.txt
+++ b/docs/icinga2-config.txt
@ -524,7 +524,7 @@ Attribute: check_command
 ^^^^^^^^^^^^^^^^^^^^^^^^

 Optional when not using the "external plugin" check type. The check command.
-This command may use macros.
+May contain macros.

 Attribute: check_interval
 ^^^^^^^^^^^^^^^^^^^^^^^^^