Skip to content

Commit a636371

Browse files
authored
Merge pull request #220448 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents e5bbad4 + 6ae635c commit a636371

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

articles/active-directory/conditional-access/concept-conditional-access-users-groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ If you do find yourself locked out, see [What to do if you're locked out of the
9797

9898
Conditional Access policies that target external users may interfere with service provider access, for example granular delegated admin privileges [Introduction to granular delegated admin privileges (GDAP)](/partner-center/gdap-introduction). For policies that are intended to target service provider tenants, use the **Service provider user** external user type available in the **Guest or external users** selection options.
9999

100-
## Workload identities (Preview)
100+
## Workload identities
101101

102102
A workload identity is an identity that allows an application or service principal access to resources, sometimes in the context of a user. Conditional Access policies can be applied to single tenant service principals that have been registered in your tenant. Third party SaaS and multi-tenanted apps are out of scope. Managed identities aren't covered by policy.
103103

articles/aks/kubernetes-action.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ jobs:
164164
manifests: |
165165
azure-vote-all-in-one-redis.yaml
166166
images: '${{ secrets.registry }}.azurecr.io/${{ secrets.repository }}/azure-vote-front:${{ github.sha }}'
167-
pull: false
167+
pull-images: false
168168
```
169169
170170
> [!IMPORTANT]

articles/aks/node-updates-kured.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The process to keep Windows Server nodes up to date is a little different. Windo
1919
This article shows you how to use the open-source [kured (KUbernetes REboot Daemon)][kured] to watch for Linux nodes that require a reboot, then automatically handle the rescheduling of running pods and node reboot process.
2020

2121
> [!NOTE]
22-
> `Kured` is an open-source project by Weaveworks. Please direct issues to the [kured GitHub][kured]. Additional support can be found in the #weave-community Slack channel.
22+
> `Kured` is an open-source project in the Cloud Native Computing Foundation. Please direct issues to the [kured GitHub][kured]. Additional support can be found in the #kured channel on [CNCF Slack](https://slack.cncf.io).
2323
2424
## Before you begin
2525

@@ -108,7 +108,7 @@ This article detailed how to use `kured` to reboot Linux nodes automatically as
108108
For AKS clusters that use Windows Server nodes, see [Upgrade a node pool in AKS][nodepool-upgrade].
109109

110110
<!-- LINKS - external -->
111-
[kured]: https://github.com/weaveworks/kured
111+
[kured]: https://github.com/kubereboot/kured
112112
[kured-install]: https://github.com/kubereboot/kured/tree/main/cmd/kured
113113
[kubectl-get-nodes]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get
114114

articles/azure-monitor/agents/agent-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The change doesn't require any customer action unless you're running the agent o
4242
- Windows Server 2008 R2 SP1
4343

4444
1. Install the SHA-2 signing Windows updates for your OS as described in [2019 SHA-2 code signing support requirement for Windows and WSUS](https://support.microsoft.com/help/4472027/2019-sha-2-code-signing-support-requirement-for-windows-and-wsus).
45-
1. Update to the latest version of the Windows agent (version 10.20.18029).
45+
1. Update to the latest version of the Windows agent (version 10.20.18067).
4646
1. We recommend that you configure the agent to [use TLS 1.2](agent-windows.md#configure-agent-to-use-tls-12).
4747

4848
### Network requirements

articles/azure-video-indexer/invite-users.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Only the account’s admin can add or remove users. When using paid accounts, yo
2626
1. After you press **Invite**, the person will be added to the list of pending invites. <br/>You can choose from two options for each invitee who didn't yet join the account: **remove invitation** or **copy invitation URL**.
2727

2828
:::image type="content" source="./media/invite-users/invites-pending.png" alt-text="Pending invites":::
29-
1. Once the invitee joins the account, you will see three options to choose from. Two options for roles: **contributor** (default) or **owner**. Of, you can choose to remove the invitee by pressing **Remove**.
29+
1. Once the invitee joins the account, you will see two role options to choose from: **contributor** (default) or **owner**. You are also able to remove the user from your account.
3030

3131
:::image type="content" source="./media/invite-users/joined-invitee-options.png" alt-text="Joined invitee":::
3232

articles/virtual-machines/linux/using-cloud-init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ There are two stages to making cloud-init available to the endorsed Linux distro
4848
|RedHat 7 |RHEL |7.7, 7.8, 7_9 |latest |yes | yes |
4949
|RedHat 8 |RHEL |8.1, 8.2, 8_3, 8_4 |latest |yes | yes |
5050

51-
* All other RedHat SKUs starting from RHEL 7 (version 7.7) and RHEL 8 (version 8.1) including both Gen1 and Gen2 images are provisioned using cloud-init. RHEL 6 images don't support cloud-init.
51+
* All other RedHat SKUs starting from RHEL 7 (version 7.7) and RHEL 8 (version 8.1) including both Gen1 and Gen2 images are provisioned using cloud-init. Cloud-init is not supported on RHEL 6.
5252

5353

5454
### CentOS

0 commit comments

Comments
 (0)