Skip to content

Commit 839e5b4

Browse files
authored
Merge branch 'master' into migrate_max_concurrency
2 parents c261fd0 + 3a6ad01 commit 839e5b4

File tree

7 files changed

+971
-197
lines changed

7 files changed

+971
-197
lines changed

docs/data-sources/iam_user.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,5 @@ data "scaleway_iam_user" "find_by_email" {
3636
In addition to all above arguments, the following attributes are exported:
3737

3838
- `id` - The ID of the IAM user.
39+
- `tags` - The tags associated with the user.
40+

docs/resources/iam_user.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ resource scaleway_iam_user user {
3838

3939
- `email` - (Required) The email of the IAM user.
4040

41+
- `tags` - (Optional) The tags associated with the user.
42+
4143
- `organization_id` - (Defaults to [provider](../index.md#organization_d) `organization_id`) The ID of the organization the user is associated with.
4244

4345
## Attributes Reference

docs/resources/instance_server.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,8 @@ attached to the server. Updates to this field will trigger a stop/start of the s
272272
- `status` The private NIC state.
273273
- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the server must be created.
274274

275-
~> **Important:**
276-
277-
- You can only attach an instance in the same [zone](../guides/regions_and_zones.md#zones) as a private network.
278-
- Instance supports maximum 8 different private networks.
275+
~> **Important:** You can only attach an instance in the same [zone](../guides/regions_and_zones.md#zones) as a private network.
276+
~> **Important:** Instance supports a maximum of 8 different private networks.
279277

280278
## Attributes Reference
281279

0 commit comments

Comments
 (0)