Skip to content

Commit 25773f7

Browse files
authored
Merge pull request #199983 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 3ff046a + ee7b66d commit 25773f7

File tree

14 files changed

+19
-17
lines changed

14 files changed

+19
-17
lines changed

articles/active-directory/verifiable-credentials/decentralized-identifier-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ There are three primary actors in the verifiable credential solution. In the fol
108108

109109
- **Step 1**, the **user** requests a verifiable credential from an issuer.
110110
- **Step 2**, the **issuer** of the credential attests that the proof the user provided is accurate and creates a verifiable credential signed with their DID and the user’s DID is the subject.
111-
- **In Step 3**, the user signs a verifiable presentation (VP) with their DID and sends to the **verifier.** The verifier then validates of the credential by matching with the public key placed in the DPKI.
111+
- **In Step 3**, the user signs a verifiable presentation (VP) with their DID and sends to the **verifier.** The verifier then validates the credential by matching with the public key placed in the DPKI.
112112

113113
The roles in this scenario are:
114114

articles/azure-functions/functions-bindings-storage-blob.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Functions 1.x apps automatically have a reference to the extension.
146146

147147
## host.json settings
148148

149-
This section describes the function app configuration settings available for functions that this binding. These settings only apply when using extension version 5.0.0 and higher. The example host.json file below contains only the version 2.x+ settings for this binding. For more information about function app configuration settings in versions 2.x and later versions, see [host.json reference for Azure Functions](functions-host-json.md).
149+
This section describes the function app configuration settings available for functions that use this binding. These settings only apply when using extension version 5.0.0 and higher. The example host.json file below contains only the version 2.x+ settings for this binding. For more information about function app configuration settings in versions 2.x and later versions, see [host.json reference for Azure Functions](functions-host-json.md).
150150

151151
> [!NOTE]
152152
> This section doesn't apply to extension versions before 5.0.0. For those earlier versions, there aren't any function app-wide configuration settings for blobs.

articles/cognitive-services/language-service/question-answering/tutorials/adding-synonyms.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ As you can see, when `troubleshoot` was not added as a synonym, we got a low con
7979
8080
## Notes
8181
* Synonyms can be added in any order. The ordering is not considered in any computational logic.
82+
* Synonyms can only be added to a project that has at least one question and answer pair.
83+
* Synonyms can be added only when there is at least one question and answer pair present in a knowledge base.
8284
* In case of overlapping synonym words between 2 sets of alterations, it may have unexpected results and it is not recommended to use overlapping sets.
8385
* Special characters are not allowed for synonyms. For hyphenated words like "COVID-19", they are treated the same as "COVID 19", and "space" can be used as a term separator. Following is the list of special characters **not allowed**:
8486

articles/container-apps/revisions-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ As you interact with this example, replace the placeholders surrounded by `<>` w
120120

121121
## Deactivate
122122

123-
Deactivate revisions that are no longer in use with `az container app revision deactivate`. Deactivation stops all running replicas of a revision.
123+
Deactivate revisions that are no longer in use with `az containerapp revision deactivate`. Deactivation stops all running replicas of a revision.
124124

125125
# [Bash](#tab/bash)
126126

articles/container-registry/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
items:
186186
- name: Scan with Microsoft Defender for Cloud
187187
href: scan-images-defender.md
188-
- name: Scan with GitHub actions
188+
- name: Scan with GitHub Actions
189189
href: github-action-scan.md
190190
- name: Troubleshoot
191191
expanded: false

articles/cost-management-billing/reservations/reservation-renew.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The following conditions are required to renew a reservation:
4343

4444
## Default renewal settings
4545

46-
By default, the renewal inherits all properties from the expiring reservation. A reservation renewal purchase has the same SKU, region, scope, billing subscription, term, and quantity.
46+
By default, the renewal inherits all properties except automatic renewal setting from the expiring reservation. A reservation renewal purchase has the same SKU, region, scope, billing subscription, term, and quantity.
4747

4848
However, you can update the renewal reservation purchase quantity to optimize your savings.
4949

articles/devops-project/index.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### YamlMime:Landing
22

33
title: DevOps Starter documentation to deploy to Azure
4-
summary: DevOps Starter presents a simplified experience where you bring your existing code and Git repository, or choose from one of the sample applications to create a continuous integration (CI) and continuous delivery (CD) pipeline or workflow to Azure. DevOps Starter now supports creating GitHub actions workflows.
4+
summary: DevOps Starter presents a simplified experience where you bring your existing code and Git repository, or choose from one of the sample applications to create a continuous integration (CI) and continuous delivery (CD) pipeline or workflow to Azure. DevOps Starter now supports creating GitHub Actions workflows.
55

66
metadata:
77
title: DevOps Starter documentation
@@ -32,7 +32,7 @@ landingContent:
3232
linkLists:
3333
- linkListType: quickstart
3434
links:
35-
- text: Node.js using GitHub actions
35+
- text: Node.js using GitHub Actions
3636
url: ./devops-starter-gh-nodejs.md
3737
- text: .NET
3838
url: ./azure-devops-project-aspnet-core.md
@@ -54,7 +54,7 @@ landingContent:
5454
linkLists:
5555
- linkListType: tutorial
5656
links:
57-
- text: Deploy your app to Azure Web App using GitHub actions
57+
- text: Deploy your app to Azure Web App using GitHub Actions
5858
url: devops-starter-gh-web-app.md
5959
- text: Bring your own code with GitHub
6060
url: azure-devops-project-vms.md

articles/governance/blueprints/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Just as a blueprint allows an engineer or an architect to sketch a project's des
1616
Azure Blueprints enables cloud architects and central information technology groups to define a
1717
repeatable set of Azure resources that implements and adheres to an organization's standards,
1818
patterns, and requirements. Azure Blueprints makes it possible for development teams to rapidly
19-
build and stand up new environments with trust they're building within organizational compliance
19+
build and start up new environments with trust they're building within organizational compliance
2020
with a set of built-in components, such as networking, to speed up development and delivery.
2121

2222
Blueprints are a declarative way to orchestrate the deployment of various resource templates and

articles/healthcare-apis/fhir/get-started-with-fhir.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ You can obtain an Azure AD access token using PowerShell, Azure CLI, REST CCI, o
5858
#### Access using existing tools
5959

6060
- [Postman](../fhir/use-postman.md)
61-
- [Rest Client](../fhir/using-rest-client.md)
61+
- [REST Client](../fhir/using-rest-client.md)
6262
- [cURL](../fhir/using-curl.md)
6363

6464
#### Load data

articles/machine-learning/component-reference/import-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This article describes a component in Azure Machine Learning designer.
1919
Use this component to load data into a machine learning pipeline from existing cloud data services.
2020

2121
> [!Note]
22-
> All functionality provided by this component can be done by **datastore** and **datasets** in the worksapce landing page. We recommend you use **datastore** and **dataset** which includes additional features like data monitoring. To learn more, see [How to Access Data](../v1/how-to-access-data.md) and [How to Register Datasets](../v1/how-to-create-register-datasets.md) article.
22+
> All functionality provided by this component can be done by **datastore** and **datasets** in the workspace landing page. We recommend you use **datastore** and **dataset** which includes additional features like data monitoring. To learn more, see [How to Access Data](../v1/how-to-access-data.md) and [How to Register Datasets](../v1/how-to-create-register-datasets.md) article.
2323
> After you register a dataset, you can find it in the **Datasets** -> **My Datasets** category in designer interface. This component is reserved for Studio(classic) users to for a familiar experience.
2424
>
2525

0 commit comments

Comments
 (0)