Skip to content

Commit 1797bb9

Browse files
authored
Merge pull request #109577 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 5606984 + 0fe4074 commit 1797bb9

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

articles/active-directory/governance/entitlement-management-catalog-create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Create & manage resources in entitlement management - Azure AD
2+
title: Create & manage a catalog of resources in entitlement management - Azure AD
33
description: Learn how to create a new container of resources and access packages in Azure Active Directory entitlement management.
44
services: active-directory
55
documentationCenter: ''

articles/azure-government/documentation-government-ase-disa-cap.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ However, since DISA advertises a default route out the ExpressRoute circuit, the
3636
You will need to create new routes in the UDR for the management addresses in order to keep the ASE healthy. For Azure Government ranges see [App Service Environment management addresses](https://docs.microsoft.com/azure/app-service/environment/management-addresses
3737
)
3838

39-
Rule 1: 23.97.29.209 --> Internet
40-
Rule 2: 23.97.0.17 --> Internet
41-
Rule 3: 23.97.16.184 --> Internet
42-
Rule 4: 13.72.180.105 --> Internet
43-
Rule 5: 13.72.53.37 --> Internet
39+
* Rule 1: 23.97.29.209 --> Internet
40+
* Rule 2: 23.97.0.17 --> Internet
41+
* Rule 3: 23.97.16.184 --> Internet
42+
* Rule 4: 13.72.180.105 --> Internet
43+
* Rule 5: 13.72.53.37 --> Internet
4444

4545
Make sure the UDR is applied to the subnet your ASE is deployed to.
4646

@@ -56,16 +56,16 @@ The images below describe the default NSG rules created during the ASE creation.
5656

5757
### Service Endpoints
5858

59-
Depending what storage you are using you will be required to enable Service Endpoints for SQL and Azure Storage to access them without going back down to the DISA BCAP. You also need to enable EventHub Service Endpoint for ASE logs.
59+
Depending on the storage you use, you will be required to enable Service Endpoints for SQL and Azure Storage to access them without going back down to the DISA BCAP. You also need to enable EventHub Service Endpoint for ASE logs. [Learn more](https://docs.microsoft.com/azure/app-service/environment/network-info#service-endpoints).
6060

6161
## FAQs
6262

63-
* Some configuration changes may take some time to take effect. Allow for several hours for changes to routing, NSGs, ASE Health, etc. to propagate and take effect, or optionally you can reboot the ASE.
63+
Some configuration changes may take some time to take effect. Allow for several hours for changes to routing, NSGs, ASE Health, etc. to propagate and take effect, or optionally you can reboot the ASE.
6464

6565
## Resource manager template sample
6666

6767
> [!NOTE]
68-
>In order to deploy non-RFC 1918 IP addresses in the portal you must pre-stage the VNet and Subnet for the ASE. You can use a Resource Manager Template to deploy the ASE with non-RFC1918 IPs as well.
68+
> In order to deploy non-RFC 1918 IP addresses in the portal you must pre-stage the VNet and Subnet for the ASE. You can use a Resource Manager Template to deploy the ASE with non-RFC1918 IPs as well.
6969
7070
<a href="https://portal.azure.us/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2FApp-Service-Environment-AzFirewall%2Fazuredeploy.json" target="_blank">
7171

articles/cost-management-billing/manage/mpa-request-ownership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Azure Marketplace products which are available for subscriptions that are manage
135135

136136
### Azure Reservations transfer
137137

138-
Azure Reservations don't automatically move with subscriptions.Either you can keep the Reservation in EAfor other subscriptions or [cancel the Reservation](https://docs.microsoft.com/azure/cost-management-billing/reservations/exchange-and-refund-azure-reservations) and parnter can repurchase in CSP.
138+
Azure Reservations don't automatically move with subscriptions. Either you can keep the Reservation in EAfor other subscriptions or [cancel the Reservation](https://docs.microsoft.com/azure/cost-management-billing/reservations/exchange-and-refund-azure-reservations) and partner can repurchase in CSP.
139139

140140
### Access to Azure services
141141

articles/data-factory/connector-azure-sql-database.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ To use a service principal-based Azure AD application token authentication, foll
138138
4. Grant the service principal needed permissions as you normally do for SQL users or others. Run the following code. For more options, see [this document](https://docs.microsoft.com/sql/relational-databases/system-stored-procedures/sp-addrolemember-transact-sql?view=sql-server-2017).
139139

140140
```sql
141-
EXEC sp_addrolemember [role name], [your application name];
141+
ALTER ROLE [role name] ADD MEMBER [your application name];
142142
```
143143

144144
5. Configure an Azure SQL Database linked service in Azure Data Factory.
@@ -185,7 +185,7 @@ To use managed identity authentication, follow these steps.
185185
3. Grant the Data Factory managed identity needed permissions as you normally do for SQL users and others. Run the following code. For more options, see [this document](https://docs.microsoft.com/sql/relational-databases/system-stored-procedures/sp-addrolemember-transact-sql?view=sql-server-2017).
186186

187187
```sql
188-
EXEC sp_addrolemember [role name], [your Data Factory name];
188+
ALTER ROLE [role name] ADD MEMBER [your Data Factory name];
189189
```
190190

191191
4. Configure an Azure SQL Database linked service in Azure Data Factory.

articles/security-center/azure-kubernetes-service-integration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Together, these two tools form the best cloud-native Kubernetes security offerin
3131

3232
Using the two services together provides:
3333

34-
* **Security recommendations** - Security Center identifies your AKS resources and categorizes them: from clusters to individual virtual machines. You can then view security recommendations per resource. For more information, see the containers recommendations in the [reference list of recommendations](recommendations-reference.md#recs-computeapp).
34+
* **Security recommendations** - Security Center identifies your AKS resources and categorizes them: from clusters to individual virtual machines. You can then view security recommendations per resource. For more information, see the containers recommendations in the [reference list of recommendations](recommendations-reference.md#recs-containers).
3535

3636
* **Environment hardening** - Security Center constantly monitors the configuration of your Kubernetes clusters and Docker configurations. It then generates security recommendations that reflect industry standards.
3737

@@ -57,4 +57,4 @@ To learn more about Security Center's container security features, see:
5757

5858
* [Integration with Azure Container Registry](azure-container-registry-integration.md)
5959

60-
* [Data management at Microsoft](https://www.microsoft.com/trust-center/privacy/data-management) - Describes the data policies of Microsoft services (including Azure, Intune, and Office 365), details of Microsoft's data management, and the retention policies that affect your data
60+
* [Data management at Microsoft](https://www.microsoft.com/trust-center/privacy/data-management) - Describes the data policies of Microsoft services (including Azure, Intune, and Office 365), details of Microsoft's data management, and the retention policies that affect your data

0 commit comments

Comments
 (0)