[icinga-checkins] icinga.org: icinga2/feature/doc-review-11599: Fixes some typos/ grammar issues and some code blocks

git at icinga.org git at icinga.org
Fri May 20 15:58:28 CEST 2016


Module: icinga2
Branch: feature/doc-review-11599
Commit: 1683ae186e8ebd2dfaef98a9928355636c9240d6
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=1683ae186e8ebd2dfaef98a9928355636c9240d6

Author: Heike Jurzik <icinga at huhnix.org>
Date:   Fri Apr 22 15:59:35 2016 +0200

Fixes some typos/grammar issues and some code blocks

refs #11599

---

 doc/3-monitoring-basics.md |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/doc/3-monitoring-basics.md b/doc/3-monitoring-basics.md
index 5c5e8dd..a2d1890 100644
--- a/doc/3-monitoring-basics.md
+++ b/doc/3-monitoring-basics.md
@@ -1514,13 +1514,7 @@ when passing credentials to database checks:
 
 ### <a id="notification-commands"></a> Notification Commands
 
-[NotificationCommand](6-object-types.md#objecttype-notificationcommand) objects define how notifications are delivered to external
-<<<<<<< HEAD
-<<<<<<< eb277a669f6f789fe64a3bc101d5c98b9822adf0
-interfaces (email, XMPP, IRC, Twitter, etc.).
-=======
-interfaces (email, XMPP, IRC, Twitter, etc).
->>>>>>> Fixes some typos/grammar issues and some code blocks
+[NotificationCommand](6-object-types.md#objecttype-notificationcommand) objects define how notifications are delivered to external interfaces (email, XMPP, IRC, Twitter, etc.).
 
 [NotificationCommand](6-object-types.md#objecttype-notificationcommand) objects are referenced by
 [Notification](6-object-types.md#objecttype-notification) objects using the `command` attribute.



More information about the icinga-checkins mailing list