Merge branch 'master' of github.com:influxdata/docs-v2

content/influxdb/v2.6/tools/grafana.md

@@ -22,7 +22,8 @@ to visualize data from your **InfluxDB {{< current-version >}}** instance.
 The instructions in this guide require **Grafana Cloud** or **Grafana v8.0+**.
 {{% /note %}}
 
-1. [Start InfluxDB OSS {{< current-version >}}](/influxdb/v2.6/install/#start-influxdb).
+1. {{% cloud-only %}}[Log into InfluxDB Cloud](https://cloud2.influxdata.com).{{% /cloud-only %}}
+1. {{% oss-only %}}[Start InfluxDB](/influxdb/v2.6/install/#start-and-configure-influxdb).{{% /oss-only %}}
 2. [Sign up for Grafana Cloud](https://grafana.com/products/cloud/) or
    [download and install Grafana](https://grafana.com/grafana/download).
 3. Visit your **Grafana Cloud user interface** (UI) or, if running Grafana locally,
@@ -75,9 +76,9 @@ configure your InfluxDB connection:
   {{< img-hd src="/img/influxdb/cloud-tools-grafana.png" alt="Use Grafana with InfluxDB Cloud and Flux" />}}
 {{% /cloud-only %}}
 
-{{< oss-only >}}
+{{% oss-only %}}
   {{< img-hd src="/img/influxdb/2-2-tools-grafana.png" alt="Use Grafana with InfluxDB and Flux" />}}
-{{< /oss-only >}}
+{{% /oss-only %}}
 
 {{% /tab-content %}}
 <!----------------------------- END FLUX CONTENT ----------------------------->

layouts/shortcodes/current-version.html

@@ -3,5 +3,5 @@
 {{- $keep := .Get "keep" | default false -}}
 {{- $keepClass := cond ( $keep ) " keep" "" -}}
 {{- $isCloud := in $currentVersion "cloud" -}}
-{{- $versionText := cond ($isCloud) "Cloud" $currentVersion }}
-<span class="current-version{{ $keepClass }}">{{ $versionText }}</span>
+{{- $versionText := cond ($isCloud) "Cloud" $currentVersion -}}
+<span class="current-version{{ $keepClass }}">{{- $versionText -}}</span>