diff --git a/command/server.go b/command/server.go
index 602981a7fc..b13f8d7103 100644
--- a/command/server.go
+++ b/command/server.go
@@ -205,7 +205,7 @@ func (c *ServerCommand) Run(args []string) int {
 		coreConfig.AdvertiseAddr = envAA
 	}
 
-	// Attempt to detect the advertise address possible
+	// Attempt to detect the advertise address, if possible
 	var detect physical.AdvertiseDetect
 	if coreConfig.HAPhysical != nil {
 		detect, ok = coreConfig.HAPhysical.(physical.AdvertiseDetect)
diff --git a/command/server/config.go b/command/server/config.go
index 450f640f8b..1945040f45 100644
--- a/command/server/config.go
+++ b/command/server/config.go
@@ -365,7 +365,7 @@ func parseBackends(result *Config, list *ast.ObjectList) error {
 		return multierror.Prefix(err, fmt.Sprintf("backend.%s:", key))
 	}
 
-	// Pull out the advertise address since it's commong to all backends
+	// Pull out the advertise address since it's common to all backends
 	var advertiseAddr string
 	if v, ok := m["advertise_addr"]; ok {
 		advertiseAddr = v
@@ -398,7 +398,7 @@ func parseHABackends(result *Config, list *ast.ObjectList) error {
 		return multierror.Prefix(err, fmt.Sprintf("ha_backend.%s:", key))
 	}
 
-	// Pull out the advertise address since it's commong to all backends
+	// Pull out the advertise address since it's common to all backends
 	var advertiseAddr string
 	if v, ok := m["advertise_addr"]; ok {
 		advertiseAddr = v
diff --git a/website/source/docs/config/index.html.md b/website/source/docs/config/index.html.md
index 52226a9f21..237efd1dba 100644
--- a/website/source/docs/config/index.html.md
+++ b/website/source/docs/config/index.html.md
@@ -185,7 +185,7 @@ All backends support the following options:
     nodes to when A is the active node and B and C are standby nodes. This may
     be the same address across nodes if using a load balancer or service
     discovery. Most HA backends will attempt to determine the advertise address
-    if not provided.  This can also be set via the `VAULT_ADVERTISE_ADDR`
+    if not provided.  This can also be overridden via the `VAULT_ADVERTISE_ADDR`
     environment variable.
 
 #### Backend Reference: Consul