Skip to content

Commit 9c6dfbc

Browse files
authored
Merge pull request #248933 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 00d725d + 03d8d59 commit 9c6dfbc

File tree

7 files changed

+20
-13
lines changed

7 files changed

+20
-13
lines changed

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ There are two ways to enable Azure AD login for your Windows VM:
9494
- Azure Cloud Shell, when you're creating a Windows VM or using an existing Windows VM.
9595

9696
> [!NOTE]
97-
> If a device object with the same displayMame as the hostname of a VM where an extension is installed exists, the VM fails to join Azure AD with a hostname duplication error. Avoid duplication by [modifying the hostname](../../virtual-network/virtual-networks-viewing-and-modifying-hostnames.md#modify-a-hostname).
97+
> If a device object with the same displayName as the hostname of a VM where an extension is installed exists, the VM fails to join Azure AD with a hostname duplication error. Avoid duplication by [modifying the hostname](../../virtual-network/virtual-networks-viewing-and-modifying-hostnames.md#modify-a-hostname).
9898
9999
### Azure portal
100100

articles/active-directory/verifiable-credentials/using-wallet-library.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ Then, you have to handle the following major tasks in your app.
115115
- User Interface. Any visual representation of stored credentials and the UI for driving the issuance and presentation process must be implemented by you.
116116

117117
## Wallet Library Demo app
118-
The Wallet Library comes with a demo app in the github repo that is ready to use without any modifications. You just have to build and deploy it. The demo app is a lightweight and simple implementation that illustrates issuance and presentation at its minimum. To quickly get going, you can use the QR Code Reader app to scan the QR code, and then copy and paste it into the demo app.
118+
The Wallet Library comes with a demo app in the GitHub repo that is ready to use without any modifications. You just have to build and deploy it. The demo app is a lightweight and simple implementation that illustrates issuance and presentation at its minimum. To quickly get going, you can use the QR Code Reader app to scan the QR code, and then copy and paste it into the demo app.
119119

120120
In order to test the demo app, you need a webapp that issues credentials and makes presentation requests for credentials. The [Woodgrove public demo webapp](https://aka.ms/vcdemo) is used for this purpose in this tutorial.
121121

122122
## Building the Android sample
123123
On your developer machine with Android Studio, do the following:
124124

125-
1. Download or clone the Android Wallet Library [github repo](https://github.com/microsoft/entra-verifiedid-wallet-library-android/archive/refs/heads/dev.zip).
125+
1. Download or clone the Android Wallet Library [GitHub repo](https://github.com/microsoft/entra-verifiedid-wallet-library-android/archive/refs/heads/dev.zip).
126126
You don’t need the walletlibrary folder and you can delete it if you like.
127127
1. Start Android Studio and open the parent folder of walletlibrarydemo
128128

@@ -169,7 +169,7 @@ The sample app holds the issued credential in memory, so after issuance, you can
169169

170170
## Building the iOS sample
171171
On your Mac developer machine with Xcode, do the following:
172-
1. Download or clone the iOS Wallet Library [github repo](https://github.com/microsoft/entra-verifiedid-wallet-library-ios/archive/refs/heads/dev.zip).
172+
1. Download or clone the iOS Wallet Library [GitHub repo](https://github.com/microsoft/entra-verifiedid-wallet-library-ios/archive/refs/heads/dev.zip).
173173
1. Start Xcode and open the top level folder for the WalletLibrary
174174
1. Set focus on WalletLibraryDemo project
175175

articles/azure-arc/kubernetes/workload-management.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To deploy the sample, run the following script:
3434
mkdir kalypso && cd kalypso
3535
curl -fsSL -o deploy.sh https://raw.githubusercontent.com/microsoft/kalypso/main/deploy/deploy.sh
3636
chmod 700 deploy.sh
37-
./deploy.sh -c -p <prefix. e.g. kalypso> -o <github org. e.g. eedorenko> -t <github token> -l <azure-location. e.g. westus2>
37+
./deploy.sh -c -p <prefix. e.g. kalypso> -o <GitHub org. e.g. eedorenko> -t <GitHub token> -l <azure-location. e.g. westus2>
3838
```
3939

4040
This script may take 10-15 minutes to complete. After it's done, it reports the execution result in the output like this:
@@ -59,7 +59,7 @@ Created AKS clusters in kalypso-rg resource group:
5959
> If something goes wrong with the deployment, you can delete the created resources with the following command:
6060
>
6161
> ```bash
62-
> ./deploy.sh -d -p <preix. e.g. kalypso> -o <github org. e.g. eedorenko> -t <github token> -l <azure-location. e.g. westus2>
62+
> ./deploy.sh -d -p <preix. e.g. kalypso> -o <GitHub org. e.g. eedorenko> -t <GitHub token> -l <azure-location. e.g. westus2>
6363
> ```
6464
6565
### Sample overview
@@ -163,7 +163,7 @@ With this file, Application Team requests Kubernetes compute resources from the
163163
To register the application, open a terminal and use the following script:
164164
165165
```bash
166-
export org=<github org>
166+
export org=<GitHub org>
167167
export prefix=<prefix>
168168
169169
# clone the control-plane repo
@@ -317,7 +317,7 @@ spec:
317317
branch: dev
318318
secretRef:
319319
name: repo-secret
320-
url: https://github.com/<github org>/<prefix>-app-gitops
320+
url: https://github.com/<GitHub org>/<prefix>-app-gitops
321321
---
322322
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
323323
kind: Kustomization
@@ -550,7 +550,7 @@ When no longer needed, delete the resources that you created. To do so, run the
550550
551551
```bash
552552
# In kalypso folder
553-
./deploy.sh -d -p <preix. e.g. kalypso> -o <github org. e.g. eedorenko> -t <github token> -l <azure-location. e.g. westus2>
553+
./deploy.sh -d -p <preix. e.g. kalypso> -o <GitHub org. e.g. eedorenko> -t <GitHub token> -l <azure-location. e.g. westus2>
554554
```
555555
556556
## Next steps

articles/azure-monitor/essentials/diagnostic-settings.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,13 @@ The following table provides unique requirements for each destination including
136136
| Event Hubs | The shared access policy for the namespace defines the permissions that the streaming mechanism has. Streaming to Event Hubs requires Manage, Send, and Listen permissions. To update the diagnostic setting to include streaming, you must have the ListKey permission on that Event Hubs authorization rule.<br><br>The event hub namespace needs to be in the same region as the resource being monitored if the resource is regional. <br><br> Diagnostic settings can't access Event Hubs resources when virtual networks are enabled. You must enable **Allow trusted Microsoft services** to bypass this firewall setting in Event Hubs so that the Azure Monitor diagnostic settings service is granted access to your Event Hubs resources.|
137137
| Partner integrations | The solutions vary by partner. Check the [Azure Monitor partner integrations documentation](../../partner-solutions/overview.md) for details.
138138

139+
> [!CAUTION]
140+
> If you want to store diagnostic logs in a Log Analytics workspace, there are two points to consider to avoid seeing duplicate data in Application Insights:
141+
> * The destination can't be the same Log Analytics workspace that your Application Insights resource is based on.
142+
> * The Application Insights user can't have access to both workspaces. Set the Log Analytics access control mode to Requires workspace permissions. Through Azure role-based access control, ensure the user only has access to the Log Analytics workspace the Application Insights resource is based on.
143+
>
144+
> These steps are necessary because Application Insights accesses telemetry across Application Insight resources, including Log Analytics workspaces, to provide complete end-to-end transaction operations and accurate application maps. Because diagnostic logs use the same table names, duplicate telemetry can be displayed if the user has access to multiple resources that contain the same data.
145+
139146
## Controlling costs
140147

141148
There is a cost for collecting data in a Log Analytics workspace, so you should only collect the categories you require for each service. The data volume for resource logs varies significantly between services,

articles/container-apps/blue-green-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ After you test and verify the new revision, you can then point production traffi
4040
This article shows you how to implement blue-green deployment in a container app. To run the following examples, you need a container app environment where you can create a new app.
4141

4242
> [!NOTE]
43-
> Refer to [containerapps-blue-green repository](https://github.com/Azure-Samples/containerapps-blue-green) for a complete example of a github workflow that implements blue-green deployment for Container Apps.
43+
> Refer to [containerapps-blue-green repository](https://github.com/Azure-Samples/containerapps-blue-green) for a complete example of a GitHub workflow that implements blue-green deployment for Container Apps.
4444
4545
## Create a container app with multiple active revisions enabled
4646

articles/internet-analyzer/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
services: internet-analyzer
1010
ms.service: internet-analyzer
1111
ms.topic: landing-page
12-
author: megan-beatty #github alias
12+
author: megan-beatty #GitHub alias
1313
ms.author: mebeatty
1414
ms.date: 10/16/2019
1515

articles/virtual-machines/hbv4-performance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Performance expectations using common HPC microbenchmarks are as follows:
3131

3232
## Memory bandwidth test
3333

34-
The STREAM memory test can be run using the scripts in this github repository.
34+
The STREAM memory test can be run using the scripts in this GitHub repository.
3535
```bash
3636
git clone https://github.com/Azure/woc-benchmarking
3737
cd woc-benchmarking/apps/hpc/stream/
@@ -40,7 +40,7 @@ sh stream_run_script.sh $PWD “hbrs_v4”
4040
```
4141
## Compute performance test
4242

43-
The HPL benchmark can be run using the script in this github repository.
43+
The HPL benchmark can be run using the script in this GitHub repository.
4444
```bash
4545
git clone https://github.com/Azure/woc-benchmarking
4646
cd woc-benchmarking/apps/hpc/hpl

0 commit comments

Comments
 (0)