From fded50632e115323c178d856fb33f6619c8a3cc5 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 7 Apr 2014 14:31:30 +0200 Subject: [PATCH] Update documentation. Refs #5909 --- doc/3.04-notifications.md | 2 +- doc/8-differences-between-icinga-1x-and-2.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/3.04-notifications.md b/doc/3.04-notifications.md index ce87ca5b6..8835633a8 100644 --- a/doc/3.04-notifications.md +++ b/doc/3.04-notifications.md @@ -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 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. You can add all shared attributes to a `Notification` template which is inherited diff --git a/doc/8-differences-between-icinga-1x-and-2.md b/doc/8-differences-between-icinga-1x-and-2.md index d3f58445f..c1ffba3cf 100644 --- a/doc/8-differences-between-icinga-1x-and-2.md +++ b/doc/8-differences-between-icinga-1x-and-2.md @@ -275,7 +275,7 @@ TODO The global configuration setting `enable_environment_macros` does not exist in 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. ### Runtime Macros