From a9bcc0fe06b1b53114b57c5b4524fc543f8905f8 Mon Sep 17 00:00:00 2001 From: Nick Fagerlund Date: Wed, 16 Jan 2019 15:41:36 -0800 Subject: [PATCH] website: Fix sidebar nav links and 'sidebar_current' IDs for 0.11 docs Because of the different possibilities for arranging the nav sidebars, we want to make sure: - IDs for the 0.11 and 0.12 language docs have a common prefix. - That prefix is not the exact string `docs-config`. Have I mentioned before that I really dislike this prefix matching behavior. --- .../configuration-0-11/data-sources.html.md | 2 +- .../environment-variables.html.md | 2 +- website/docs/configuration-0-11/index.html.md | 2 +- .../configuration-0-11/interpolation.html.md | 2 +- website/docs/configuration-0-11/load.html.md | 2 +- .../docs/configuration-0-11/locals.html.md | 2 +- .../docs/configuration-0-11/modules.html.md | 2 +- .../docs/configuration-0-11/outputs.html.md | 2 +- .../docs/configuration-0-11/override.html.md | 2 +- .../docs/configuration-0-11/providers.html.md | 2 +- .../docs/configuration-0-11/resources.html.md | 2 +- .../docs/configuration-0-11/syntax.html.md | 2 +- .../terraform-enterprise.html.md | 2 +- .../docs/configuration-0-11/terraform.html.md | 2 +- .../docs/configuration-0-11/variables.html.md | 2 +- website/layouts/docs.erb | 60 +++++++++---------- 16 files changed, 45 insertions(+), 45 deletions(-) diff --git a/website/docs/configuration-0-11/data-sources.html.md b/website/docs/configuration-0-11/data-sources.html.md index 6897eb34ae..7f374641a0 100644 --- a/website/docs/configuration-0-11/data-sources.html.md +++ b/website/docs/configuration-0-11/data-sources.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuring Data Sources" -sidebar_current: "docs-config-data-sources" +sidebar_current: "docs-conf-old-data-sources" description: |- Data sources allow data to be fetched or computed for use elsewhere in Terraform configuration. --- diff --git a/website/docs/configuration-0-11/environment-variables.html.md b/website/docs/configuration-0-11/environment-variables.html.md index 5df5deb0ee..85110d060f 100644 --- a/website/docs/configuration-0-11/environment-variables.html.md +++ b/website/docs/configuration-0-11/environment-variables.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Environment Variables" -sidebar_current: "docs-config-environment-variables" +sidebar_current: "docs-conf-old-environment-variables" description: |- Terraform uses different environment variables that can be used to configure various aspects of how Terraform behaves. this section documents those variables, their potential values, and how to use them. --- diff --git a/website/docs/configuration-0-11/index.html.md b/website/docs/configuration-0-11/index.html.md index 2b3e7f396d..02b90d3bd0 100644 --- a/website/docs/configuration-0-11/index.html.md +++ b/website/docs/configuration-0-11/index.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuration" -sidebar_current: "docs-config" +sidebar_current: "docs-conf-old" description: |- Terraform uses text files to describe infrastructure and to set variables. These text files are called Terraform _configurations_ and end in `.tf`. This section talks about the format of these files as well as how they're loaded. --- diff --git a/website/docs/configuration-0-11/interpolation.html.md b/website/docs/configuration-0-11/interpolation.html.md index b4b4b1607c..52441c3d7c 100644 --- a/website/docs/configuration-0-11/interpolation.html.md +++ b/website/docs/configuration-0-11/interpolation.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Interpolation Syntax" -sidebar_current: "docs-config-interpolation" +sidebar_current: "docs-conf-old-interpolation" description: |- Embedded within strings in Terraform, whether you're using the Terraform syntax or JSON syntax, you can interpolate other values into strings. These interpolations are wrapped in `${}`, such as `${var.foo}`. --- diff --git a/website/docs/configuration-0-11/load.html.md b/website/docs/configuration-0-11/load.html.md index 101ac3fec5..32ed3d0c13 100644 --- a/website/docs/configuration-0-11/load.html.md +++ b/website/docs/configuration-0-11/load.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Load Order and Semantics" -sidebar_current: "docs-config-load" +sidebar_current: "docs-conf-old-load" description: |- When invoking any command that loads the Terraform configuration, Terraform loads all configuration files within the directory specified in alphabetical order. --- diff --git a/website/docs/configuration-0-11/locals.html.md b/website/docs/configuration-0-11/locals.html.md index d897ccf809..514948e58b 100644 --- a/website/docs/configuration-0-11/locals.html.md +++ b/website/docs/configuration-0-11/locals.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuring Local Values" -sidebar_current: "docs-config-locals" +sidebar_current: "docs-conf-old-locals" description: |- Local values assign a name to an expression that can then be used multiple times within a module. diff --git a/website/docs/configuration-0-11/modules.html.md b/website/docs/configuration-0-11/modules.html.md index 15c1b37e12..4045d8b98a 100644 --- a/website/docs/configuration-0-11/modules.html.md +++ b/website/docs/configuration-0-11/modules.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuring Modules" -sidebar_current: "docs-config-modules" +sidebar_current: "docs-conf-old-modules" description: |- Modules are used in Terraform to modularize and encapsulate groups of resources in your infrastructure. For more information on modules, see the dedicated modules section. --- diff --git a/website/docs/configuration-0-11/outputs.html.md b/website/docs/configuration-0-11/outputs.html.md index dadc1f2534..36436abdcc 100644 --- a/website/docs/configuration-0-11/outputs.html.md +++ b/website/docs/configuration-0-11/outputs.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuring Outputs" -sidebar_current: "docs-config-outputs" +sidebar_current: "docs-conf-old-outputs" description: |- Outputs define values that will be highlighted to the user when Terraform applies, and can be queried easily using the output command. Output usage is covered in more detail in the getting started guide. This page covers configuration syntax for outputs. --- diff --git a/website/docs/configuration-0-11/override.html.md b/website/docs/configuration-0-11/override.html.md index 0d497f6e15..216b0c3bcd 100644 --- a/website/docs/configuration-0-11/override.html.md +++ b/website/docs/configuration-0-11/override.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Overrides" -sidebar_current: "docs-config-override" +sidebar_current: "docs-conf-old-override" description: |- Terraform loads all configuration files within a directory and appends them together. Terraform also has a concept of overrides, a way to create files that are loaded last and merged into your configuration, rather than appended. --- diff --git a/website/docs/configuration-0-11/providers.html.md b/website/docs/configuration-0-11/providers.html.md index cb93f747d6..173c4d99c9 100644 --- a/website/docs/configuration-0-11/providers.html.md +++ b/website/docs/configuration-0-11/providers.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuring Providers" -sidebar_current: "docs-config-providers" +sidebar_current: "docs-conf-old-providers" description: |- Providers are responsible in Terraform for managing the lifecycle of a resource: create, read, update, delete. --- diff --git a/website/docs/configuration-0-11/resources.html.md b/website/docs/configuration-0-11/resources.html.md index c2bb21daf4..25494fc41c 100644 --- a/website/docs/configuration-0-11/resources.html.md +++ b/website/docs/configuration-0-11/resources.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuring Resources" -sidebar_current: "docs-config-resources" +sidebar_current: "docs-conf-old-resources" description: |- The most important thing you'll configure with Terraform are resources. Resources are a component of your infrastructure. It might be some low level component such as a physical server, virtual machine, or container. Or it can be a higher level component such as an email provider, DNS record, or database provider. --- diff --git a/website/docs/configuration-0-11/syntax.html.md b/website/docs/configuration-0-11/syntax.html.md index 56ffe511d7..cdfd439dcf 100644 --- a/website/docs/configuration-0-11/syntax.html.md +++ b/website/docs/configuration-0-11/syntax.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuration Syntax" -sidebar_current: "docs-config-syntax" +sidebar_current: "docs-conf-old-syntax" description: |- The syntax of Terraform configurations is custom. It is meant to strike a balance between human readable and editable as well as being machine-friendly. diff --git a/website/docs/configuration-0-11/terraform-enterprise.html.md b/website/docs/configuration-0-11/terraform-enterprise.html.md index 9184d76c22..338438c15d 100644 --- a/website/docs/configuration-0-11/terraform-enterprise.html.md +++ b/website/docs/configuration-0-11/terraform-enterprise.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuring Terraform Push" -sidebar_current: "docs-config-push" +sidebar_current: "docs-conf-old-push" description: |- Terraform's push command was a way to interact with the legacy version of Terraform Enterprise. It is not supported in the current version of Terraform Enterprise. --- diff --git a/website/docs/configuration-0-11/terraform.html.md b/website/docs/configuration-0-11/terraform.html.md index 1f1391c182..0e56d745ba 100644 --- a/website/docs/configuration-0-11/terraform.html.md +++ b/website/docs/configuration-0-11/terraform.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuring Terraform" -sidebar_current: "docs-config-terraform" +sidebar_current: "docs-conf-old-terraform" description: |- The `terraform` configuration section is used to configure Terraform itself, such as requiring a minimum Terraform version to execute a configuration. --- diff --git a/website/docs/configuration-0-11/variables.html.md b/website/docs/configuration-0-11/variables.html.md index 6d130a6a60..f3bfa8ff43 100644 --- a/website/docs/configuration-0-11/variables.html.md +++ b/website/docs/configuration-0-11/variables.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuring Input Variables" -sidebar_current: "docs-config-variables" +sidebar_current: "docs-conf-old-variables" description: |- Input variables are parameters for Terraform modules. This page covers configuration syntax for variables. diff --git a/website/layouts/docs.erb b/website/layouts/docs.erb index d128abf2fc..a5e950c901 100644 --- a/website/layouts/docs.erb +++ b/website/layouts/docs.erb @@ -68,63 +68,63 @@ - > - Configuration + > + v0.11 Configuration Language