Skip to content

Commit 53d6b7e

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into privlnkvnetupd
commit
2 parents 9860183 + e2b07e8 commit 53d6b7e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

articles/active-directory/manage-apps/application-proxy-configure-custom-domain.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ There's no restriction on the certificate signature methods. Elliptic Curve Cryp
127127

128128
You can use wildcard certificates as long as the wildcard matches the external URL. You must use wildcard certificates for [wildcard applications](application-proxy-wildcard.md). If you want to use the certificate to also access subdomains, you must add the subdomain wildcards as subject alternative names in the same certificate. For example, a certificate for *\*.adventure-works.com* won't work for *\*.apps.adventure-works.com* unless you add *\*.apps.adventure-works.com* as a subject alternative name.
129129

130-
You can use certificates issued by your own public key infrastructure (PKI) if the certificate chain is installed on your client devices. Intune can deploy these certificates to managed devices. For non-managed devices, you must manually install these certificates.
130+
You can use certificates issued by your own public key infrastructure (PKI) if the certificate chain is installed on your client devices. Intune can deploy these certificates to managed devices. For non-managed devices, you must manually install these certificates.
131131

132-
It's not a good idea to use a private root CA. The private root CA would also need to be pushed to client machines, which introduces many challenges.
132+
We do not recommend using a private root CA since the private root CA would also need to be pushed to client machines, which may introduce many challenges.
133133

134134
### Certificate management
135135

articles/virtual-desktop/store-fslogix-profile.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The following tables compare the storage solutions Azure Storage offers for Wind
2121

2222
|Features|Azure Files|Azure NetApp Files|Storage Spaces Direct|
2323
|--------|-----------|------------------|---------------------|
24+
|Use case|General purpose|Ultra performance or migration from NetApp on-premises|Cross-platform|
2425
|Platform service|Yes, Azure-native solution|Yes, Azure-native solution|No, self-managed|
2526
|Regional availability|All regions|[Select regions](https://azure.microsoft.com/global-infrastructure/services/?products=netapp&regions=all)|All regions|
2627
|Redundancy|Locally redundant/zone-redundant/geo-redundant|Locally redundant|Locally redundant/zone-redundant/geo-redundant|
@@ -36,7 +37,7 @@ The following tables compare the storage solutions Azure Storage offers for Wind
3637
|Access|Cloud, on-premises and hybrid (Azure file sync)|Cloud, on-premises (via ExpressRoute)|Cloud, on-premises|
3738
|Backup|Azure backup snapshot integration|Azure NetApp Files snapshots|Azure backup snapshot integration|
3839
|Security and compliance|[All Azure supported certificates](https://www.microsoft.com/trustcenter/compliance/complianceofferings)|ISO completed|[All Azure supported certificates](https://www.microsoft.com/trustcenter/compliance/complianceofferings)|
39-
|Azure Active Directory integration|Azure Active Directory and Azure Active Directory Domain Services|[Azure Active Directory Domain Services and Native Active Directory](../azure-netapp-files/azure-netapp-files-faqs.md#does-azure-netapp-files-support-azure-active-directory)|Native Active Directory or Azure Active Directory Domain Services support only|
40+
|Azure Active Directory integration|[Native Active Directory and Azure Active Directory Domain Services](https://docs.microsoft.com/azure/storage/files/storage-files-active-directory-overview)|[Azure Active Directory Domain Services and Native Active Directory](../azure-netapp-files/azure-netapp-files-faqs.md#does-azure-netapp-files-support-azure-active-directory)|Native Active Directory or Azure Active Directory Domain Services support only|
4041

4142
Once you've chosen your storage method, check out [Windows Virtual Desktop pricing](https://azure.microsoft.com/pricing/details/virtual-desktop/) for information about our pricing plans.
4243

0 commit comments

Comments
 (0)