Skip to content

Commit 0724422

Browse files
authored
Merge pull request #190864 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 c5371d4 + 8d433de commit 0724422

File tree

7 files changed

+32
-32
lines changed

7 files changed

+32
-32
lines changed

articles/active-directory-b2c/configure-authentication-sample-web-app-with-api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ A computer that's running either:
6262

6363
# [Visual Studio](#tab/visual-studio)
6464

65-
* [Visual Studio 2019 16.8 or later](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019) with the **ASP.NET and web development** workload
66-
* [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet)
65+
* [Visual Studio 2022 17.0 or later](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019) with the **ASP.NET and web development** workload
66+
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet)
6767

6868
# [Visual Studio Code](#tab/visual-studio-code)
6969

7070
* [Visual Studio Code](https://code.visualstudio.com/download)
7171
* [C# for Visual Studio Code (latest version)](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp)
72-
* [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet)
72+
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet)
7373

7474
---
7575

articles/azure-monitor/logs/private-link-design.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ The AMPLS object has the following limits:
9090
9191
In the below diagram:
9292
* Each VNet connects to only **one** AMPLS object.
93-
* AMPLS A connects to two workspaces and one Application Insight component, using 2 of the possible 300 Log Analytics workspaces and 1 of the possible 1 Application Insights components it can connect to.
93+
* AMPLS A connects to two workspaces and one Application Insight component, using 2 of the possible 300 Log Analytics workspaces and 1 of the possible 1000 Application Insights components it can connect to.
9494
* Workspace2 connects to AMPLS A and AMPLS B, using two of the five possible AMPLS connections.
9595
* AMPLS B is connected to Private Endpoints of two VNets (VNet2 and VNet3), using two of the 10 possible Private Endpoint connections.
9696

articles/cognitive-services/Bing-Web-Search/use-display-requirements.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: bing-web-search
1010
ms.topic: conceptual
11-
ms.date: 01/31/2019
11+
ms.date: 03/02/2022
1212
ms.author: aahi
1313
---
1414

@@ -30,7 +30,6 @@ These use and display requirements apply to any implementation of the content an
3030

3131
## Definitions
3232

33-
3433
|Term |Description |
3534
|---------|---------|
3635
|Answer | A category of results returned in a response. For example, a response from the Bing Web Search API can include answers in the categories of webpage results, image, video, visual, and news. |
@@ -48,67 +47,68 @@ Do not:
4847
## Bing Search APIs
4948

5049
> [!NOTE]
51-
> The requirements in this section apply to only the Search APIs, which does not include Bing Spell Check or Bing Autosuggest.
50+
> The requirements in this section apply to only the Search APIs, which does not include Bing Spell Check or Bing Autosuggest.
5251
5352
### Internet search experience requirements
5453

55-
All data returned in responses may only be used in internet search experiences. An internet search experience means the content displayed:
54+
All data returned in responses may only be used in internet search experiences. An internet search experience means the content displayed:
5655

57-
- Is relevant and responsive to the end user's direct query, or other indication of their search interest and intent (for example, a user-indicated search query).
56+
- Is relevant and responsive to the end user's direct query, or other indication of their search interest and intent (for example, a user-indicated search query).
5857

5958
- Helps users find and navigate to the response's data sources. For example, providing clickable links from hyperlinks in the response.
6059

61-
- Includes multiple results for the user to select from.
60+
- Includes multiple results for the user to select from.
6261

6362
- Are in a placement that enables users to search.
6463

6564
- Includes a visible indication that the content is an internet search result. For example, a statement that the content is "from the web".
6665

6766
- Includes any other appropriate measures to ensure your Bing Search API data does not violate any applicable laws or third-party rights. Consult your legal advisors to determine what measures may be appropriate.
6867

69-
The only exception to these internet search experience requirements is for URL discovery, as described later in this article.
68+
The only exception to these internet search experience requirements is for URL discovery, as described later in this article.
7069

7170
### Restrictions
7271

7372
Do not:
7473

75-
- Copy, store, or cache any data from responses (except retention to the extent permitted by [continuity of service](#continuity-of-service).
74+
- Copy, store, or cache any data from responses (except retention to the extent permitted by [continuity of service](#continuity-of-service).
7675

7776
- Use data received from the Search APIs as part of any machine learning or similar algorithmic activity. Do not use this data to train, evaluate, or improve new or existing services that you or third parties might offer.
7877

79-
- Modify the content of results (other than to reformat them in a way that does not violate any other requirement), unless required by law or agreed to by Microsoft.
78+
- Modify the content of results (other than to reformat them in a way that does not violate any other requirement), unless required by law or agreed to by Microsoft.
8079

8180
- Omit attribution information and URLs associated with result content.
8281

83-
- Reorder, including by omission, the results displayed in an answer when an order or ranking is provided, unless required by law or agreed to by Microsoft.
82+
- Reorder, including by omission, the results displayed in an answer when an order or ranking is provided, unless required by law or agreed to by Microsoft.
8483

8584
> [!NOTE]
8685
> This requirement does not apply to reordering implemented through the portal for the Bing Custom Search API.
8786
88-
- Display other content within any part of a response in a way that would lead a user to believe that the other content is part of the response.
87+
- Display other content within any part of a response in a way that would lead a user to believe that the other content is part of the response.
8988

90-
- Display advertising that is not provided by Microsoft on any page that displays any part of a response.
89+
- Display advertising that is not provided by Microsoft on any page that displays any part of a response.
9190

9291
- Display any advertising on pages with responses:
93-
- From the Bing Image, News Search, Video Search, or Visual Search APIs
94-
- That are filtered or limited primarily (or solely) to image, news and/or video or visual search results.
92+
- From the Bing Image, News Search, Video Search, or Visual Search APIs
93+
- That are filtered or limited primarily (or solely) to image, news and/or video or visual search results.
94+
95+
### Notices and branding
9596

96-
### Notices and branding
9797
Do:
9898

9999
- Prominently include a functional hyperlink to the [Microsoft Privacy Statement](https://go.microsoft.com/fwlink/?LinkId=521839), near each point in the user experience (UX) that offers a user the ability to input a search query. Label the hyperlink **Microsoft Privacy Statement**.
100100

101-
- Prominently display Bing branding, consistent with the [Bing Trademark Usage Guidelines](https://go.microsoft.com/fwlink/?linkid=833278), near each point in the UX that offers a user the ability to input a search query. Such branding must clearly state to the user that Microsoft is powering the internet search experience.
101+
- Prominently display Bing branding, consistent with the [Bing Trademark Usage Guidelines](https://www.microsoft.com/legal/intellectualproperty/trademarks), near each point in the UX that offers a user the ability to input a search query. Such branding must clearly state to the user that Microsoft is powering the internet search experience.
102102

103-
- You can attribute each response (or portion of a response) displayed from the Bing Web Search, Image Search, News Search, Video Search, and Visual Search APIs to Microsoft, unless Microsoft specifies otherwise in writing for your use. This is described in [Bing Trademark Usage Guidelines](https://go.microsoft.com/fwlink/?linkid=833278).
103+
- You can attribute each response (or portion of a response) displayed from the Bing Web Search, Image Search, News Search, Video Search, and Visual Search APIs to Microsoft, unless Microsoft specifies otherwise in writing for your use. This is described in [Bing Trademark Usage Guidelines](https://www.microsoft.com/legal/intellectualproperty/trademarks).
104104

105105
Do not:
106106

107107
- Attribute responses (or portions of responses) displayed from the Bing Custom Search API to Microsoft, unless Microsoft specifies otherwise in writing for your particular use.
108108

109109
### Transferring responses
110110

111-
If you enable a user to transfer a response from a Search API to another user, such as through a messaging app or social media posting, the following apply:
111+
If you enable a user to transfer a response from a Search API to another user, such as through a messaging app or social media posting, the following apply:
112112

113113
- Transferred responses must:
114114
- Consist of content that is unmodified from the content of the responses displayed to the transferring user. Formatting changes are permissible.
@@ -120,7 +120,7 @@ If you enable a user to transfer a response from a Search API to another user, s
120120
- You may not automate the transfer of responses. A transfer must be initiated by a user action clearly evidencing an intent to transfer a response.
121121
- You may only enable a user to transfer responses that were displayed in response to the transferring user's query.
122122

123-
### Continuity of service
123+
### Continuity of service
124124

125125
Do not copy, store, or cache any data from Search API responses. However, to enable continuity of service access and data rendering, you may retain results solely under the following conditions:
126126

@@ -140,28 +140,28 @@ You may retain results specific to a single user securely on a server you contro
140140

141141
Whenever retained, results for a specific user cannot be commingled with results for another user. That is, the results of each user must be retained and delivered separately.
142142

143-
### General
143+
### General
144144

145145
For all presentation of retained results:
146146

147147
- Include a clear, visible notice of the time the query was sent.
148-
- Present the user with a button or similar means to re-query and obtain updated results.
148+
- Present the user with a button or similar means to re-query and obtain updated results.
149149
- Retain the Bing branding in the presentation of the results.
150150
- Delete (and refresh with a new query if needed) the stored results within the timeframes specified.
151151

152-
### Non-display URL discovery
152+
### Non-display URL discovery
153153

154154
You may only use search responses in a non-internet search experience for the sole purpose of discovering URLs of sources of information responsive to a query from your user or customer. You may copy such URLs in a report or similar response you provide:
155155

156156
- Only to that user or customer, in response to that query.
157157
- Only if it includes significant additional valuable content, relevant to the query.
158158

159-
The previous sections of Search APIs use and display requirements do not apply to this non-display use, except for the following:
159+
The previous sections of Search APIs use and display requirements do not apply to this non-display use, except for the following:
160160

161161
- Do not cache, copy, or store any data or content from, or derived from, the search response, other than the limited URL copying described previously.
162162
- Ensure your use of data (including the URLs) received from the Search APIs does not violate any applicable laws or third-party rights.
163163
- Do not use the data (including the URLs) received from the Search APIs as part of any search index or machine learning or similar algorithmic activity. Do not use this data to create train, evaluate, or improve services that you or third parties might offer.
164164

165165
## GDPR compliance
166166

167-
With respect to any personal data subject to the European Union General Data Protection Regulation (GDPR) and that is processed in connection with calls to the Search APIs, Bing Spell Check API, or Bing Autosuggest API, you understand that you and Microsoft are independent data controllers under the GDPR. You are independently responsible for your compliance with the GDPR.
167+
With respect to any personal data subject to the European Union General Data Protection Regulation (GDPR) and that is processed in connection with calls to the Search APIs, Bing Spell Check API, or Bing Autosuggest API, you understand that you and Microsoft are independent data controllers under the GDPR. You are independently responsible for your compliance with the GDPR.

articles/communication-services/concepts/router/azure-function-rule-engine.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The decision flow (as shown above) is as follows:
8888

8989
Before moving on any further in the process, let us first define an Azure function that scores worker.
9090
> [!NOTE]
91-
> The following Azure function is using Javascript. For more information, please refer to [Quickstart: Create a JavaScript function in Azure using Visual Studio Code](../../../azure-functions/create-first-function-vs-code-node.md)
91+
> The following Azure function is using JavaScript. For more information, please refer to [Quickstart: Create a JavaScript function in Azure using Visual Studio Code](../../../azure-functions/create-first-function-vs-code-node.md)
9292
9393
Sample input for **Worker 1**
9494

articles/iot-central/core/howto-control-devices-with-rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ The request body looks like the following example:
421421

422422
```json
423423
{
424-
"since": "2021-03-24T12:55:20.789Z"
424+
"request": "2021-03-24T12:55:20.789Z"
425425
}
426426
```
427427

articles/machine-learning/how-to-setup-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ The service principal can also be used to authenticate to the Azure Machine Lear
251251
252252
For information and samples on authenticating with MSAL, see the following articles:
253253

254-
* JavaScript - [How to migrate a Javascript app from ADAL.js to MSAL.js](../active-directory/develop/msal-compare-msal-js-and-adal-js.md).
254+
* JavaScript - [How to migrate a JavaScript app from ADAL.js to MSAL.js](../active-directory/develop/msal-compare-msal-js-and-adal-js.md).
255255
* Node.js - [How to migrate a Node.js app from ADAL to MSAL](../active-directory/develop/msal-node-migration.md).
256256
* Python - [ADAL to MSAL migration guide for Python](../active-directory/develop/migrate-python-adal-msal.md).
257257

articles/web-application-firewall/afds/waf-front-door-tuning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ One benefit of using an exclusion list is that only the match variable you selec
140140

141141
It’s important to consider that exclusions are a global setting. This means that the configured exclusion will apply to all traffic passing through your WAF, not just a specific web app or URI. For example, this could be a concern if *1=1* is a valid request in the body for a certain web app, but not for others under the same WAF policy. If it makes sense to use different exclusion lists for different applications, consider using different WAF policies for each application and applying them to each application's frontend.
142142

143-
When configuring exclusion lists for managed rules, you can choose to exclude all rules within a rule set, all rules within a rule group, or an individual rule. An exclusion list can be configured using [PowerShell](/powershell/module/az.frontdoor/New-AzFrontDoorWafManagedRuleExclusionObject), [Azure CLI](/cli/azure/network/front-door/waf-policy/managed-rules/exclusion), [Rest API](/rest/api/frontdoorservice/webapplicationfirewall/policies/createorupdate), or the Azure portal.
143+
When configuring exclusion lists for managed rules, you can choose to exclude all rules within a rule set, all rules within a rule group, or an individual rule. An exclusion list can be configured using [PowerShell](/powershell/module/az.frontdoor/New-AzFrontDoorWafManagedRuleExclusionObject), [Azure CLI](/cli/azure/network/front-door/waf-policy/managed-rules/exclusion), [REST API](/rest/api/frontdoorservice/webapplicationfirewall/policies/createorupdate), or the Azure portal.
144144

145145
* Exclusions at a rule level
146146
* Applying exclusions at a rule level means that the specified exclusions will not be analyzed against that individual rule only, while it will still be analyzed by all other rules in the rule set. This is the most granular level for exclusions, and it can be used to fine-tune the managed rule set based on the information you find in the WAF logs when troubleshooting an event.

0 commit comments

Comments
 (0)