Skip to content

Commit bb21926

Browse files
authored
Merge pull request #192196 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 463f25c + d64ff7b commit bb21926

File tree

10 files changed

+26
-16
lines changed

10 files changed

+26
-16
lines changed

articles/active-directory/develop/sample-v2-code.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,15 @@ The following sample shows a public client application running on a device witho
136136
> | Java | [Sign in users and invoke protected API](https://github.com/Azure-Samples/ms-identity-java-devicecodeflow) | MSAL Java | Device code |
137137
> | Python | [Call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-python-devicecodeflow) | MSAL Python | Device code |
138138
139+
## Microsoft Teams applications
140+
141+
The following sample illustrates Microsoft Teams Tab application that signs in users. Additionally it demonstrates how to call Microsoft Graph API with the user's identity using the Microsoft Authentication Library (MSAL).
142+
143+
> [!div class="mx-tdCol2BreakAll"]
144+
> | Language/<br/>Platform | Code sample(s) <br/>on GitHub | Auth<br/> libraries | Auth flow |
145+
> | ------- | -------- | ------------- | -------------- |
146+
> | Node.js | [Teams Tab app: single sign-on (SSO) and call Microsoft Graph](https://github.com/OfficeDev/Microsoft-Teams-Samples/tree/main/samples/tab-sso/nodejs) | MSAL Node | On-Behalf-Of (OBO) |
147+
139148
## Multi-tenant SaaS
140149

141150
The following samples show how to configure your application to accept sign-ins from any Azure Active Directory (Azure AD) tenant. Configuring your application to be _multi-tenant_ means that you can offer a **Software as a Service** (SaaS) application to many organizations, allowing their users to be able to sign-in to your application after providing consent.

articles/active-directory/roles/groups-concept.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The following scenarios are not supported:
7272
The following are known issues with role-assignable groups:
7373

7474
- *Azure AD P2 licensed customers only*: Even after deleting the group, it is still shown an eligible member of the role in PIM UI. Functionally there's no problem; it's just a cache issue in the Azure portal.
75-
- Use the new [Exchange admin center](/exchange/exchange-admin-center) for role assignments via group membership. The old Exchange admin center doesn't support this feature yet. Exchange PowerShell cmdlets will work as expected.
75+
- Use the new [Exchange admin center](/exchange/exchange-admin-center) for role assignments via group membership. The old Exchange admin center doesn't support this feature. If accessing the old Exchange admin center is required, assign the eligible role directly to the user (not via role-assignable groups). Exchange PowerShell cmdlets will work as expected.
7676
- If an administrator role is assigned to a role-assignable group instead of individual users, members of the group will not be able to access Rules, Organization, or Public Folders in the new [Exchange admin center](/exchange/exchange-admin-center). The workaround is to assign the role directly to users instead of the group.
7777
- Azure Information Protection Portal (the classic portal) doesn't recognize role membership via group yet. You can [migrate to the unified sensitivity labeling platform](/azure/information-protection/configure-policy-migrate-labels) and then use the Office 365 Security & Compliance center to use group assignments to manage roles.
7878
- [Apps admin center](https://config.office.com/) doesn't support this feature yet. Assign the Office Apps Administrator role directly to users.

articles/api-management/quickstart-bicep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can use Azure CLI or Azure PowerShell to deploy the Bicep file. For more in
4646
```azurecli
4747
az group create --name exampleRG --location eastus
4848
49-
az deployment group create --resource-group exampleRG --template-file main.bicep --parameters publisherEmail=<publisher-email> publishername=<publisher-name>
49+
az deployment group create --resource-group exampleRG --template-file main.bicep --parameters publisherEmail=<publisher-email> publisherName=<publisher-name>
5050
```
5151
5252
# [PowerShell](#tab/PowerShell)

articles/application-gateway/ingress-controller-add-health-probes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
```
4242
4343
Kubernetes API Reference:
44-
* [Container Probes]https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#httpgetaction-v1-core)
44+
* [Container Probes](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#httpgetaction-v1-core)
4545
4646
> [!NOTE]
4747
> * `readinessProbe` and `livenessProbe` are supported when configured with `httpGet`.

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ As one of the [restore options](#restore-options), you can create a disk from a
106106
- [Attach restored disks](../virtual-machines/windows/attach-managed-disk-portal.md) to an existing VM.
107107
- [Create a new VM](./backup-azure-vms-automation.md#create-a-vm-from-restored-disks) from the restored disks using PowerShell.
108108

109-
1. In **Restore configuration** > **Create new** > **Restore Type**, select **Create new virtual machine**.
109+
1. In **Restore configuration** > **Create new** > **Restore Type**, select **Restore disks**.
110110
1. In **Resource group**, select an existing resource group for the restored disks, or create a new one with a globally unique name.
111111
1. In **Staging location**, specify the storage account to which to copy the VHDs. [Learn more](#storage-accounts).
112112

articles/container-instances/container-instances-github-action.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ This article shows two ways to set up the workflow:
4040

4141
![Screenshot of the Fork button (highlighted) in GitHub](../container-registry/media/container-registry-tutorial-quick-build/quick-build-01-fork.png)
4242

43-
* Ensure Actions is enabled for your repository. Navigate to your forked repository and select **Settings** > **Actions**. In **Actions permissions**, ensure that **Enable local and third party Actions for this repository** is selected.
43+
* Ensure Actions is enabled for your repository. Navigate to your forked repository and select **Settings** > **Actions**. In **Actions permissions**, ensure that **Allow all actions** is selected.
4444

4545
## Configure GitHub workflow
4646

@@ -51,7 +51,7 @@ In the GitHub workflow, you need to supply Azure credentials to authenticate to
5151
First, get the resource ID of your resource group. Substitute the name of your group in the following [az group show][az-group-show] command:
5252

5353
```azurecli
54-
groupId=$(az group show \
54+
$groupId=$(az group show \
5555
--name <resource-group-name> \
5656
--query id --output tsv)
5757
```
@@ -91,7 +91,7 @@ Update the Azure service principal credentials to allow push and pull access to
9191
Get the resource ID of your container registry. Substitute the name of your registry in the following [az acr show][az-acr-show] command:
9292

9393
```azurecli
94-
registryId=$(az acr show \
94+
$registryId=$(az acr show \
9595
--name <registry-name> \
9696
--query id --output tsv)
9797
```
@@ -107,9 +107,9 @@ az role assignment create \
107107

108108
### Save credentials to GitHub repo
109109

110-
1. In the GitHub UI, navigate to your forked repository and select **Settings** > **Secrets**.
110+
1. In the GitHub UI, navigate to your forked repository and select **Settings** > **Secrets** > **Actions**.
111111

112-
1. Select **Add a new secret** to add the following secrets:
112+
1. Select **New repository secret** to add the following secrets:
113113

114114
|Secret |Value |
115115
|---------|---------|
@@ -121,8 +121,8 @@ az role assignment create \
121121

122122
### Create workflow file
123123

124-
1. In the GitHub UI, select **Actions** > **New workflow**.
125-
1. Select **Set up a workflow yourself**.
124+
1. In the GitHub UI, select **Actions**.
125+
1. Select **set up a workflow yourself**.
126126
1. In **Edit new file**, paste the following YAML contents to overwrite the sample code. Accept the default filename `main.yml`, or provide a filename you choose.
127127
1. Select **Start commit**, optionally provide short and extended descriptions of your commit, and select **Commit new file**.
128128

articles/container-instances/container-instances-managed-identity.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ az container exec \
168168
Run the following commands in the bash shell in the container. To get an access token to use Azure Active Directory to authenticate to key vault, run the following command:
169169

170170
```bash
171-
curl 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fvault.azure.net' -H Metadata:true -s
171+
client_id="CLIENT ID (xxxxxxxx-5523-45fc-9f49-xxxxxxxxxxxx)"
172+
curl "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fvault.azure.net&client_id=$client_id" -H Metadata:true -s
172173
```
173174

174175
Output:

articles/container-instances/container-instances-region-availability.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The following regions and maximum resources are available to container groups wi
4141
| East US 2 | 4 | 16 | 4 | 16 | 50 | N/A | Y |
4242
| France Central | 4 | 16 | 4 | 16 | 50 | N/A | Y|
4343
| Germany West Central | 4 | 16 | N/A | N/A | 50 | N/A | Y |
44-
| Japan East | 2 | 8 | 4 | 16 | 50 | N/A | Y |
44+
| Japan East | 4 | 16 | 4 | 16 | 50 | N/A | Y |
4545
| Japan West | 4 | 16 | N/A | N/A | 50 | N/A | N |
4646
| Korea Central | 4 | 16 | N/A | N/A | 50 | N/A | N |
4747
| North Central US | 2 | 3.5 | 4 | 16 | 50 | K80, P100, V100 | N |
@@ -145,4 +145,4 @@ For information on troubleshooting container instance deployment, see [Troublesh
145145

146146

147147
[azure-support]: https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest
148-
[az-region-support]: ../availability-zones/az-overview.md#regions
148+
[az-region-support]: ../availability-zones/az-overview.md#regions

articles/container-instances/container-instances-tutorial-deploy-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ az acr show --name <acrName> --query loginServer
4242
Now, use the [az container create][az-container-create] command to deploy the container. Replace `<acrLoginServer>` with the value you obtained from the previous command. Replace `<service-principal-ID>` and `<service-principal-password>` with the service principal ID and password that you created to access the registry. Replace `<aciDnsLabel>` with a desired DNS name.
4343

4444
```azurecli
45-
az container create --resource-group myResourceGroup --name aci-tutorial-app --image <acrLoginServer>/aci-tutorial-app:v1 --cpu 1 --memory 1 --registry-login-server <acrLoginServer> --registry-username <service-principal-ID> --registry-password <service-principal-password> --dns-name-label <aciDnsLabel> --ports 80
45+
az container create --resource-group myResourceGroup --name aci-tutorial-app --image <acrLoginServer>/aci-tutorial-app:v1 --cpu 1 --memory 1 --registry-login-server <acrLoginServer> --registry-username <service-principal-ID> --registry-password <service-principal-password> --ip-address Public --dns-name-label <aciDnsLabel> --ports 80
4646
```
4747

4848
Within a few seconds, you should receive an initial response from Azure. The `--dns-name-label` value must be unique within the Azure region you create the container instance. Modify the value in the preceding command if you receive a **DNS name label** error message when you execute the command.

articles/defender-for-iot/organizations/how-to-set-up-your-network.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Verify that your organizational security policy allows access to the following:
108108

109109
| Protocol | Transport | In/Out | Port | Purpose | Source | Destination |
110110
|--|--|--|--|--|--|--|
111-
| HTTPS | TCP | Out | 443 | Access to Azure portal | Sensor | `*.azure-devices.net`<br> `*.blob.core.windows.net`<br> `*.servicebus.windows.net` |
111+
| HTTPS | TCP | Out | 443 | Access to Azure | Sensor | `*.azure-devices.net`<br> `*.blob.core.windows.net`<br> `*.servicebus.windows.net` |
112112

113113
#### Sensor access to the on-premises management console
114114

0 commit comments

Comments
 (0)