Skip to content

Commit 3f7360d

Browse files
authored
Merge pull request #96859 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 03f1faf + 0311954 commit 3f7360d

File tree

11 files changed

+36
-60
lines changed

11 files changed

+36
-60
lines changed

articles/app-service/web-sites-traffic-manager.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,4 @@ When using Azure Traffic Manager with Azure, keep in mind the following points:
5353
## Next Steps
5454
For a conceptual and technical overview of Azure Traffic Manager, see [Traffic Manager Overview](../traffic-manager/traffic-manager-overview.md).
5555

56-
For more information about using Traffic Manager with App Service, see the blog posts
57-
[Using Azure Traffic Manager with Azure Web Sites](https://blogs.msdn.com/b/waws/archive/2014/03/18/using-windows-azure-traffic-manager-with-waws.aspx) and [Azure Traffic Manager can now integrate with Azure Web Sites](https://azure.microsoft.com/blog/2014/03/27/azure-traffic-manager-can-now-integrate-with-azure-web-sites/).
5856

articles/cognitive-services/Anomaly-Detector/quickstarts/detect-data-anomalies-csharp-sdk.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ Use the Anomaly Detector client library for .NET to:
3636

3737
### Create a new .NET Core application
3838

39-
In a console window (such as cmd, PowerShell, or Bash), use the dotnet `new` command to create a new console app with the name `anomaly-detector-quickstart`. This command creates a simple "Hello World" project with a single C# source file: *Program.cs*.
39+
In a console window (such as cmd, PowerShell, or Bash), use the `dotnet new` command to create a new console app with the name `anomaly-detector-quickstart`. This command creates a simple "Hello World" project with a single C# source file: *Program.cs*.
4040

41-
```console
41+
```dotnetcli
4242
dotnet new console -n anomaly-detector-quickstart
4343
```
4444

4545
Change your directory to the newly created app folder. You can build the application with:
4646

47-
```console
47+
```dotnetcli
4848
dotnet build
4949
```
5050

@@ -62,7 +62,7 @@ Build succeeded.
6262

6363
Within the application directory, install the Anomaly Detector client library for .NET with the following command:
6464

65-
```console
65+
```dotnetcli
6666
dotnet add package Microsoft.Azure.CognitiveServices.AnomalyDetector --version 0.8.0-preview
6767
```
6868

@@ -126,9 +126,9 @@ Create a method to call the client's [LastDetectAsync()](https://docs.microsoft.
126126

127127
## Run the application
128128

129-
Run the application with the dotnet `run` command from your application directory.
129+
Run the application with the `dotnet run` command from your application directory.
130130

131-
```dotnet
131+
```dotnetcli
132132
dotnet run
133133
```
134134

articles/cognitive-services/Face/QuickStarts/csharp-sdk.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ms.topic: quickstart
1010
ms.date: 08/20/2019
1111
ms.author: pafarley
1212
---
13-
1413
# Quickstart: Face client library for .NET
1514

1615
Get started with the Face client library for .NET. Follow these steps to install the package and try out the example code for basic tasks. The Face API service provides you with access to advanced algorithms for detecting and recognizing human faces in images.
@@ -48,13 +47,13 @@ Create a new .NET Core application in your preferred editor or IDE.
4847

4948
In a console window (such as cmd, PowerShell, or Bash), use the `dotnet new` command to create a new console app with the name `face-quickstart`. This command creates a simple "Hello World" C# project with a single source file: *Program.cs*.
5049

51-
```console
50+
```dotnetcli
5251
dotnet new console -n face-quickstart
5352
```
5453

5554
Change your directory to the newly created app folder. You can build the application with:
5655

57-
```console
56+
```dotnetcli
5857
dotnet build
5958
```
6059

@@ -80,7 +79,7 @@ In the application's `Main` method, create variables for your resource's Azure e
8079

8180
Within the application directory, install the Face client library for .NET with the following command:
8281

83-
```console
82+
```dotnetcli
8483
dotnet add package Microsoft.Azure.CognitiveServices.Vision.Face --version 2.5.0-preview.1
8584
```
8685

@@ -169,7 +168,7 @@ The following method detects faces in a set of target images and in a single sou
169168

170169
### Print matches
171170

172-
The following code prints the match details to the console.
171+
The following code prints the match details to the console:
173172

174173
[!code-csharp[](~/cognitive-services-dotnet-sdk-samples/documentation-samples/quickstarts/Face/Program.cs?name=snippet_find_similar_print)]
175174

@@ -282,7 +281,7 @@ At this point, your new **PersonGroup** object should have the same data as the
282281

283282
Run the application from your application directory with the `dotnet run` command.
284283

285-
```dotnet
284+
```dotnetcli
286285
dotnet run
287286
```
288287

@@ -313,4 +312,4 @@ In this quickstart, you learned how to use the Face library for .NET to do basis
313312
> [Face API reference (.NET)](https://docs.microsoft.com/dotnet/api/overview/azure/cognitiveservices/client/faceapi?view=azure-dotnet)
314313
315314
* [What is the Face API?](../overview.md)
316-
* The source code for this sample can be found on [GitHub](https://github.com/Azure-Samples/cognitive-services-dotnet-sdk-samples/blob/master/documentation-samples/quickstarts/Face/Program.cs).
315+
* The source code for this sample can be found on [GitHub](https://github.com/Azure-Samples/cognitive-services-dotnet-sdk-samples/blob/master/documentation-samples/quickstarts/Face/Program.cs).

articles/cognitive-services/LUIS/sdk-csharp-quickstart-authoring-app.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ Create a new .NET Core application in your preferred editor or IDE.
8181

8282
1. In a console window (such as cmd, PowerShell, or Bash), use the dotnet `new` command to create a new console app with the name `language-understanding-quickstart`. This command creates a simple "Hello World" C# project with a single source file: `Program.cs`.
8383

84-
```console
84+
```dotnetcli
8585
dotnet new console -n language-understanding-quickstart
8686
```
8787
8888
1. Change your directory to the newly created app folder.
8989
9090
1. You can build the application with:
9191
92-
```console
92+
```dotnetcli
9393
dotnet build
9494
```
9595
@@ -108,7 +108,7 @@ Create a new .NET Core application in your preferred editor or IDE.
108108
109109
Within the application directory, install the Language Understanding (LUIS) authoring client library for .NET with the following command:
110110
111-
```console
111+
```dotnetcli
112112
dotnet add package Microsoft.Azure.CognitiveServices.Language.LUIS.Authoring --version 3.0.0
113113
```
114114

@@ -143,7 +143,7 @@ These code snippets show you how to do the following with the Language Understan
143143

144144
## Add the dependencies
145145

146-
From the project directory, open the **Program.cs** file in your preferred editor or IDE. Replace the existing `using` code with the following `using` directives:
146+
From the project directory, open the *Program.cs* file in your preferred editor or IDE. Replace the existing `using` code with the following `using` directives:
147147

148148
[!code-csharp[Using statements](~/cognitive-services-dotnet-sdk-samples/documentation-samples/quickstarts/LUIS/LUIS.cs?name=Dependencies)]
149149

@@ -222,9 +222,9 @@ Publish the LUIS app using the [PublishAsync](https://docs.microsoft.com/dotnet/
222222

223223
## Run the application
224224

225-
Run the application with the dotnet `run` command from your application directory.
225+
Run the application with the `dotnet run` command from your application directory.
226226

227-
```console
227+
```dotnetcli
228228
dotnet run
229229
```
230230

articles/cognitive-services/QnAMaker/Quickstarts/create-publish-kb-csharp-sdk.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ After getting a key and endpoint for your resource, [create environment variable
4444

4545
Create a new .NET Core application in your preferred editor or IDE.
4646

47-
In a console window (such as cmd, PowerShell, or Bash), use the dotnet `new` command to create a new console app with the name `qna-maker-quickstart`. This command creates a simple "Hello World" C# project with a single source file: `Program.cs`.
47+
In a console window (such as cmd, PowerShell, or Bash), use the `dotnet new` command to create a new console app with the name `qna-maker-quickstart`. This command creates a simple "Hello World" C# project with a single source file: *Program.cs*.
4848

49-
```console
49+
```dotnetcli
5050
dotnet new console -n qna-maker-quickstart
5151
```
5252

5353
Change your directory to the newly created app folder. You can build the application with:
5454

55-
```console
55+
```dotnetcli
5656
dotnet build
5757
```
5858

@@ -70,7 +70,7 @@ Build succeeded.
7070

7171
Within the application directory, install the QnA Maker client library for .NET with the following command:
7272

73-
```console
73+
```dotnetcli
7474
dotnet add package Microsoft.Azure.CognitiveServices.Knowledge.QnAMaker --version 1.0.0
7575
```
7676

@@ -184,11 +184,11 @@ The _loop_ and _Task.Delay_ in the following code block are used to simulate ret
184184

185185
## Run the application
186186

187-
Run the application with the dotnet `run` command from your application directory.
187+
Run the application with the `dotnet run` command from your application directory.
188188

189189
All of the code snippets in this article are [available](https://github.com/Azure-Samples/cognitive-services-qnamaker-python/blob/master/documentation-samples/quickstarts/knowledgebase_quickstart/knowledgebase_quickstart.py) and can be run as a single file.
190190

191-
```console
191+
```dotnetcli
192192
dotnet run
193193
```
194194

articles/databox/data-box-deploy-picked-up.md

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -119,28 +119,7 @@ Azure datacenters in Australia have an additional security notification. All the
119119
2. Make sure that the data copy to device is complete and **Prepare to ship run** is successful.
120120
3. Power off the device and remove the cables.
121121
4. Spool and securely place the power cord that was provided with the device in the back of the device.
122-
5. Email Quantium Solutions to request a pickup. Refer to the service reference number specified on the Azure portal. Use the following email template: - *Request for reverse shipping label with TAU code*. Make sure to include the following details in the email:
123-
124-
```
125-
126-
Subject: Pickup request for Azure|Reference number:XXX XXX XXX
127-
Body:
128-
- Company name:
129-
- Address:
130-
- Contact name:
131-
- Contact number:
132-
- Requested pickup date: mm/dd
133-
```
134-
6. Quantium Solutions Australia will email you a return shipping label.
135-
7. Print the return label and affix it on the shipping box.
136-
8. Hand over the package to the courier.
137-
138-
If needed, you can email Quantium Solution Support at [email protected] or phone.
139-
140-
For inquiry regarding your order via the phone:
141-
142-
- Send an email for pickup first.
143-
- Provide your order name on the phone.
122+
5. Book a pick-up online at the [DHL Link](https://mydhl.express.dhl/au/en/schedule-pickup.html#/schedule-pickup#label-reference).
144123

145124
::: zone target="chromeless"
146125

articles/search/search-filters.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ POST https://[service name].search.windows.net/indexes/hotels/docs/search?api-ve
8181
parameters =
8282
new SearchParameters()
8383
{
84-
Filter = "Rooms/BaseRate lt 150.0",
84+
Filter = "Rooms/any(room: room/BaseRate lt 150.0)",
8585
Select = new[] { "HotelId", "HotelName", "Rooms/Description" ,"Rooms/BaseRate"}
8686
};
8787

@@ -108,10 +108,10 @@ The following examples illustrate several usage patterns for filter scenarios. F
108108

109109
```
110110
# Match on hostels rated higher than 4 OR 5-star motels.
111-
$filter=search.ismatchscoring('hostel') and rating ge 4 or search.ismatchscoring('motel') and rating eq 5
111+
$filter=search.ismatchscoring('hostel') and Rating ge 4 or search.ismatchscoring('motel') and Rating eq 5
112112
113113
# Match on 'luxury' or 'high-end' in the description field OR on category exactly equal to 'Luxury'.
114-
$filter=search.ismatchscoring('luxury | high-end', 'description') or category eq 'Luxury'
114+
$filter=search.ismatchscoring('luxury | high-end', 'Description') or Category eq 'Luxury'&$count=true
115115
```
116116

117117
It is also possible to combine full-text search via `search.ismatchscoring` with filters using `and` instead of `or`, but this is functionally equivalent to using the `search` and `$filter` parameters in a search request. For example, the following two queries produce the same result:

articles/service-fabric/configure-container-repository-credentials.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Service Fabric supports using tokens as credentials to download images for your
109109

110110
3. Once the above steps are completed, modify your applicationmanifest.xml file. Find the tag labeled “ContainerHostPolicies” and add the attribute `‘UseTokenAuthenticationCredentials=”true”`.
111111

112-
```json
112+
```xml
113113
<ServiceManifestImport>
114114
<ServiceManifestRef ServiceManifestName="NodeServicePackage" ServiceManifestVersion="1.0"/>
115115
<Policies>

articles/virtual-network/virtual-networks-static-private-ip-arm-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ To change the NIC for the VM used in the previous commands, complete the followi
247247
2. Run the **azure vm set** command to change the NIC used by the VM.
248248
249249
```azurecli
250-
azure vm set -g TestRG -n DNS01 -N TestNIC2
250+
az vm nic set --resource-group TestRG --vm-name DNS01 --nics TestNIC2
251251
```
252252
253253
Expected output:

articles/web-application-firewall/afds/afds-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ Default action is to BLOCK. In addition, custom rules can be configured in the s
8888
Custom rules are always applied before rules in the Default Rule Set are evaluated. If a request matches a custom rule, corresponding rule action is applied, and the request is either blocked or passed through to back-end, without invocation of any further custom rules or the rules in the Default Rule Set. Furthermore, you have the option to remove Default Rule Set from your WAF policies.
8989

9090

91-
### Bot protection rule (preview)
91+
### Bot protection rule set (preview)
9292

93-
A managed Bot protection rule set can be enabled for your WAF to take custom actions on requests from known malicious IP addresses. The IP addresses are sourced from the Microsoft Threat Intelligence feed. [Intelligent Security Graph](https://www.microsoft.com/security/operations/intelligence) powers Microsoft threat intelligence and is used by multiple services including Azure Security Center.
93+
A managed bot protection rule set can be enabled for your WAF to take custom actions on requests from known bot categories. There are three bot categories supported: Bad Bots, Good Bots, and Unknown Bots. Bot signatures are managed and dynamically updated by the WAF platform. Malicious IP addresses for Bad Bots are sourced from the Microsoft Threat Intelligence feed. [Intelligent Security Graph](https://www.microsoft.com/security/operations/intelligence) powers Microsoft Threat Intelligence and is used by multiple services including Azure Security Center. Good Bots include validated search engines. Unknown categories include additional bot groups. You may set custom actions to block, allow, log, or redirect for different types of bots.
9494

9595
![Bot Protection Rule Set](../media/afds-overview/botprotect2.png)
9696

9797
> [!IMPORTANT]
9898
> The Bot protection rule set is currently in public preview and is provided with a preview service level agreement. Certain features may not be supported or may have constrained capabilities. See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for details.
9999
100-
If Bot Protection is enabled, incoming requests that match Malicious Bots client IPs are logged at FrontdoorWebApplicationFirewallLog log. You may access WAF logs from storage account, event hub or log analytics.
100+
If bot protection is enabled, incoming requests that match bot rules are logged at the FrontdoorWebApplicationFirewallLog log. You may access WAF logs from a storage account, event hub, or log analytics.
101101

102102
## Configuration
103103

@@ -109,4 +109,4 @@ Monitoring for WAF at Front Door is integrated with Azure Monitor to track alert
109109

110110
## Next steps
111111

112-
- Learn about [Web Application Firewall on Azure Application Gateway](../ag/ag-overview.md)
112+
- Learn about [Web Application Firewall on Azure Application Gateway](../ag/ag-overview.md)

0 commit comments

Comments
 (0)