From 8047eee4fb66a95069e1f7f8aabb7ab2dd5901e3 Mon Sep 17 00:00:00 2001
From: pierwill <19642016+pierwill@users.noreply.github.com>
Date: Tue, 22 Oct 2019 14:36:22 -0700
Subject: [PATCH] Various edits to use-telegraf docs

- Add word in instructions to delete telegraf config
- Regularize "line protocol" capitalization
- Edit token storing advice
---
 .../use-telegraf/auto-config/delete-telegraf-config.md   | 2 +-
 content/v2.0/write-data/use-telegraf/manual-config.md    | 9 ++++-----
 data/telegraf_plugins.yml                                | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/content/v2.0/write-data/use-telegraf/auto-config/delete-telegraf-config.md b/content/v2.0/write-data/use-telegraf/auto-config/delete-telegraf-config.md
index 9c4d62231..a021bb107 100644
--- a/content/v2.0/write-data/use-telegraf/auto-config/delete-telegraf-config.md
+++ b/content/v2.0/write-data/use-telegraf/auto-config/delete-telegraf-config.md
@@ -18,7 +18,7 @@ To delete a Telegraf configuration:
 
 2. Select **Telegraf**.
 3. Hover over the configuration you want to delete, click the **{{< icon "trash" >}}**
-   icon, and **Delete**.
+   icon, and click **Delete**.
 
 {{% note %}}
 Deleting a Telegraf configuration does not affect _**running**_ Telegraf agents.
diff --git a/content/v2.0/write-data/use-telegraf/manual-config.md b/content/v2.0/write-data/use-telegraf/manual-config.md
index 9945fbfb8..4c4937843 100644
--- a/content/v2.0/write-data/use-telegraf/manual-config.md
+++ b/content/v2.0/write-data/use-telegraf/manual-config.md
@@ -24,7 +24,8 @@ for using Telegraf with InfluxDB v2.0._
 
 ## Configure Telegraf input and output plugins
 Configure Telegraf input and output plugins in the Telegraf configuration file (typically named `telegraf.conf`).
-Input plugins collect metrics. Output plugins define destinations where metrics are sent.
+Input plugins collect metrics.
+Output plugins define destinations where metrics are sent.
 
 _See [Telegraf plugins](/v2.0/reference/telegraf-plugins/) for a complete list of available plugins._
 
@@ -54,10 +55,8 @@ Your InfluxDB v2.0 authorization token.
 For information about viewing tokens, see [View tokens](/v2.0/security/tokens/view-tokens/).
 
 {{% note %}}
-#### Avoid storing tokens in plain text
-InfluxData does not recommend storing authentication tokens in plain text in the `telegraf.conf`.
-A secure alternative is to set the `INFLUX_TOKEN` environment variable and include
-it into your configuration file.
+###### Avoid storing tokens in `telegraf.conf`
+We recommend storing your tokens by setting the `INFLUX_TOKEN` environment variable and including the environment variable in your configuration file.
 
 {{< tabs-wrapper >}}
 {{% tabs %}}
diff --git a/data/telegraf_plugins.yml b/data/telegraf_plugins.yml
index 88be6e22c..43b2c1630 100644
--- a/data/telegraf_plugins.yml
+++ b/data/telegraf_plugins.yml
@@ -393,7 +393,7 @@ input:
     id: exec
     description: |
       The Exec input plugin parses supported [Telegraf input data formats](https://docs.influxdata.com/telegraf/latest/data_formats/input/)
-      (InfluxDB Line Protocol, JSON, Graphite, Value, Nagios, Collectd, and Dropwizard) into metrics.
+      (line protocol, JSON, Graphite, Value, Nagios, Collectd, and Dropwizard) into metrics.
       Each Telegraf metric includes the measurement name, tags, fields, and timestamp.
     link: https://github.com/influxdata/telegraf/blob/master/plugins/inputs/exec/README.md
     introduced: 0.1.5
@@ -564,7 +564,7 @@ input:
     id: http_listener_v2
     description: |
       The HTTP Listener v2 input plugin listens for messages sent via HTTP POST.
-      Messages are expected in the [InfluxDB Line Protocol input data format](https://docs.influxdata.com/telegraf/latest/data_formats/input/influx)
+      Messages are expected in [line protocol format](https://docs.influxdata.com/telegraf/latest/data_formats/input/influx)
       ONLY (other [Telegraf input data formats](https://docs.influxdata.com/telegraf/latest//data_formats/input/) are not supported).
       This plugin allows Telegraf to serve as a proxy or router for the `/write` endpoint of the InfluxDB v2110 HTTP API.
     link: https://github.com/influxdata/telegraf/blob/master/plugins/inputs/http_listener_v2/README.md