From 4a3ca90a5159afe0d1494b612eb09a6e74e9b0ec Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Thu, 17 Apr 2014 17:51:13 +0200
Subject: [PATCH] Documentation: Add a note on unsupported non-persistent
 comments.

Refs #5295
---
 doc/6.13-external-commands-list,md           | 12 ++++++------
 doc/8-differences-between-icinga-1x-and-2.md |  6 +++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/doc/6.13-external-commands-list,md b/doc/6.13-external-commands-list,md
index abdafbaad..7b4348ce7 100644
--- a/doc/6.13-external-commands-list,md
+++ b/doc/6.13-external-commands-list,md
@@ -20,11 +20,11 @@ Additional details can be found in the [Icinga 1.x Documentation](http://docs.ic
   SCHEDULE_HOST_SVC_CHECKS                  | ;<host_name>;<check_time> (2)  |
   ENABLE_HOST_SVC_CHECKS                    | ;<host_name> (1) |
   DISABLE_HOST_SVC_CHECKS                   | ;<host_name> (1) |
-  ACKNOWLEDGE_SVC_PROBLEM                   | ;<host_name>;<service_name>;<sticky>;<notify>;<persistent>;<author>;<comment> (7) |
-  ACKNOWLEDGE_SVC_PROBLEM_EXPIRE            | ;<host_name>;<service_name>;<sticky>;<notify>;<persistent>;<timestamp>;<author>;<comment> (8)  |
+  ACKNOWLEDGE_SVC_PROBLEM                   | ;<host_name>;<service_name>;<sticky>;<notify>;<persistent>;<author>;<comment> (7) | Note: Icinga 2 treats all comments as persistent.
+  ACKNOWLEDGE_SVC_PROBLEM_EXPIRE            | ;<host_name>;<service_name>;<sticky>;<notify>;<persistent>;<timestamp>;<author>;<comment> (8)  | Note: Icinga 2 treats all comments as persistent.
   REMOVE_SVC_ACKNOWLEDGEMENT                | ;<host_name>;<service_name> (2)  |
-  ACKNOWLEDGE_HOST_PROBLEM                  | ;<host_name>;<sticky>;<notify>;<persistent>;<author>;<comment> (6) |
-  ACKNOWLEDGE_HOST_PROBLEM_EXPIRE           | ;<host_name>;<sticky>;<notify>;<persistent>;<timestamp>;<author>;<comment> (7) |
+  ACKNOWLEDGE_HOST_PROBLEM                  | ;<host_name>;<sticky>;<notify>;<persistent>;<author>;<comment> (6) | Note: Icinga 2 treats all comments as persistent.
+  ACKNOWLEDGE_HOST_PROBLEM_EXPIRE           | ;<host_name>;<sticky>;<notify>;<persistent>;<timestamp>;<author>;<comment> (7) | Note: Icinga 2 treats all comments as persistent.
   REMOVE_HOST_ACKNOWLEDGEMENT               | ;<host_name> (1)  |
   DISABLE_HOST_FLAP_DETECTION               | ;<host_name> (1)  |
   ENABLE_HOST_FLAP_DETECTION                | ;<host_name> (1)  |
@@ -52,9 +52,9 @@ Additional details can be found in the [Icinga 1.x Documentation](http://docs.ic
   SCHEDULE_HOSTGROUP_SVC_DOWNTIME           | ;<hostgroup_name>;<start_time>;<end_time>;<fixed>;<trigger_id>;<duration>;<author>;<comment> (8)  |
   SCHEDULE_SERVICEGROUP_HOST_DOWNTIME       | ;<servicegroup_name>;<start_time>;<end_time>;<fixed>;<trigger_id>;<duration>;<author>;<comment> (8)  |
   SCHEDULE_SERVICEGROUP_SVC_DOWNTIME        | ;<servicegroup_name>;<start_time>;<end_time>;<fixed>;<trigger_id>;<duration>;<author>;<comment> (8)  |
-  ADD_HOST_COMMENT                          | ;<host_name>;<persistent>;<author>;<comment> (4)  |
+  ADD_HOST_COMMENT                          | ;<host_name>;<persistent>;<author>;<comment> (4)  | Note: Icinga 2 treats all comments as persistent.
   DEL_HOST_COMMENT                          | ;<comment_id> (1)  |
-  ADD_SVC_COMMENT                           | ;<host_name>;<service_name>;<persistent>;<author>;<comment> (5)  |
+  ADD_SVC_COMMENT                           | ;<host_name>;<service_name>;<persistent>;<author>;<comment> (5)  | Note: Icinga 2 treats all comments as persistent.
   DEL_SVC_COMMENT                           | ;<comment_id> (1)  |
   DEL_ALL_HOST_COMMENTS                     | ;<host_name> (1)  |
   DEL_ALL_SVC_COMMENTS                      | ;<host_name>;<service_name> (2)  |
diff --git a/doc/8-differences-between-icinga-1x-and-2.md b/doc/8-differences-between-icinga-1x-and-2.md
index 82af46c78..9edab9d16 100644
--- a/doc/8-differences-between-icinga-1x-and-2.md
+++ b/doc/8-differences-between-icinga-1x-and-2.md
@@ -86,7 +86,7 @@ set in the `constants.conf` configuration file:
 [Global macros](#global-constants) can only be defined once. Trying to modify a
 global constant will result in an error.
 
-## <a id="differences-1x-2-comments"></a> Comments
+## <a id="differences-1x-2-configuration-comments"></a> Configuration Comments
 
 In Icinga 1.x comments are made using a leading hash (`#`) or a semi-colon (`;`)
 for inline comments.
@@ -397,6 +397,10 @@ where the initial state checks must have happened. Icinga 2 will use the
 `retry_interval` setting instead and `check_interval` divided by 5 if
 `retry_interval` is not defined.
 
+## <a id="differences-1x-2-comments"></a> Comments
+
+Icinga 2 doesn't support non-persistent comments.
+
 ## <a id="differences-1x-2-commands"></a> Commands
 
 Unlike in Icinga 1.x there are 3 different command types in Icinga 2:
-- 
2.40.0