diff --git a/website/helpers/sidebar_helpers.rb b/website/helpers/sidebar_helpers.rb
index 124a7c53c..ef74de49c 100644
--- a/website/helpers/sidebar_helpers.rb
+++ b/website/helpers/sidebar_helpers.rb
@@ -3,7 +3,7 @@ module SidebarHelpers
# if the YAML frontmatter matches the expected value.
def sidebar_current(expected)
current = current_page.data.sidebar_current || ""
- if current.start_with?(expected)
+ if current == expected or (expected.is_a?(Regexp) and expected.match(current))
return " class=\"active\""
else
return ""
diff --git a/website/source/docs/providers/aws/r/lb_cookie_stickiness_policy.html.markdown b/website/source/docs/providers/aws/r/lb_cookie_stickiness_policy.html.markdown
index d728bc2ed..ea3e0f63e 100644
--- a/website/source/docs/providers/aws/r/lb_cookie_stickiness_policy.html.markdown
+++ b/website/source/docs/providers/aws/r/lb_cookie_stickiness_policy.html.markdown
@@ -1,7 +1,7 @@
---
layout: "aws"
page_title: "AWS: aws_lb_cookie_stickiness_policy"
-sidebar_current: "docs-aws-lb-cookie-stickiness-policy"
+sidebar_current: "docs-aws-resource-lb-cookie-stickiness-policy"
description: |-
Provides a load balancer cookie stickiness policy, which allows an ELB to control the sticky session lifetime of the browser.
---
diff --git a/website/source/docs/providers/aws/r/proxy_protocol_policy.html.markdown b/website/source/docs/providers/aws/r/proxy_protocol_policy.html.markdown
index 8781f8ca6..38ef90eb2 100644
--- a/website/source/docs/providers/aws/r/proxy_protocol_policy.html.markdown
+++ b/website/source/docs/providers/aws/r/proxy_protocol_policy.html.markdown
@@ -1,7 +1,7 @@
---
layout: "aws"
page_title: "AWS: aws_proxy_protocol_policy"
-sidebar_current: "docs-aws-proxy-protocol-policy"
+sidebar_current: "docs-aws-resource-proxy-protocol-policy"
description: |-
Provides a proxy protocol policy, which allows an ELB to carry a client connection information to a backend.
---
diff --git a/website/source/docs/providers/aws/r/vpc_peering.html.markdown b/website/source/docs/providers/aws/r/vpc_peering.html.markdown
index 56e75b0bf..4e9720eff 100644
--- a/website/source/docs/providers/aws/r/vpc_peering.html.markdown
+++ b/website/source/docs/providers/aws/r/vpc_peering.html.markdown
@@ -1,7 +1,7 @@
---
layout: "aws"
page_title: "AWS: aws_vpc_peering_connection"
-sidebar_current: "docs-aws-resource-vpc-peering-connection"
+sidebar_current: "docs-aws-resource-vpc-peering"
description: |-
Provides an VPC Peering Connection resource.
---
diff --git a/website/source/docs/providers/aws/r/vpc_connection_route.html.markdown b/website/source/docs/providers/aws/r/vpn_connection_route.html.markdown
similarity index 100%
rename from website/source/docs/providers/aws/r/vpc_connection_route.html.markdown
rename to website/source/docs/providers/aws/r/vpn_connection_route.html.markdown
diff --git a/website/source/layouts/atlas.erb b/website/source/layouts/atlas.erb
index 65e1241b7..8df8365e3 100644
--- a/website/source/layouts/atlas.erb
+++ b/website/source/layouts/atlas.erb
@@ -10,7 +10,7 @@
Atlas Provider
-
>
+ >
Resources
- >
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index bb644a0bb..0423cfe39 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -10,7 +10,7 @@
AWS Provider
- - >
+
- >
Resources
- - >
- aws_vpn_gateway
-
-
- >
aws_vpn_gateway
diff --git a/website/source/layouts/cloudflare.erb b/website/source/layouts/cloudflare.erb
index d30ce6db5..71364951d 100644
--- a/website/source/layouts/cloudflare.erb
+++ b/website/source/layouts/cloudflare.erb
@@ -10,7 +10,7 @@
CloudFlare Provider
- >
+ >
Resources
- >
diff --git a/website/source/layouts/cloudstack.erb b/website/source/layouts/cloudstack.erb
index 1d727650f..d9830586c 100644
--- a/website/source/layouts/cloudstack.erb
+++ b/website/source/layouts/cloudstack.erb
@@ -10,7 +10,7 @@
CloudStack Provider
- - >
+
- >
Resources
- >
diff --git a/website/source/layouts/consul.erb b/website/source/layouts/consul.erb
index 012bc4d5c..d9ca73e3c 100644
--- a/website/source/layouts/consul.erb
+++ b/website/source/layouts/consul.erb
@@ -10,7 +10,7 @@
Consul Provider
- - >
+
- >
Resources
- >
diff --git a/website/source/layouts/digitalocean.erb b/website/source/layouts/digitalocean.erb
index 63d97742a..42ede7db3 100644
--- a/website/source/layouts/digitalocean.erb
+++ b/website/source/layouts/digitalocean.erb
@@ -10,7 +10,7 @@
DigitalOcean Provider
- - >
+
- >
Resources
- >
diff --git a/website/source/layouts/dme.erb b/website/source/layouts/dme.erb
index f1adf54d7..e3bd4558e 100644
--- a/website/source/layouts/dme.erb
+++ b/website/source/layouts/dme.erb
@@ -10,7 +10,7 @@
DNSMadeEasy Provider
- - >
+
- >
Resources
- >
diff --git a/website/source/layouts/dnsimple.erb b/website/source/layouts/dnsimple.erb
index fcf9074a3..531d15446 100644
--- a/website/source/layouts/dnsimple.erb
+++ b/website/source/layouts/dnsimple.erb
@@ -10,7 +10,7 @@
DNSimple Provider
- - >
+
- >
Resources
- >
diff --git a/website/source/layouts/docker.erb b/website/source/layouts/docker.erb
index 6e39096b9..5bb5a1514 100644
--- a/website/source/layouts/docker.erb
+++ b/website/source/layouts/docker.erb
@@ -10,7 +10,7 @@
Docker Provider
- - >
+
- >
Resources
- >
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index 493dc6816..c7a3d711b 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -6,7 +6,7 @@
Documentation Home
- - >
+
- >
Configuration
- - >
+
- >
Commands (CLI)
- - >
+
- >
State
- - >
+
- >
Providers
- - >
+
- >
Provisioners
- - >
+
- >
Modules
- - >
+
- >
Plugins
- - >
+
- >
Internals
- >
diff --git a/website/source/layouts/google.erb b/website/source/layouts/google.erb
index fbf05b201..fc36ea215 100644
--- a/website/source/layouts/google.erb
+++ b/website/source/layouts/google.erb
@@ -10,7 +10,7 @@
Google Provider
- - >
+
- >
Resources
- >
diff --git a/website/source/layouts/heroku.erb b/website/source/layouts/heroku.erb
index 64eccec53..3e4ea8331 100644
--- a/website/source/layouts/heroku.erb
+++ b/website/source/layouts/heroku.erb
@@ -10,7 +10,7 @@
Heroku Provider
- - >
+
- >
Resources
- >
diff --git a/website/source/layouts/intro.erb b/website/source/layouts/intro.erb
index 9c19a75db..294cd279f 100644
--- a/website/source/layouts/intro.erb
+++ b/website/source/layouts/intro.erb
@@ -10,7 +10,7 @@
Use Cases
- - >
+
- >
Terraform vs. Other Software
- - >
+
- >
Getting Started
- - >
+
- >
Example Configurations
- >
diff --git a/website/source/layouts/mailgun.erb b/website/source/layouts/mailgun.erb
index ca85eb9f2..8af740c32 100644
--- a/website/source/layouts/mailgun.erb
+++ b/website/source/layouts/mailgun.erb
@@ -10,7 +10,7 @@
Mailgun Provider
- - >
+
- >
Resources
- >
diff --git a/website/source/layouts/openstack.erb b/website/source/layouts/openstack.erb
index 4646ae904..39a54fe72 100644
--- a/website/source/layouts/openstack.erb
+++ b/website/source/layouts/openstack.erb
@@ -10,7 +10,7 @@
OpenStack Provider
- - >
+
- >
Resources
- >
diff --git a/website/source/layouts/template.erb b/website/source/layouts/template.erb
index 05c2a4b26..e9dca7dbb 100644
--- a/website/source/layouts/template.erb
+++ b/website/source/layouts/template.erb
@@ -10,7 +10,7 @@
Template Provider
- - >
+
- >
Resources