Skip to content

Commit c1531ae

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into clarityFiles
2 parents 0a4bef0 + a973b1f commit c1531ae

File tree

10 files changed

+23
-15
lines changed

10 files changed

+23
-15
lines changed

articles/aks/troubleshooting.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ Follow the *Before you begin* steps in the appropriate doc to correctly create a
114114

115115
Naming restrictions are implemented by both the Azure platform and AKS. If a resource name or parameter breaks one of these restrictions, an error is returned that asks you provide a different input. The following common naming guidelines apply:
116116

117+
* Cluster names must be 1-63 characters. The only allowed characters are letters, numbers, dashes, and underscores. The first and last character must be a letter or a number.
117118
* The AKS *MC_* resource group name combines resource group name and resource name. The auto-generated syntax of `MC_resourceGroupName_resourceName_AzureRegion` must be no greater than 80 chars. If needed, reduce the length of your resource group name or AKS cluster name.
118119
* The *dnsPrefix* must start and end with alphanumeric values. Valid characters include alphanumeric values and hyphens (-). The *dnsPrefix* can't include special characters such as a period (.).
119120

articles/api-management/api-management-howto-developer-portal-customize.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ You can find more details on the developer portal in the [Azure API Management d
3434

3535
> [!WARNING]
3636
> The developer portal is currently being rolled out to API Management services.
37-
> If your service is newly created or is a Developer tier service, you should already have the latest version. Otherwise, you might experience problems (for example, with the publishing functionality). The feature rollout will complete on Monday November 11th, 2019.
37+
> If your service is newly created or is a Developer tier service, you should already have the latest version. Otherwise, you might experience problems (for example, with the publishing functionality). The feature rollout is expected to complete by Friday November 22nd, 2019.
3838
3939
## Prerequisites
4040

articles/api-management/api-management-howto-developer-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This article describes the differences between self-hosted and managed versions
2323

2424
> [!WARNING]
2525
> The new developer portal is currently being rolled out to API Management services.
26-
> If your service is newly created or is a Developer tier service, you should already have the latest version. Otherwise, you might experience problems (for example, with the publishing functionality). The feature rollout will complete on Monday November 11th, 2019.
26+
> If your service is newly created or is a Developer tier service, you should already have the latest version. Otherwise, you might experience problems (for example, with the publishing functionality). The feature rollout is expected to complete by Friday November 22nd, 2019.
2727
>
2828
> [Learn how to migrate from the preview version to the generally available version](#preview-to-ga) of the developer portal.
2929

articles/api-management/api-management-transformation-policies.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,13 +463,20 @@ OriginalUrl.
463463

464464
### Examples
465465

466-
#### Example
466+
#### Example - adding header, override existing
467467

468468
```xml
469469
<set-header name="some header name" exists-action="override">
470470
<value>20</value>
471471
</set-header>
472472
```
473+
#### Example - removing header
474+
475+
```xml
476+
<set-header name="some header name" exists-action="delete" />
477+
```
478+
479+
473480

474481
#### Forward context information to the backend service
475482
This example shows how to apply policy at the API level to supply context information to the backend service. For a demonstration of configuring and using this policy, see [Cloud Cover Episode 177: More API Management Features with Vlad Vinogradsky](https://azure.microsoft.com/documentation/videos/episode-177-more-api-management-features-with-vlad-vinogradsky/) and fast-forward to 10:30. At 12:10 there is a demo of calling an operation in the developer portal where you can see the policy at work.
@@ -503,7 +510,7 @@ OriginalUrl.
503510
|Name|Description|Required|
504511
|----------|-----------------|--------------|
505512
|set-header|Root element.|Yes|
506-
|value|Specifies the value of the header to be set. For multiple headers with the same name add additional `value` elements.|Yes|
513+
|value|Specifies the value of the header to be set. For multiple headers with the same name add additional `value` elements.|No|
507514

508515
### Properties
509516

articles/azure-maps/tutorial-ev-routing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ To complete this tutorial, you first need to create an Azure Maps account and ge
3636

3737
To create an Azure Maps account subscription in the S1 pricing tier, follow the instructions in [Manage your Azure Maps account](https://docs.microsoft.com/azure/azure-maps/how-to-manage-account-keys#create-a-new-account).
3838

39-
To get the primary subscription key for your account, follow the instructions in [Search nearby points of interest by using Azure Maps](./tutorial-search-location.md#getkey) .
39+
To get the primary subscription key for your account, follow the instructions in [Create an account and get your key](https://docs.microsoft.com/azure/azure-maps/quick-demo-map-app#create-an-account-and-get-your-key).
4040

4141
## Create an Azure notebook
4242

@@ -276,7 +276,7 @@ display(Image(poiRangeMap))
276276

277277
After you've determined all the potential charging stations within the reachable range, you want to know which of them can be reached in a minimum amount of time.
278278

279-
The following script calls the Azure Maps [Matrix Routing API](https://docs.microsoft.com/rest/api/maps/route/postroutematrixpreview), which returns for the specified vehicle location the travel time and distance to each charging station. The script in the next cell parses the response to locate the closest reachable charging station with respect to time.
279+
The following script calls the Azure Maps [Matrix Routing API](https://docs.microsoft.com/rest/api/maps/route/postroutematrix), which returns for the specified vehicle location the travel time and distance to each charging station. The script in the next cell parses the response to locate the closest reachable charging station with respect to time.
280280

281281
To find the closest reachable charging station that can be reached in the least amount of time, run the script in the following cell:
282282

@@ -390,7 +390,7 @@ To explore the Azure Maps APIs that are used in this tutorial, see:
390390
* [Post Search Inside Geometry](https://docs.microsoft.com/rest/api/maps/search/postsearchinsidegeometry)
391391
* [Data Upload](https://docs.microsoft.com/rest/api/maps/data/uploadpreview)
392392
* [Render - Get Map Image](https://docs.microsoft.com/rest/api/maps/render/getmapimage)
393-
* [Post Route Matrix](https://docs.microsoft.com/rest/api/maps/route/postroutematrixpreview)
393+
* [Post Route Matrix](https://docs.microsoft.com/rest/api/maps/route/postroutematrix)
394394
* [Get Route Directions](https://docs.microsoft.com/rest/api/maps/route/getroutedirections)
395395

396396
For a complete list of Azure Maps REST APIs, see [Azure Maps REST APIs](https://docs.microsoft.com/azure/azure-maps/#reference).

articles/azure-monitor/app/pricing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The pricing for [Azure Application Insights][start] is a **Pay-As-You-Go** model
2828

2929
## Estimating the costs to manage your application
3030

31-
If you're not yet using Application Insights, you can use the [Azure Monitor pricing calculator](https://azure.microsoft.com/pricing/calculator/?service=monitor) to estimate the cost of using Application Insights. Start by entering "Azure Monitor" in the Search box, and clicking on the resulting Azure Monitor tile. Scroll down the page to Azure Monitor, and select Application Insights from the Type dropdown. Here you can enter the number of GB of data you expect to collect per month, so they question is how much data will Application Insights collect monitoring your application.
31+
If you're not yet using Application Insights, you can use the [Azure Monitor pricing calculator](https://azure.microsoft.com/pricing/calculator/?service=monitor) to estimate the cost of using Application Insights. Start by entering "Azure Monitor" in the Search box, and clicking on the resulting Azure Monitor tile. Scroll down the page to Azure Monitor, and select Application Insights from the Type dropdown. Here you can enter the number of GB of data you expect to collect per month, so the question is how much data will Application Insights collect monitoring your application.
3232

3333
There are two approaches to address this: use of default monitoring and adaptive sampling, which is available in the ASP.NET SDK, or estimate your likely data ingestion based on what other similar customers have seen.
3434

@@ -279,4 +279,4 @@ You can write a script to set the pricing tier by using Azure Resource Managemen
279279
[apiproperties]: app-insights-api-custom-events-metrics.md#properties
280280
[start]: ../../azure-monitor/app/app-insights-overview.md
281281
[pricing]: https://azure.microsoft.com/pricing/details/application-insights/
282-
[pricing]: https://azure.microsoft.com/pricing/details/application-insights/
282+
[pricing]: https://azure.microsoft.com/pricing/details/application-insights/

articles/azure-monitor/platform/autoscale-best-practices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ We recommend carefully choosing different thresholds for scale-out and scale-in
4242

4343
We *do not recommend* autoscale settings like the examples below with the same or very similar threshold values for out and in conditions:
4444

45-
* Increase instances by 1 count when Thread Count <= 600
46-
* Decrease instances by 1 count when Thread Count >= 600
45+
* Increase instances by 1 count when Thread Count >= 600
46+
* Decrease instances by 1 count when Thread Count <= 600
4747

4848
Let's look at an example of what can lead to a behavior that may seem confusing. Consider the following sequence.
4949

articles/container-registry/container-registry-image-formats.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The following Docker container image formats are supported:
2525

2626
## OCI images
2727

28-
Azure Container Registry supports images that meet the [Open Container Initiative (OCI) Image Format Specification](https://github.com/opencontainers/image-spec/blob/master/spec.md). Packaging formats include [Singularity Image Format (SIF)](https://www.sylabs.io/2018/03/sif-containing-your-containers/).
28+
Azure Container Registry supports images that meet the [Open Container Initiative (OCI) Image Format Specification](https://github.com/opencontainers/image-spec/blob/master/spec.md). Packaging formats include [Singularity Image Format (SIF)](https://github.com/sylabs/sif).
2929

3030
## OCI artifacts
3131

articles/managed-applications/microsoft-common-passwordbox.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ A control that can be used to provide and confirm a password.
3434
"toolTip": "",
3535
"constraints": {
3636
"required": true,
37-
"regex": "",
38-
"validationMessage": ""
37+
"regex": "^[a-zA-Z0-9]{8,}$",
38+
"validationMessage": "Password must be at least 8 characters long, contain only numbers and letters"
3939
},
4040
"options": {
4141
"hideConfirmation": false

articles/security/fundamentals/ad-passwordless.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Three types of attacks commonly used to compromise user accounts are password sp
1818

1919
This article is the beginning of your journey to help you understand and implement Microsoft's passwordless solutions and help you choose between one or more of the following options:
2020

21-
* **Windows Hello for Business**. In Windows 10, Windows Hello for Business replaces passwords with strong two-factor authentication on PCs and mobile devices. This authentication consists of a new type of user credential that is tied to a device and uses a biometric or PIN.
21+
* **Windows Hello for Business**. In Windows 10, Windows Hello for Business replaces passwords with strong two-factor authentication on PCs and mobile devices. This authentication consists of a new type of user credential that is tied to a device and uses a biometric recognition or PIN.
2222

2323
* **Passwordless sign-in with Microsoft Authenticator**. The Microsoft Authenticator app can be used to sign in to an Azure AD account without using a password. Similar to the technology of Windows Hello for Business, the Microsoft Authenticator uses key-based authentication to enable a user credential that is tied to a device and uses a biometric or PIN.
2424

0 commit comments

Comments
 (0)