Skip to content

Commit da7acc8

Browse files
authored
Merge pull request #105642 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 1671642 + 1918639 commit da7acc8

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

articles/active-directory/develop/howto-authenticate-service-principal-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can set the scope at the level of the subscription, resource group, or resou
4646

4747
## Create service principal with self-signed certificate
4848

49-
The following example covers a simple scenario. It uses [New-​AzAD​Service​Principal](/powershell/module/az.resources/new-azadserviceprincipal) to create a service principal with a self-signed certificate, and uses [New-​Azure​Rm​Role​Assignment](/powershell/module/az.resources/new-azroleassignment) to assign the [Reader](/azure/role-based-access-control/built-in-roles#reader) role to the service principal. The role assignment is scoped to your currently selected Azure subscription. To select a different subscription, use [Set-AzContext](/powershell/module/Az.Accounts/Set-AzContext).
49+
The following example covers a simple scenario. It uses [New-​AzAD​Service​Principal](/powershell/module/az.resources/new-azadserviceprincipal) to create a service principal with a self-signed certificate, and uses [New-AzRoleAssignment](/powershell/module/az.resources/new-azroleassignment) to assign the [Reader](/azure/role-based-access-control/built-in-roles#reader) role to the service principal. The role assignment is scoped to your currently selected Azure subscription. To select a different subscription, use [Set-AzContext](/powershell/module/Az.Accounts/Set-AzContext).
5050

5151
> [!NOTE]
5252
> The New-SelfSignedCertificate cmdlet and the PKI module are currently not supported in PowerShell Core.

articles/aks/operator-best-practices-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The following table outlines the available storage types and their capabilities:
3131
|----------|---------------|-----------------|----------------|-----------------|--------------------|
3232
| Shared configuration | Azure Files | Yes | Yes | Yes | Yes |
3333
| Structured app data | Azure Disks | Yes | No | No | Yes |
34-
| Unstructured data, file system operations | [BlobFuse (preview)][blobfuse] | Yes | Yes | Yes | No |
34+
| Unstructured data, file system operations | [BlobFuse][blobfuse] | Yes | Yes | Yes | No |
3535

3636
The two primary types of storage provided for volumes in AKS are backed by Azure Disks or Azure Files. To improve security, both types of storage use Azure Storage Service Encryption (SSE) by default that encrypts data at rest. Disks cannot currently be encrypted using Azure Disk Encryption at the AKS node level.
3737

articles/api-management/configure-custom-domain.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ To perform the steps described in this article, you must have:
4949
- **Gateway** (default is: `<apim-service-name>.azure-api.net`),
5050
- **Portal** (default is: `<apim-service-name>.portal.azure-api.net`),
5151
- **Management** (default is: `<apim-service-name>.management.azure-api.net`),
52-
- **SCM** (default is: `<apim-service-name>.scm.azure-api.net`).
52+
- **SCM** (default is: `<apim-service-name>.scm.azure-api.net`),
53+
- **NewPortal** (default is: `<apim-service-name>.developer.azure-api.net`).
5354

5455
> [!NOTE]
5556
> Only the **Gateway** endpoint is available for configuration in the Consumption tier.

articles/azure-maps/routing-coverage.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ The following table provides coverage information for Azure Maps routing.
202202
| Romania ||||
203203
| Russian Federation ||||
204204
| San Marino ||| |
205-
| +Sint Maarten || | |
206205
| Serbia || ||
207206
| Slovakia ||||
208207
| Slovenia ||||

articles/search/cognitive-search-skill-custom-entity-lookup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Parameters are case-sensitive.
5959

6060
There are 3 different ways to provide the list of custom entities to the Custom Entity Lookup skill. You can provide the list in a .CSV file, a .JSON file or as an inline definition as part of the skill definition.
6161

62-
If the definition file is a .CSV or .JSON file, the path of the file needs to be provided as part of the *entitiesDefitionUri* parameter. In this case, the file is downloaded once at the beginning of each indexer run. The file must be accessible as long as the indexer is intended to run.
62+
If the definition file is a .CSV or .JSON file, the path of the file needs to be provided as part of the *entitiesDefitionUri* parameter. In this case, the file is downloaded once at the beginning of each indexer run. The file must be accessible as long as the indexer is intended to run. Also, the file must be encoded UTF-8.
6363

6464
If the definition is provided inline, it should be provided as inline as the content of the *inlineEntitiesDefinition* skill parameter.
6565

@@ -296,4 +296,4 @@ Alternatively, if you decide to provide a pointer to the entities definition fil
296296

297297
+ [Built-in skills](cognitive-search-predefined-skills.md)
298298
+ [How to define a skillset](cognitive-search-defining-skillset.md)
299-
+ [Entity Recognition skill (to search for well known entities)](cognitive-search-skill-entity-recognition.md)
299+
+ [Entity Recognition skill (to search for well known entities)](cognitive-search-skill-entity-recognition.md)

articles/sql-database/sql-database-service-tiers-vcore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ For regions where Fsv2-series is available, see [Fsv2-series availability](#fsv2
8383
- M-series is a memory optimized hardware option for workloads demanding more memory and higher compute limits than provided by Gen5.
8484
- M-series provides 29 GB per vCore and 128 vCores, which increases the memory limit relative to Gen5 by 8x to nearly 4 TB.
8585

86-
To enable M-series hardware for a subscription and region, a support request must be open. If the support request is approved, then the selection and provisioning experience of M-series follows the same pattern as for other hardware generations. For regions where M-series is available, see [M-series availability](#m-series).
86+
To enable M-series hardware for a subscription and region, a support request must be opened. The subscription must be a paid offer type including Pay-As-You-Go or Enterprise Agreement (EA). If the support request is approved, then the selection and provisioning experience of M-series follows the same pattern as for other hardware generations. For regions where M-series is available, see [M-series availability](#m-series).
8787

8888

8989
### Compute and memory specifications

includes/api-management-custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If the customer has one or multiple custom domains configured for Proxy, APIM ca
1414
If the customer is using a client, which does not send the [SNI](https://tools.ietf.org/html/rfc6066#section-3) header, APIM creates responses based on the following logic:
1515

1616
* If the service has just one custom domain configured for Proxy, the Default Certificate is the certificate that was issued to the Proxy custom domain.
17-
* If the service has configured multiple custom domains for Proxy (only supported in the **Premium** tier), the customer can designate which certificate should be the default certificate. To set the default certificate, the [defaultSslBinding](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/apimanagementservice/createorupdate#hostnameconfiguration) property should be set to true ("defaultSslBinding":"true"). If the customer does not set the property, the default certificate is the certificate issued to default Proxy domain hosted at *.azure-api.net.
17+
* If the service has configured multiple custom domains for Proxy (supported in the **Developer** and **Premium** tier), the customer can designate which certificate should be the default certificate. To set the default certificate, the [defaultSslBinding](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/apimanagementservice/createorupdate#hostnameconfiguration) property should be set to true ("defaultSslBinding":"true"). If the customer does not set the property, the default certificate is the certificate issued to default Proxy domain hosted at *.azure-api.net.
1818

1919
## Support for PUT/POST request with large payload
2020

0 commit comments

Comments
 (0)