Merge pull request #5457 from segmentio/master

Master back to develop

Author: stayseesong

src/guides/intro-impl.md

@@ -100,6 +100,13 @@ There are several different ways to ensure that you can collect your data once,
 
 If you're seeing errors thrown by your destinations, you might have an implementation issue. See the [Integration Error Codes list](/docs/connections/integration_error_codes/) or [contact our Success engineering team](https://segment.com/help/contact/) for help.
 
-
 > success ""
-> Have suggestions for things to add to this guide? [Drop us a line](mailto:docs-feedback@segment.com?subject=Segment%20Dev%20guide%20Suggestion)!
+> Have suggestions for things to add to this guide? [Drop us a line](mailto:docs-feedback@segment.com?subject=Segment%20Dev%20guide%20Suggestion).
+
+## Segment Terraform Provider
+
+> info ""
+> Segment Terraform is currently in the pilot phase and is governed by Segment’s [First Access and Beta Preview Terms](https://www.twilio.com/en-us/legal/tos){:target="_blank"}.
+
+Segment has a [Terraform](https://www.terraform.io/){:target="_blank"} provider, powered by the Public API, that you can use to manage Segment resources, automate cloud deployments, and change control. Take a look at the [Segment provider documentation](https://registry.terraform.io/providers/segmentio/segment/latest/docs){:target="_blank"} on Terraform to see what's supported.
+

src/guides/working-with-ids.md

@@ -4,7 +4,7 @@ hidden: true
 ---
 
 > warning "Critical Segment recommendation"
-> Segment recommends that you use `uuid4` for `anonymousId`.
+> Segment recommends that you use `uuid4` for `anonymousId`, `userId`, and `groupId`.
 
 As part of your Segment implementation, you’ll come across various identifiers (IDs) that Segment’s systems may process. The three most prominent identifiers you’ll encounter are `anonymousId`, `userId`, and `groupId`. 
 
@@ -44,7 +44,7 @@ Here's how Segment generates the IDs you just learned about:
 
 ## Segment's guidance on identifier formats
 
-As you work with identifiers, **Segment recommends that you use `uuidv4` for `anonymousId`**. The following table lists the criteria that Segment recommends your identifiers satisfy, as well as why Segment recommends `uuidv4`:
+As you work with identifiers, **Segment recommends that you use `uuidv4` for `anonymousId`, `userId`, and `groupId`**. The following table lists the criteria that Segment recommends your identifiers satisfy, as well as why Segment recommends `uuidv4`:
 
 | Trait                  | Reasoning                                                                                                                                                                                                                               |
 | ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |