From c88f9ce8b6af4e861bfde9a2edc3f62969df538b Mon Sep 17 00:00:00 2001
From: Kelly <kelly@influxdata.com>
Date: Wed, 15 Apr 2020 14:31:28 -0700
Subject: [PATCH] upd "Support and feedback" for cloud and OSS

---
 layouts/partials/article.html                 |  7 +------
 layouts/partials/article/_cloud-feedback.html | 18 ------------------
 layouts/partials/article/_feedback.html       | 13 ++++++++-----
 3 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 layouts/partials/article/_cloud-feedback.html

diff --git a/layouts/partials/article.html b/layouts/partials/article.html
index b5eba7a26..8722dbbfb 100644
--- a/layouts/partials/article.html
+++ b/layouts/partials/article.html
@@ -8,11 +8,6 @@
     {{ .Content }}
     {{ partial "article/related.html" . }}
     {{ partial "article/tags.html" . }}
-
-    {{ if in .RelPermalink "/cloud/"}}
-      {{ partial "article/_cloud-feedback.html" . }}
-    {{ else }}
-      {{ partial "article/_feedback.html" . }}
-    {{ end }}
+    {{ partial "article/_feedback.html" . }}
   </article>
 </div>
diff --git a/layouts/partials/article/_cloud-feedback.html b/layouts/partials/article/_cloud-feedback.html
deleted file mode 100644
index 56788dd54..000000000
--- a/layouts/partials/article/_cloud-feedback.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{{ $cloudName := .Site.Data.products.cloud.name }}
-{{ $cloudNameShort := .Site.Data.products.cloud.shortname }}
-<hr/>
-<div class="feedback block">
-  <h4 id="cloud-support">{{ $cloudName }} Support</h4>
-  <p>
-    The following resources are available when you need help with {{ $cloudNameShort }}:
-  </p>
-  <h5 id="free-plan">Free Plan</h5>
-  <ul>
-    <li>Reach out in the <a href="https://community.influxdata.com/">InfluxData Community</a>.</li>
-  </ul>
-  <h5 id="usage-based-plan">Usage-based Plan</h5>
-  <ul>
-    <li>Reach out in the <a href="https://community.influxdata.com/">InfluxData Community</a>.</li>
-    <li>Contact <a href="mailto:support@influxdata.com" target="_blank">InfluxData Support</a>.</li>
-  </ul>
-</div>
diff --git a/layouts/partials/article/_feedback.html b/layouts/partials/article/_feedback.html
index 35e02376f..b2612a92d 100644
--- a/layouts/partials/article/_feedback.html
+++ b/layouts/partials/article/_feedback.html
@@ -1,15 +1,18 @@
 <hr/>
 <div class="feedback block">
-  <h4 id="bug-reports-and-feedback">Bug Reports and Feedback</h4>
+  <h4 id="bug-reports-and-feedback">Support and feedback</h4>
   <p>
-    Thank you for being willing to help test InfluxDB v2.0 beta!
-    Feedback and bug reports are welcome and encouraged both for InfluxDB and this documentation.
-    Submit feedback using one of the following methods:
-  </p>
+    Thank you for being part of our community! 
+    We welcome and encourage your feedback and bug reports for InfluxDB and this documentation. 
+    To find support or submit feedback, the following resources are available:
+  </p>  
   <ul>
     <li><a href="https://community.influxdata.com/c/influxdb2" target="_blank">Post in the InfluxData Community</a></li>
     <li>In the <strong>InfluxDB UI</strong>, click <strong class="white-space:nowrap"><span class="icon-ui-nav-chat" style="font-size:1.25rem;margin:0 .25rem 0;"></span> Feedback</strong> in the left navigation bar.</li>
     <li>Submit <strong>documentation issues</strong> to the <a href="https://github.com/influxdata/docs-v2" target="_blank">InfluxDB 2.0 documentation repository</a>.</li>
     <li>Submit <strong>InfluxDB issues</strong> to the <a href="https://github.com/influxdata/influxdb" target="_blank">InfluxDB repository</a>.</li>
   </ul>
+  <p>
+    For our Cloud customers, <a href="mailto:support@influxdata.com" target="_blank">InfluxData Support</a> is also available.
+  </p> 
 </div>