From a4c56b5056f5a63879310c11af5a039fff7ab5e6 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 1 Mar 2017 14:52:12 -0800 Subject: [PATCH] website: clarify elb vs alb --- website/source/docs/providers/aws/r/alb.html.markdown | 4 ++++ website/source/docs/providers/aws/r/elb.html.markdown | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/website/source/docs/providers/aws/r/alb.html.markdown b/website/source/docs/providers/aws/r/alb.html.markdown index f6a16163b..18513be1c 100644 --- a/website/source/docs/providers/aws/r/alb.html.markdown +++ b/website/source/docs/providers/aws/r/alb.html.markdown @@ -10,6 +10,10 @@ description: |- Provides an Application Load Balancer resource. +The official AWS CLI calls this "elbv2" while their documentation calls it +an Application Load Balancer. Terraform uses "ALB" but they mean the same +thing. + ## Example Usage ``` diff --git a/website/source/docs/providers/aws/r/elb.html.markdown b/website/source/docs/providers/aws/r/elb.html.markdown index 093080bbf..ee0bbdd4b 100644 --- a/website/source/docs/providers/aws/r/elb.html.markdown +++ b/website/source/docs/providers/aws/r/elb.html.markdown @@ -8,7 +8,9 @@ description: |- # aws\_elb -Provides an Elastic Load Balancer resource. +Provides an Elastic Load Balancer resource, also known as a "Classic +Load Balancer" after the release of +[Application Load Balancers](/docs/providers/aws/r/alb.html). ~> **NOTE on ELB Instances and ELB Attachments:** Terraform currently provides both a standalone [ELB Attachment resource](elb_attachment.html) @@ -16,6 +18,7 @@ provides both a standalone [ELB Attachment resource](elb_attachment.html) `instances` defined in-line. At this time you cannot use an ELB with in-line instances in conjunction with a ELB Attachment resources. Doing so will cause a conflict and will overwrite attachments. + ## Example Usage ```