Skip to content

Commit 23ed9ee

Browse files
authored
Merge pull request #198124 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 0353637 + f78f594 commit 23ed9ee

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

articles/app-service/resources-kudu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ It also provides other features, such as:
3232
- Run commands in the [Kudu console](https://github.com/projectkudu/kudu/wiki/Kudu-console).
3333
- Download IIS diagnostic dumps or Docker logs.
3434
- Manage IIS processes and site extensions.
35-
- Add deployment webhooks for Windows aps.
35+
- Add deployment webhooks for Windows apps.
3636
- Allow ZIP deployment UI with `/ZipDeploy`.
3737
- Generates [custom deployment scripts](https://github.com/projectkudu/kudu/wiki/Custom-Deployment-Script).
3838
- Allows access with [REST API](https://github.com/projectkudu/kudu/wiki/REST-API).

articles/azure-signalr/signalr-concept-authenticate-oauth.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ To complete this tutorial, you must have the following prerequisites:
5757
| Setting Name | Suggested Value | Description |
5858
| ------------ | --------------- | ----------- |
5959
| Application name | *Azure SignalR Chat* | The GitHub user should be able to recognize and trust the app they are authenticating with. |
60-
| Homepage URL | `http://localhost:5000/home` | |
60+
| Homepage URL | `http://localhost:5000` | |
6161
| Application description | *A chat room sample using the Azure SignalR Service with GitHub authentication* | A useful description of the application that will help your application users understand the context of the authentication being used. |
6262
| Authorization callback URL | `http://localhost:5000/signin-github` | This setting is the most important setting for your OAuth application. It's the callback URL that GitHub returns the user to after successful authentication. In this tutorial, you must use the default callback URL for the *AspNet.Security.OAuth.GitHub* package, */signin-github*. |
6363

@@ -547,7 +547,7 @@ The last thing you need to do is update the **Homepage URL** and **Authorization
547547
548548
| Setting | Example |
549549
| ------- | ------- |
550-
| Homepage URL | `https://signalrtestwebapp22665120.azurewebsites.net/home` |
550+
| Homepage URL | `https://signalrtestwebapp22665120.azurewebsites.net` |
551551
| Authorization callback URL | `https://signalrtestwebapp22665120.azurewebsites.net/signin-github` |
552552
553553
3. Navigate to your web app URL and test the application.

articles/cognitive-services/QnAMaker/includes/quickstart-sdk-ruby.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Here is the main method for the application.
170170

171171
:::code language="ruby" source="~/cognitive-services-quickstart-code/ruby/qnamaker/sdk/quickstart.rb" id="Main":::
172172

173-
Run the application with the ruby command on your quickstart file.
173+
Run the application with the Ruby command on your quickstart file.
174174

175175
```console
176176
ruby quickstart.rb

articles/iot-edge/how-to-create-test-certificates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ In this section, you clone the IoT Edge repo and execute the scripts.
7676
mkdir wrkdir
7777
cd .\wrkdir\
7878
cp ..\iotedge\tools\CACertificates\*.cnf .
79-
cp ..\iotedge\tools\CACertificates\certGen.sh .
79+
cp ..\iotedge\tools\CACertificates\ca-certs.ps1 .
8080
```
8181

8282
If you downloaded the repo as a ZIP, then the folder name is `iotedge-master` and the rest of the path is the same.
@@ -408,4 +408,4 @@ The certificates in this section are for the steps in the IoT Hub X.509 certific
408408
* `certs/iot-device-<device id>-full-chain.cert.pem`
409409
* `private/iot-device-<device id>.key.pem`
410410

411-
---
411+
---

articles/site-recovery/azure-to-azure-common-questions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ Yes, you can create a Capacity Reservation for your VM SKU in the disaster recov
331331

332332
### Why should I reserve capacity using Capacity Reservation at the destination location?
333333

334-
While Site Recovery makes a best effort to ensure that capacity is available in the recovery region, it does not guarantee the same. Site Recovery's best effort is backed by a 2-hour RTO SLA. But if you require further assurance and _guaranteed compute capacity,_ then we recommend you to purchase [Capacity Reservations](https://aka.ms/on-demand-ca.pacity-reservations-docs)
334+
While Site Recovery makes a best effort to ensure that capacity is available in the recovery region, it does not guarantee the same. Site Recovery's best effort is backed by a 2-hour RTO SLA. But if you require further assurance and _guaranteed compute capacity,_ then we recommend you to purchase [Capacity Reservations](https://aka.ms/on-demand-capacity-reservations-docs)
335335

336336
### Does Site Recovery work with reserved instances?
337337

@@ -353,4 +353,4 @@ Yes, both encryption in transit and [encryption at rest in Azure](../storage/com
353353

354354
- [Review Azure-to-Azure support requirements](azure-to-azure-support-matrix.md).
355355
- [Set up Azure-to-Azure replication](azure-to-azure-tutorial-enable-replication.md).
356-
- If you have questions after reading this article, post them on the [Microsoft Q&A question page for Azure Recovery Services](/answers/topics/azure-site-recovery.html).
356+
- If you have questions after reading this article, post them on the [Microsoft Q&A question page for Azure Recovery Services](/answers/topics/azure-site-recovery.html).

0 commit comments

Comments
 (0)