Merge branch 'master' into migrate_max_concurrency

remyleone · Dec 3, 2024 · 839e5b4 · 839e5b4
2 parents c261fd0 + 3a6ad01
commit 839e5b4
Show file tree

Hide file tree

Showing 7 changed files with 971 additions and 197 deletions.
diff --git a/docs/data-sources/iam_user.md b/docs/data-sources/iam_user.md
@@ -36,3 +36,5 @@ data "scaleway_iam_user" "find_by_email" {
 In addition to all above arguments, the following attributes are exported:
 
 - `id` - The ID of the IAM user.
+- `tags` - The tags associated with the user.
+
diff --git a/docs/resources/iam_user.md b/docs/resources/iam_user.md
@@ -38,6 +38,8 @@ resource scaleway_iam_user user {
 
 - `email` - (Required) The email of the IAM user.
 
+- `tags` - (Optional) The tags associated with the user.
+
 - `organization_id` - (Defaults to [provider](../index.md#organization_d) `organization_id`) The ID of the organization the user is associated with.
 
 ## Attributes Reference

diff --git a/docs/resources/instance_server.md b/docs/resources/instance_server.md
@@ -272,10 +272,8 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 - `status` The private NIC state.
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the server must be created.
 
-~> **Important:**
-
-- You can only attach an instance in the same [zone](../guides/regions_and_zones.md#zones) as a private network.
-- Instance supports maximum 8 different private networks.
+~> **Important:** You can only attach an instance in the same [zone](../guides/regions_and_zones.md#zones) as a private network.
+~> **Important:** Instance supports a maximum of 8 different private networks.
 
 ## Attributes Reference
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,5 @@ data "scaleway_iam_user" "find_by_email" {
		In addition to all above arguments, the following attributes are exported:

		- `id` - The ID of the IAM user.
		- `tags` - The tags associated with the user.