tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update documentation. 

Refs #5909
This commit is contained in:
Gunnar Beutner 2014-04-07 14:31:30 +02:00
parent a7b399c63c
commit fded50632e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/3.04-notifications.md
View File

@ -60,7 +60,7 @@ There are various custom attributes available at runtime execution of the
The command attribute in the `mail-service-notification` command refers to the The command attribute in the `mail-service-notification` command refers to the
shell script installed into `/etc/icinga2/scripts/mail-notification.sh`. shell script installed into `/etc/icinga2/scripts/mail-notification.sh`.
The macros specified in the `export_macros` array are exported as environment The macros specified in the `env` dictionary are exported as environment
variables and can be used in the notification script. variables and can be used in the notification script.
You can add all shared attributes to a `Notification` template which is inherited You can add all shared attributes to a `Notification` template which is inherited

2
doc/8-differences-between-icinga-1x-and-2.md
View File

@ -275,7 +275,7 @@ TODO
The global configuration setting `enable_environment_macros` does not exist in The global configuration setting `enable_environment_macros` does not exist in
Icinga 2. Icinga 2.
Macros exported into the environment must be set using the `export_macros` Macros exported into the environment must be set using the `env`
attribute in command objects. attribute in command objects.
### <a id="differences-1x-2-runtime-macros"></a> Runtime Macros ### <a id="differences-1x-2-runtime-macros"></a> Runtime Macros