diff --git a/docs/AGGREGATORS.md b/docs/AGGREGATORS.md
index d5e8750b4..44bc0019e 100644
--- a/docs/AGGREGATORS.md
+++ b/docs/AGGREGATORS.md
@@ -9,7 +9,7 @@ This section is for developers who want to create a new aggregator plugin.
   register themselves.  See below for a quick example.
 * To be available within Telegraf itself, plugins must register themselves
   using a file in `github.com/influxdata/telegraf/plugins/aggregators/all`
-  named according to the plugin name. Make sure your also add build-tags to
+  named according to the plugin name. Make sure you also add build-tags to
   conditionally build the plugin.
 * Each plugin requires a file called `sample.conf` containing the sample configuration
   for the plugin in TOML format.
diff --git a/docs/INPUTS.md b/docs/INPUTS.md
index d8078f8e5..0908a643d 100644
--- a/docs/INPUTS.md
+++ b/docs/INPUTS.md
@@ -15,7 +15,7 @@ and submit new inputs.
   themselves.  See below for a quick example.
 - To be available within Telegraf itself, plugins must register themselves
   using a file in `github.com/influxdata/telegraf/plugins/inputs/all` named
-  according to the plugin name. Make sure your also add build-tags to
+  according to the plugin name. Make sure you also add build-tags to
   conditionally build the plugin.
 - Each plugin requires a file called `sample.conf` containing the sample
   configuration  for the plugin in TOML format.
diff --git a/docs/OUTPUTS.md b/docs/OUTPUTS.md
index 899406be7..5d18f39bc 100644
--- a/docs/OUTPUTS.md
+++ b/docs/OUTPUTS.md
@@ -11,7 +11,7 @@ similar constructs.
   themselves.  See below for a quick example.
 - To be available within Telegraf itself, plugins must register themselves
   using a file in `github.com/influxdata/telegraf/plugins/outputs/all` named
-  according to the plugin name. Make sure your also add build-tags to
+  according to the plugin name. Make sure you also add build-tags to
   conditionally build the plugin.
 - Each plugin requires a file called `sample.conf` containing the sample
   configuration  for the plugin in TOML format.
diff --git a/docs/PROCESSORS.md b/docs/PROCESSORS.md
index 6a5d08a6c..75a142aa5 100644
--- a/docs/PROCESSORS.md
+++ b/docs/PROCESSORS.md
@@ -9,7 +9,7 @@ This section is for developers who want to create a new processor plugin.
   themselves.  See below for a quick example.
 * To be available within Telegraf itself, plugins must register themselves
   using a file in `github.com/influxdata/telegraf/plugins/processors/all`
-  named according to the plugin name. Make sure your also add build-tags to
+  named according to the plugin name. Make sure you also add build-tags to
   conditionally build the plugin.
 * Each plugin requires a file called `sample.conf` containing the sample
   configuration  for the plugin in TOML format.
diff --git a/internal/limiter/limiter.go b/internal/limiter/limiter.go
index c5689751d..98fcd9257 100644
--- a/internal/limiter/limiter.go
+++ b/internal/limiter/limiter.go
@@ -5,7 +5,7 @@ import (
 	"time"
 )
 
-// NewRateLimiter returns a rate limiter that will will emit from the C
+// NewRateLimiter returns a rate limiter that will emit from the C
 // channel only 'n' times every 'rate' seconds.
 func NewRateLimiter(n int, rate time.Duration) *rateLimiter {
 	r := &rateLimiter{
diff --git a/models/running_output.go b/models/running_output.go
index f9d9019d9..3f42b17b7 100644
--- a/models/running_output.go
+++ b/models/running_output.go
@@ -137,7 +137,6 @@ func (r *RunningOutput) ID() string {
 }
 
 // AddMetric adds a metric to the output.
-//
 // Takes ownership of metric
 func (r *RunningOutput) AddMetric(metric telegraf.Metric) {
 	if ok := r.Config.Filter.Select(metric); !ok {
diff --git a/plugins/inputs/riemann_listener/riemann_listener.go b/plugins/inputs/riemann_listener/riemann_listener.go
index 8944bf127..da654eaee 100644
--- a/plugins/inputs/riemann_listener/riemann_listener.go
+++ b/plugins/inputs/riemann_listener/riemann_listener.go
@@ -153,7 +153,7 @@ func (rsl *riemannListener) removeConnection(c net.Conn) {
 /*
 readMessages will read Riemann messages in binary format
 from the TCP connection. byte Array p size will depend on the size
-of the riemann  message as sent by the cleint
+of the riemann  message as sent by the client
 */
 func readMessages(r io.Reader, p []byte) error {
 	for len(p) > 0 {