Skip to content

Commit

Permalink
Merge pull request #198124 from MicrosoftDocs/repo_sync_working_branch
Browse files Browse the repository at this point in the history
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
  • Loading branch information
huypub authored May 13, 2022
2 parents 0353637 + f78f594 commit 23ed9ee
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion articles/app-service/resources-kudu.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ It also provides other features, such as:
- Run commands in the [Kudu console](https://github.com/projectkudu/kudu/wiki/Kudu-console).
- Download IIS diagnostic dumps or Docker logs.
- Manage IIS processes and site extensions.
- Add deployment webhooks for Windows aps.
- Add deployment webhooks for Windows apps.
- Allow ZIP deployment UI with `/ZipDeploy`.
- Generates [custom deployment scripts](https://github.com/projectkudu/kudu/wiki/Custom-Deployment-Script).
- Allows access with [REST API](https://github.com/projectkudu/kudu/wiki/REST-API).
Expand Down
4 changes: 2 additions & 2 deletions articles/azure-signalr/signalr-concept-authenticate-oauth.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ To complete this tutorial, you must have the following prerequisites:
| Setting Name | Suggested Value | Description |
| ------------ | --------------- | ----------- |
| Application name | *Azure SignalR Chat* | The GitHub user should be able to recognize and trust the app they are authenticating with. |
| Homepage URL | `http://localhost:5000/home` | |
| Homepage URL | `http://localhost:5000` | |
| 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. |
| 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*. |

Expand Down Expand Up @@ -547,7 +547,7 @@ The last thing you need to do is update the **Homepage URL** and **Authorization
| Setting | Example |
| ------- | ------- |
| Homepage URL | `https://signalrtestwebapp22665120.azurewebsites.net/home` |
| Homepage URL | `https://signalrtestwebapp22665120.azurewebsites.net` |
| Authorization callback URL | `https://signalrtestwebapp22665120.azurewebsites.net/signin-github` |
3. Navigate to your web app URL and test the application.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Here is the main method for the application.

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

Run the application with the ruby command on your quickstart file.
Run the application with the Ruby command on your quickstart file.

```console
ruby quickstart.rb
Expand Down
4 changes: 2 additions & 2 deletions articles/iot-edge/how-to-create-test-certificates.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ In this section, you clone the IoT Edge repo and execute the scripts.
mkdir wrkdir
cd .\wrkdir\
cp ..\iotedge\tools\CACertificates\*.cnf .
cp ..\iotedge\tools\CACertificates\certGen.sh .
cp ..\iotedge\tools\CACertificates\ca-certs.ps1 .
```

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

---
---
4 changes: 2 additions & 2 deletions articles/site-recovery/azure-to-azure-common-questions.md
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ Yes, you can create a Capacity Reservation for your VM SKU in the disaster recov

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

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)
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)

### Does Site Recovery work with reserved instances?

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

- [Review Azure-to-Azure support requirements](azure-to-azure-support-matrix.md).
- [Set up Azure-to-Azure replication](azure-to-azure-tutorial-enable-replication.md).
- 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).
- 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 comments on commit 23ed9ee

Please sign in to comment.