Skip to content

Commit 22fe505

Browse files
huypubhuypub
authored
Merge pull request #221901 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 659c017 + 005633e commit 22fe505

File tree

8 files changed

+12
-14
lines changed

8 files changed

+12
-14
lines changed

‎articles/azure-monitor/app/azure-web-apps-net-core.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ See the following [Enable monitoring](#enable-monitoring) section to begin setti
3737
3838
[Trim self-contained deployments](/dotnet/core/deploying/trimming/trim-self-contained) is *not supported*. Use [manual instrumentation](./asp-net-core.md) via code instead.
3939

40-
> [!NOTE]
41-
> Linux auto-instrumentation App Service portal enablement is in public preview. These preview versions are provided without a service level agreement. Certain features might not be supported or might have constrained capabilities.
4240

4341
See the following [Enable monitoring](#enable-monitoring) section to begin setting up Application Insights with your App Service resource.
4442

‎articles/azure-monitor/app/codeless-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ Links are provided to additional information for each supported scenario.
2323

2424
|Environment/Resource Provider | .NET Framework | .NET Core / .NET | Java | Node.js | Python |
2525
|-------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|
26-
|Azure App Service on Windows - Publish as Code | [ :white_check_mark: :link: ](azure-web-apps-net.md) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](azure-web-apps-net-core.md) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](azure-web-apps-java.md) | [ :white_check_mark: :link: ](azure-web-apps-nodejs.md) <sup>[1](#OnBD)</sup> | :x: |
26+
|Azure App Service on Windows - Publish as Code | [ :white_check_mark: :link: ](azure-web-apps-net.md) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](azure-web-apps-net-core.md) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](azure-web-apps-java.md) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](azure-web-apps-nodejs.md) <sup>[1](#OnBD)</sup> | :x: |
2727
|Azure App Service on Windows - Publish as Docker | [ :white_check_mark: ](https://azure.github.io/AppService/2022/04/11/windows-containers-app-insights-preview.html) <sup>[2](#Preview)</sup> | [ :white_check_mark: ](https://azure.github.io/AppService/2022/04/11/windows-containers-app-insights-preview.html) <sup>[2](#Preview)</sup> | [ :white_check_mark: ](https://azure.github.io/AppService/2022/04/11/windows-containers-app-insights-preview.html) <sup>[2](#Preview)</sup> | :x: | :x: |
28-
|Azure App Service on Linux - Publish as Code | :x: | [ :white_check_mark: :link: ](azure-web-apps-net-core.md?tabs=linux) <sup>[2](#Preview)</sup> | [ :white_check_mark: :link: ](azure-web-apps-java.md) | [ :white_check_mark: :link: ](azure-web-apps-nodejs.md?tabs=linux) | :x: |
29-
|Azure App Service on Linux - Publish as Docker | :x: | :x: | :x: | :x: | :x: |
28+
|Azure App Service on Linux - Publish as Code | :x: | [ :white_check_mark: :link: ](azure-web-apps-net-core.md?tabs=linux) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](azure-web-apps-java.md) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](azure-web-apps-nodejs.md?tabs=linux) | :x: |
29+
|Azure App Service on Linux - Publish as Docker | :x: | :x: | [ :white_check_mark: :link: ](azure-web-apps-java.md) | [ :white_check_mark: :link: ](azure-web-apps-nodejs.md?tabs=linux) | :x: |
3030
|Azure Functions - basic | [ :white_check_mark: :link: ](monitor-functions.md) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](monitor-functions.md) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](monitor-functions.md) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](monitor-functions.md) <sup>[1](#OnBD)</sup> | [ :white_check_mark: :link: ](monitor-functions.md) <sup>[1](#OnBD)</sup> |
3131
|Azure Functions - dependencies | :x: | :x: | [ :white_check_mark: :link: ](monitor-functions.md) <sup>[2](#Preview)</sup> | :x: | [ :white_check_mark: :link: ](monitor-functions.md#distributed-tracing-for-python-function-apps) |
3232
|Azure Spring Cloud | :x: | :x: | [ :white_check_mark: :link: ](azure-web-apps-java.md) | :x: | :x: |
@@ -47,4 +47,4 @@ Links are provided to additional information for each supported scenario.
4747

4848
* [Application Insights Overview](app-insights-overview.md)
4949
* [Application Insights Overview dashboard](overview-dashboard.md)
50-
* [Application map](app-map.md)
50+
* [Application map](app-map.md)

‎articles/container-registry/tutorial-deploy-connected-registry-nested-iot-edge-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Overall, the lower layer deployment file is similar to the top layer deployment
9292
"modules": {
9393
"connected-registry": {
9494
"settings": {
95-
"image": "$upstream:8000/acr/connected-registry:0.7.0",
95+
"image": "$upstream:8000/acr/connected-registry:0.8.0",
9696
"createOptions": "{\"HostConfig\":{\"Binds\":[\"/home/azureuser/connected-registry:/var/acr/data\"]}}"
9797
},
9898
"type": "docker",

‎articles/defender-for-iot/organizations/roles-azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Roles for management actions are applied to user roles across an entire Azure su
2222
| **Grant permissions to others**<br>Apply per subscription or site | - | - | - | ✔ |
2323
| **Onboard OT or Enterprise IoT sensors** [*](#enterprise-iot-security) <br>Apply per subscription only | - | ✔ | ✔ | ✔ |
2424
| **Download OT sensor and on-premises management console software**<br>Apply per subscription only | ✔ | ✔ | ✔ | ✔ |
25-
| **Download sensor endpoint details** <br>Apply per subscription only | - | ✔ | ✔ | ✔ |
25+
| **Download sensor endpoint details** <br>Apply per subscription only | ✔ | ✔ | ✔ | ✔ |
2626
| **Download sensor activation files** <br>Apply per subscription only| - | ✔ | ✔ | ✔ |
2727
| **View values on the Pricing page** [*](#enterprise-iot-security) <br>Apply per subscription only| ✔ | ✔ | ✔ | ✔ |
2828
| **Modify values on the Pricing page** [*](#enterprise-iot-security) <br>Apply per subscription only| - | ✔ | ✔ | ✔ |

‎articles/machine-learning/azure-machine-learning-glossary.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ A compute is a designated compute resource where you run your job or host your e
3030

3131
* **Compute cluster** - a managed-compute infrastructure that allows you to easily create a cluster of CPU or GPU compute nodes in the cloud.
3232
* **Compute instance** - a fully configured and managed development environment in the cloud. You can use the instance as a training or inference compute for development and testing. It's similar to a virtual machine on the cloud.
33-
* **Inference cluster** - used to deploy trained machine learning models to Azure Kubernetes Service. You can create an Azure Kubernetes Service (AKS) cluster from your Azure ML workspace, or attach an existing AKS cluster.
33+
* **Kubernetes cluster** - used to deploy trained machine learning models to Azure Kubernetes Service. You can create an Azure Kubernetes Service (AKS) cluster from your Azure ML workspace, or attach an existing AKS cluster.
3434
* **Attached compute** - You can attach your own compute resources to your workspace and use them for training and inference.
3535

3636
## Data
@@ -91,4 +91,4 @@ The workspace is the top-level resource for Azure Machine Learning, providing a
9191

9292
## Next steps
9393

94-
[What is Azure Machine Learning?](overview-what-is-azure-machine-learning.md)
94+
[What is Azure Machine Learning?](overview-what-is-azure-machine-learning.md)

‎articles/machine-learning/how-to-access-data-batch-endpoints-jobs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Data from Azure Machine Learning registered data stores can be directly referenc
117117
> See how the path `paths` is appended to the resource id of the data store to indicate that what follows is a path inside of it.
118118
119119
> [!TIP]
120-
> You can also use `azureml:/datastores/<data-store>/paths/<data-path>` as a way to indicate the input.
120+
> You can also use `azureml://datastores/<data-store>/paths/<data-path>` as a way to indicate the input.
121121
122122
1. Run the deployment:
123123

‎articles/search/query-simple-syntax.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ You can embed Boolean operators in a query string to improve the precision of a
6060
|----------- |--------|-------|
6161
| `+` | `pool + ocean` | An AND operation. For example, `pool + ocean` stipulates that a document must contain both terms.|
6262
| `|` | `pool | ocean` | An OR operation finds a match when either term is found. In the example, the query engine will return match on documents containing either `pool` or `ocean` or both. Because OR is the default conjunction operator, you could also leave it out, such that `pool ocean` is the equivalent of `pool | ocean`.|
63-
| `-` | `pool – ocean` | A NOT operation returns matches on documents that exclude the term. </p></p>The `searchMode` parameter on a query request controls whether a term with the NOT operator is ANDed or ORed with other terms in the query (assuming there's no boolean operators on the other terms). Valid values include `any` or `all`. </p>`searchMode=any` increases the recall of queries by including more results, and by default `-` will be interpreted as "OR NOT". For example, `pool - ocean` will match documents that either contain the term `pool` or those that don't contain the term `ocean`. </p>`searchMode=all` increases the precision of queries by including fewer results, and by default `-` will be interpreted as "AND NOT". For example, with `searchMode=and`, the query `pool - ocean` will match documents that contain the term "pool" and all documents that don't contain the term "ocean". This is arguably a more intuitive behavior for the `-` operator. Therefore, you should consider using `searchMode=all` instead of `searchMode=any` if you want to optimize searches for precision instead of recall, *and* Your users frequently use the `-` operator in searches.</p> When deciding on a `searchMode` setting, consider the user interaction patterns for queries in various applications. Users who are searching for information are more likely to include an operator in a query, as opposed to e-commerce sites that have more built-in navigation structures. |
63+
| `-` | `pool – ocean` | A NOT operation returns matches on documents that exclude the term. </p></p>The `searchMode` parameter on a query request controls whether a term with the NOT operator is ANDed or ORed with other terms in the query (assuming there's no boolean operators on the other terms). Valid values include `any` or `all`. </p>`searchMode=any` increases the recall of queries by including more results, and by default `-` will be interpreted as "OR NOT". For example, `pool - ocean` will match documents that either contain the term `pool` or those that don't contain the term `ocean`. </p>`searchMode=all` increases the precision of queries by including fewer results, and by default `-` will be interpreted as "AND NOT". For example, with `searchMode=any`, the query `pool - ocean` will match documents that contain the term "pool" and all documents that don't contain the term "ocean". This is arguably a more intuitive behavior for the `-` operator. Therefore, you should consider using `searchMode=all` instead of `searchMode=any` if you want to optimize searches for precision instead of recall, *and* Your users frequently use the `-` operator in searches.</p> When deciding on a `searchMode` setting, consider the user interaction patterns for queries in various applications. Users who are searching for information are more likely to include an operator in a query, as opposed to e-commerce sites that have more built-in navigation structures. |
6464

6565
<a name="prefix-search"></a>
6666

@@ -139,4 +139,4 @@ You can also review the following articles to learn more about query constructio
139139
+ [Query examples for full Lucene search](search-query-lucene-examples.md)
140140
+ [Search Documents REST API](/rest/api/searchservice/Search-Documents)
141141
+ [Lucene query syntax](query-lucene-syntax.md)
142-
+ [Filter and Select (OData) expression syntax](query-odata-filter-orderby-syntax.md)
142+
+ [Filter and Select (OData) expression syntax](query-odata-filter-orderby-syntax.md)

‎includes/container-registry-connected-iot-edge-manifest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ms.author: danlep
3636
"modules": {
3737
"connected-registry": {
3838
"settings": {
39-
"image": "<REPLACE_WITH_CLOUD_REGISTRY_NAME>.azurecr.io/acr/connected-registry:0.7.0",
39+
"image": "<REPLACE_WITH_CLOUD_REGISTRY_NAME>.azurecr.io/acr/connected-registry:0.8.0",
4040
"createOptions": "{\"HostConfig\":{\"Binds\":[\"/home/azureuser/connected-registry:/var/acr/data\"]}}"
4141
},
4242
"type": "docker",

0 commit comments

Comments
 (0)