Skip to content

Commit c653024

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 2a84b58 + c535228 commit c653024

File tree

211 files changed

+1905
-3026
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+1905
-3026
lines changed

.openpublishing.redirection.json

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5451,6 +5451,16 @@
54515451
"redirect_url": "/azure/event-grid/template-samples",
54525452
"redirect_document_id": false
54535453
},
5454+
{
5455+
"source_path": "articles/event-grid/premium-basic-tiers.md",
5456+
"redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
5457+
"redirect_document_id": false
5458+
},
5459+
{
5460+
"source_path": "articles/event-grid/update-tier.md",
5461+
"redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
5462+
"redirect_document_id": false
5463+
},
54545464
{
54555465
"source_path": "articles/azure-resource-manager/resource-manager-samples-powershell-deploy.md",
54565466
"redirect_url": "/azure/azure-resource-manager/templates/deploy-powershell",
@@ -20700,9 +20710,59 @@
2070020710
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
2070120711
"redirect_document_id": false
2070220712
},
20713+
{
20714+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-offer-process-parts.md",
20715+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20716+
"redirect_document_id": false
20717+
},
20718+
{
20719+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-prerequisites.md",
20720+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20721+
"redirect_document_id": false
20722+
},
20723+
{
20724+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-create-offer.md",
20725+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20726+
"redirect_document_id": false
20727+
},
20728+
{
20729+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-offer-settings-tab.md",
20730+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20731+
"redirect_document_id": false
20732+
},
20733+
{
20734+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-skus-tab.md",
20735+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20736+
"redirect_document_id": false
20737+
},
20738+
{
20739+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-marketplace-tab.md",
20740+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20741+
"redirect_document_id": false
20742+
},
20743+
{
20744+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-support-tab.md",
20745+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20746+
"redirect_document_id": false
20747+
},
20748+
{
20749+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-publish-offer.md",
20750+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20751+
"redirect_document_id": false
20752+
},
20753+
{
20754+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-update-existing-offer.md",
20755+
"redirect_url": "/azure/marketplace/partner-center-portal/azure-iot-edge-module-creation",
20756+
"redirect_document_id": false
20757+
},
20758+
{
20759+
"source_path": "articles/marketplace/cloud-partner-portal/iot-edge-module/cpp-create-technical-assets.md",
20760+
"redirect_url": "/azure/marketplace/partner-center-portal/create-iot-edge-module-asset",
20761+
"redirect_document_id": false
20762+
},
2070320763
{
2070420764
"source_path": "articles/marketplace/partner-center-portal/billing-details.md",
20705-
"redirect_url": "https://docs.microsoft.com/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
20765+
"redirect_url": "/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
2070620766
"redirect_document_id": false
2070720767
},
2070820768
{
@@ -28220,6 +28280,16 @@
2822028280
"redirect_url": "/azure/storage/common/storage-designing-ha-apps-with-ragrs",
2822128281
"redirect_document_id": true
2822228282
},
28283+
{
28284+
"source_path": "articles/storage/common/storage-designing-ha-apps-with-ragrs.md",
28285+
"redirect_url": "/azure/storage/common/geo-redundant-design",
28286+
"redirect_document_id": true
28287+
},
28288+
{
28289+
"source_path": "articles/storage/blobs/storage-simulate-failure-ragrs-account-app.md",
28290+
"redirect_url": "/azure/storage/common/simulate-primary-region-failure",
28291+
"redirect_document_id": false
28292+
},
2822328293
{
2822428294
"source_path": "articles/storage/common/storage-redundancy-lrs.md",
2822528295
"redirect_url": "/azure/storage/common/storage-redundancy",
@@ -52208,6 +52278,12 @@
5220852278
"source_path": "articles/load-balancer/azure-media-player/components-limitations.md",
5220952279
"redirect_url": "/articles/load-balancer/concepts",
5221052280
"redirect_document_id": false
52281+
},
52282+
{
52283+
"source_path": "articles/virtual-machines/troubleshooting/linux-virtual-machine-cannot-start-fstab-errors.md",
52284+
"redirect_url": "/articles/virtual-machines/troubleshooting",
52285+
"redirect_document_id": false
5221152286
}
52287+
5221252288
]
5221352289
}

articles/active-directory/hybrid/how-to-connect-fed-group-claims.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ author: billmath
1818

1919
Azure Active Directory can provide a users group membership information in tokens for use within applications. Two main patterns are supported:
2020

21-
- Groups identified by their Azure Active Directory object identifier (OID) attribute
22-
- Groups identified by sAMAccountName or GroupSID attributes for Active Directory (AD) synchronized groups and users
21+
- Groups identified by their Azure Active Directory object identifier (OID) attribute
22+
- Groups identified by sAMAccountName or GroupSID attributes for Active Directory (AD) synchronized groups and users
2323

2424
> [!IMPORTANT]
2525
> There are a number of caveats to note for this functionality:
-184 Bytes
Loading
-26.4 KB
Loading
-30.6 KB
Loading

articles/active-directory/identity-protection/howto-identity-protection-configure-notifications.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: identity-protection
88
ms.topic: conceptual
9-
ms.date: 10/18/2019
9+
ms.date: 05/05/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -47,12 +47,11 @@ Configure the users at risk email in the **Azure portal** under **Azure Active D
4747
The weekly digest email contains a summary of new risk detections.
4848
It includes:
4949

50-
- Users at risk
51-
- Suspicious activities
52-
- Detected vulnerabilities
50+
- New risky users detected
51+
- New risky sign-ins detected (in real-time)
5352
- Links to the related reports in Identity Protection
5453

55-
![Weekly digest email](./media/howto-identity-protection-configure-notifications/400.png)
54+
![Weekly digest email](./media/howto-identity-protection-configure-notifications/weekly-digest-email.png)
5655

5756
By default, recipients include all Global Admins. Global Admins can also add other Global Admins, Security Admins, Security Readers as recipients.
5857

Loading

articles/aks/faq.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Label: ```"admissions.enforcer/disabled": "true"``` or Annotation: ```"admission
113113

114114
## Is Azure Key Vault integrated with AKS?
115115

116-
AKS isn't currently natively integrated with Azure Key Vault. However, the [Azure Key Vault FlexVolume for Kubernetes project][keyvault-flexvolume] enables direct integration from Kubernetes pods to Key Vault secrets.
116+
AKS isn't currently natively integrated with Azure Key Vault. However, the [Azure Key Vault provider for CSI Secrets Store][csi-driver] enables direct integration from Kubernetes pods to Key Vault secrets.
117117

118118
## Can I run Windows Server containers on AKS?
119119

@@ -210,7 +210,6 @@ No AKS is a managed service, and manipulation of the IaaS resources is not suppo
210210
[aks-regions]: https://azure.microsoft.com/global-infrastructure/services/?products=kubernetes-service
211211
[auto-scaler]: https://github.com/kubernetes/autoscaler
212212
[cordon-drain]: https://kubernetes.io/docs/tasks/administer-cluster/safely-drain-node/
213-
[hexadite]: https://github.com/Hexadite/acs-keyvault-agent
214213
[admission-controllers]: https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/
215-
[keyvault-flexvolume]: https://github.com/Azure/kubernetes-keyvault-flexvol
216214
[private-clusters-github-issue]: https://github.com/Azure/AKS/issues/948
215+
[csi-driver]: https://github.com/Azure/secrets-store-csi-driver-provider-azure

0 commit comments

Comments
 (0)