From 426065a8f2611b2baccc44b4afe8b8a8cf0a7cf9 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Fri, 7 Apr 2017 00:14:57 -0400 Subject: [PATCH] Fix broken links --- ...e.html.md => terraform-enterprise.html.md} | 2 +- .../source/docs/commands/push.html.markdown | 4 +-- ...e.html.md => terraform-enterprise.html.md} | 2 +- .../docs/enterprise/glossary/index.html.md | 10 ------- .../packer/artifacts/creating-amis.html.md | 2 +- .../d/artifact.html.markdown | 4 +-- .../index.html.markdown | 5 ++-- .../r/artifact.html.markdown | 6 ++--- .../terraform/d/remote_state.html.md | 2 +- website/source/layouts/backend-types.erb | 6 ++--- website/source/layouts/docs.erb | 8 +++--- .../source/layouts/terraform-enterprise.erb | 27 +++++++++++++++++++ website/source/layouts/tfe.erb | 27 ------------------- 13 files changed, 47 insertions(+), 58 deletions(-) rename website/source/docs/backends/types/{tfe.html.md => terraform-enterprise.html.md} (94%) rename website/source/docs/configuration/{tfe.html.md => terraform-enterprise.html.md} (97%) rename website/source/docs/providers/{tfe => terraform-enterprise}/d/artifact.html.markdown (97%) rename website/source/docs/providers/{tfe => terraform-enterprise}/index.html.markdown (93%) rename website/source/docs/providers/{tfe => terraform-enterprise}/r/artifact.html.markdown (94%) create mode 100644 website/source/layouts/terraform-enterprise.erb delete mode 100644 website/source/layouts/tfe.erb diff --git a/website/source/docs/backends/types/tfe.html.md b/website/source/docs/backends/types/terraform-enterprise.html.md similarity index 94% rename from website/source/docs/backends/types/tfe.html.md rename to website/source/docs/backends/types/terraform-enterprise.html.md index 4a5c6cb727..13663ac6a4 100644 --- a/website/source/docs/backends/types/tfe.html.md +++ b/website/source/docs/backends/types/terraform-enterprise.html.md @@ -1,7 +1,7 @@ --- layout: "backend-types" page_title: "Backend Type: terraform enterprise" -sidebar_current: "docs-backends-types-standard-tfe" +sidebar_current: "docs-backends-types-standard-terraform-enterprise" description: |- Terraform can store the state in Terraform Enterprise --- diff --git a/website/source/docs/commands/push.html.markdown b/website/source/docs/commands/push.html.markdown index 0269565937..388f10a68f 100644 --- a/website/source/docs/commands/push.html.markdown +++ b/website/source/docs/commands/push.html.markdown @@ -48,7 +48,7 @@ The command-line flags are all optional. The list of available flags are: configurations not just to your account but to other accounts and organizations. This setting can also be set in the configuration in the - [Terraform Enterprise section](/docs/configuration/tfe.html). + [Terraform Enterprise section](/docs/configuration/terraform-enterprise.html). * `-no-color` - Disables output with coloring @@ -88,7 +88,7 @@ The reason Terraform uploads all of these files is because Terraform cannot know what is and isn't being used for provisioning, so it uploads all the files to be safe. To exclude certain files, specify the `-exclude` flag when pushing, or specify the `exclude` parameter in the -[Terraform Enterprise configuration section](/docs/configuration/tfe.html). +[Terraform Enterprise configuration section](/docs/configuration/terraform-enterprise.html). ## Terraform Variables diff --git a/website/source/docs/configuration/tfe.html.md b/website/source/docs/configuration/terraform-enterprise.html.md similarity index 97% rename from website/source/docs/configuration/tfe.html.md rename to website/source/docs/configuration/terraform-enterprise.html.md index bb4d94f518..04a596bcbd 100644 --- a/website/source/docs/configuration/tfe.html.md +++ b/website/source/docs/configuration/terraform-enterprise.html.md @@ -1,7 +1,7 @@ --- layout: "docs" page_title: "Configuring Terraform Enterprise" -sidebar_current: "docs-config-tfe" +sidebar_current: "docs-config-terraform-enterprise" description: |- Terraform Enterprise is the ideal way to use Terraform in a team environment. Terraform Enterprise will run Terraform for you, safely handle parallelization across different team members, save run history along with plans, and more. --- diff --git a/website/source/docs/enterprise/glossary/index.html.md b/website/source/docs/enterprise/glossary/index.html.md index dc573c2c9d..a3da0bd95b 100755 --- a/website/source/docs/enterprise/glossary/index.html.md +++ b/website/source/docs/enterprise/glossary/index.html.md @@ -118,16 +118,6 @@ is recorded and sent to any configured notification methods, like email. An infrastructure is a stateful representation of a set of Consul datacenters. -## Managed Node - -Managed node is the billing metric for Terraform Enterprise. For Consul Enterprise, a node is a host -with a Consul agent on it. For Terraform Enterprise, a node is a compute -resource managed by Terraform. See [Managed Nodes](/docs/enterprise/billing) -for more details about which Terraform resources and resource properties are counted -as compute resources. - -All [Terraform Enterprise features](/docs/enterprise) are paid. - ## Operator An operator is a person who is making changes to infrastructure or settings. diff --git a/website/source/docs/enterprise/packer/artifacts/creating-amis.html.md b/website/source/docs/enterprise/packer/artifacts/creating-amis.html.md index 3f86788220..61257bc003 100755 --- a/website/source/docs/enterprise/packer/artifacts/creating-amis.html.md +++ b/website/source/docs/enterprise/packer/artifacts/creating-amis.html.md @@ -51,7 +51,7 @@ Below is a complete example Packer template that starts an AWS instance. "source_ami": "ami-2ccc7a44", "instance_type": "c3.large", "ssh_username": "ubuntu", - "ami_name": "TFE Example {{ timestamp }}" + "ami_name": "Terraform Enterprise Example {{ timestamp }}" } ], "post-processors": [ diff --git a/website/source/docs/providers/tfe/d/artifact.html.markdown b/website/source/docs/providers/terraform-enterprise/d/artifact.html.markdown similarity index 97% rename from website/source/docs/providers/tfe/d/artifact.html.markdown rename to website/source/docs/providers/terraform-enterprise/d/artifact.html.markdown index aaef2db11a..200290dca4 100644 --- a/website/source/docs/providers/tfe/d/artifact.html.markdown +++ b/website/source/docs/providers/terraform-enterprise/d/artifact.html.markdown @@ -1,7 +1,7 @@ --- -layout: "tfe" +layout: "terraform-enterprise" page_title: "Terraform Enterprise: atlas_artifact" -sidebar_current: "docs-tfe-data-artifact" +sidebar_current: "docs-terraform-enterprise-data-artifact" description: |- Provides a data source to deployment artifacts managed by Terraform Enterprise. This can be used to dynamically configure instantiation and provisioning diff --git a/website/source/docs/providers/tfe/index.html.markdown b/website/source/docs/providers/terraform-enterprise/index.html.markdown similarity index 93% rename from website/source/docs/providers/tfe/index.html.markdown rename to website/source/docs/providers/terraform-enterprise/index.html.markdown index 836509ecff..978630975c 100644 --- a/website/source/docs/providers/tfe/index.html.markdown +++ b/website/source/docs/providers/terraform-enterprise/index.html.markdown @@ -1,7 +1,7 @@ --- -layout: "tfe" +layout: "terraform-enterprise" page_title: "Provider: Terraform Enterprise" -sidebar_current: "docs-tfe-index" +sidebar_current: "docs-terraform-enterprise-index" description: |- The Terraform Enterprise provider is used to interact with configuration, artifacts, and metadata managed by the Terraform Enterprise service. @@ -40,4 +40,3 @@ The following arguments are supported: * `token` - (Required) API token. This can also be specified with the `ATLAS_TOKEN` shell environment variable. - diff --git a/website/source/docs/providers/tfe/r/artifact.html.markdown b/website/source/docs/providers/terraform-enterprise/r/artifact.html.markdown similarity index 94% rename from website/source/docs/providers/tfe/r/artifact.html.markdown rename to website/source/docs/providers/terraform-enterprise/r/artifact.html.markdown index 514dbba799..ce9fbde30f 100644 --- a/website/source/docs/providers/tfe/r/artifact.html.markdown +++ b/website/source/docs/providers/terraform-enterprise/r/artifact.html.markdown @@ -1,7 +1,7 @@ --- -layout: "tfe" +layout: "terraform-enterprise" page_title: "Terraform Enterprise: atlas_artifact" -sidebar_current: "docs-tfe-resource-artifact" +sidebar_current: "docs-terraform-enterprise-resource-artifact" description: |- Provides access to deployment artifacts managed by Terraform Enterprise. This can be used to dynamically configure instantiation and provisioning @@ -16,7 +16,7 @@ of resources. ~> **This resource is deprecated!** Please use the -[Artifact Data Source](/docs/providers/tfe/d/artifact.html) +[Artifact Data Source](/docs/providers/terraform-enterprise/d/artifact.html) ## Example Usage diff --git a/website/source/docs/providers/terraform/d/remote_state.html.md b/website/source/docs/providers/terraform/d/remote_state.html.md index b24207773a..c54fdb014c 100644 --- a/website/source/docs/providers/terraform/d/remote_state.html.md +++ b/website/source/docs/providers/terraform/d/remote_state.html.md @@ -33,7 +33,7 @@ The following arguments are supported: * `backend` - (Required) The remote backend to use. * `environment` - (Optional) The Terraform environment to use. * `config` - (Optional) The configuration of the remote backend. - * Remote state config docs can be found [here](/docs/backends/types/atlas.html) + * Remote state config docs can be found [here](/docs/backends/types/terraform-enterprise.html) ## Attributes Reference diff --git a/website/source/layouts/backend-types.erb b/website/source/layouts/backend-types.erb index 9c36d36e16..10dd5300b2 100644 --- a/website/source/layouts/backend-types.erb +++ b/website/source/layouts/backend-types.erb @@ -27,7 +27,7 @@ artifactory > - atlas + atlas > azure @@ -53,8 +53,8 @@ > swift - > - terraform enterprise + > + terraform enterprise diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 8a643f029d..2cf07ddecb 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -48,8 +48,8 @@ Terraform - > - Terraform Enterprise + > + Terraform Enterprise > @@ -196,8 +196,8 @@ Arukas - > - Terraform Enterprise + > + Terraform Enterprise > diff --git a/website/source/layouts/terraform-enterprise.erb b/website/source/layouts/terraform-enterprise.erb new file mode 100644 index 0000000000..c2709e1291 --- /dev/null +++ b/website/source/layouts/terraform-enterprise.erb @@ -0,0 +1,27 @@ +<% wrap_layout :inner do %> + <% content_for :sidebar do %> + + <% end %> + + <%= yield %> +<% end %> diff --git a/website/source/layouts/tfe.erb b/website/source/layouts/tfe.erb deleted file mode 100644 index f928a8d4b7..0000000000 --- a/website/source/layouts/tfe.erb +++ /dev/null @@ -1,27 +0,0 @@ -<% wrap_layout :inner do %> - <% content_for :sidebar do %> - - <% end %> - - <%= yield %> -<% end %>