From e6fcc69ec33ee8aa8000b21ac77bf63d473814fa Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Tue, 13 Mar 2018 17:51:38 +0100
Subject: [PATCH 1/2] Document smtp_hello parameter

---
 content/docs/alerting/configuration.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/content/docs/alerting/configuration.md b/content/docs/alerting/configuration.md
index 81bcb12da..09221eb0d 100755
--- a/content/docs/alerting/configuration.md
+++ b/content/docs/alerting/configuration.md
@@ -65,6 +65,8 @@ global:
   [ smtp_from: <tmpl_string> ]
   # The default SMTP smarthost used for sending emails.
   [ smtp_smarthost: <string> ]
+  # The default hostname to identify to the SMTP server.
+  [ smtp_hello: <string> | default = "localhost" ]
   # SMTP authentication information.
   [ smtp_auth_username: <string> ]
   [ smtp_auth_password: <secret> ]
@@ -290,6 +292,9 @@ to: <tmpl_string>
 # The SMTP host through which emails are sent.
 [ smarthost: <string> | default = global.smtp_smarthost ]
 
+# The hostname to identify to the SMTP server.
+[ hello: <string> | default = global.smtp_hello ]
+
 # SMTP authentication information.
 [ auth_username: <string> | default = global.smtp_auth_username ]
 [ auth_password: <secret> | default = global.smtp_auth_password ]

From fe258ea0df372a2f01686979348393cca964cb4c Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Fri, 16 Mar 2018 14:23:34 +0100
Subject: [PATCH 2/2] Document text parameter for email_config

---
 content/docs/alerting/configuration.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/content/docs/alerting/configuration.md b/content/docs/alerting/configuration.md
index 09221eb0d..59e9fa6e7 100755
--- a/content/docs/alerting/configuration.md
+++ b/content/docs/alerting/configuration.md
@@ -306,6 +306,8 @@ to: <tmpl_string>
 
 # The HTML body of the email notification.
 [ html: <tmpl_string> | default = '{{ template "email.default.html" . }}' ]
+# The text body of the email notification.
+[ text: <tmpl_string> ]
 
 # Further headers email header key/value pairs. Overrides any headers
 # previously set by the notification implementation.