Skip to content

Commit 48507f8

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-ga-healthcare-apis
2 parents 6787329 + 001dd31 commit 48507f8

File tree

155 files changed

+2860
-4482
lines changed

Some content is hidden

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

155 files changed

+2860
-4482
lines changed

.openpublishing.redirection.json

Lines changed: 51 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34624,11 +34624,6 @@
3462434624
"redirect_url": "/azure/cognitive-services/video-indexer/video-indexer-output-json-v2",
3462534625
"redirect_document_id": true
3462634626
},
34627-
{
34628-
"source_path": "articles/security/azure-security-disk-encryption.md",
34629-
"redirect_url": "/azure/security/azure-security-disk-encryption-overview",
34630-
"redirect_document_id": true
34631-
},
3463234627
{
3463334628
"source_path": "articles/active-directory/device-management-hybrid-azuread-joined-devices-setup.md",
3463434629
"redirect_url": "/azure/active-directory/devices/hybrid-azuread-join-manual-steps",
@@ -34923,6 +34918,56 @@
3492334918
"redirect_url": "/azure/aks/ssh",
3492434919
"redirect_document_id": true
3492534920
},
34921+
{
34922+
"source_path": "articles/security/azure-security-disk-encryption-appendix.md",
34923+
"redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
34924+
"redirect_document_id": false
34925+
},
34926+
{
34927+
"source_path": "articles/security/azure-security-disk-encryption-faq.md",
34928+
"redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
34929+
"redirect_document_id": false
34930+
},
34931+
{
34932+
"source_path": "articles/security/azure-security-disk-encryption-linux.md",
34933+
"redirect_url": "/azure/virtual-machines/linux/disk-encryption-overview",
34934+
"redirect_document_id": false
34935+
},
34936+
{
34937+
"source_path": "articles/security/azure-security-disk-encryption-linux-aad.md",
34938+
"redirect_url": "/azure/virtual-machines/linux/disk-encryption-overview-aad",
34939+
"redirect_document_id": false
34940+
},
34941+
{
34942+
"source_path": "articles/security/azure-security-disk-encryption-overview.md",
34943+
"redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
34944+
"redirect_document_id": false
34945+
},
34946+
{
34947+
"source_path": "articles/security/azure-security-disk-encryption-prerequisites.md",
34948+
"redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
34949+
"redirect_document_id": false
34950+
},
34951+
{
34952+
"source_path": "articles/security/azure-security-disk-encryption-prerequisites-aad.md",
34953+
"redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
34954+
"redirect_document_id": false
34955+
},
34956+
{
34957+
"source_path": "articles/security/azure-security-disk-encryption-tsg.md",
34958+
"redirect_url": "/azure/security/fundamentals/azure-disk-encryption-vms-vmss",
34959+
"redirect_document_id": false
34960+
},
34961+
{
34962+
"source_path": "articles/security/azure-security-disk-encryption-windows.md",
34963+
"redirect_url": "/azure/virtual-machines/linux/disk-encryption-overview",
34964+
"redirect_document_id": false
34965+
},
34966+
{
34967+
"source_path": "articles/security/azure-security-disk-encryption-windows-aad.md",
34968+
"redirect_url": "/azure/virtual-machines/linux/disk-encryption-overview-aad",
34969+
"redirect_document_id": false
34970+
},
3492634971
{
3492734972
"source_path": "articles/cognitive-services/luis/Home.md",
3492834973
"redirect_url": "/azure/cognitive-services/luis/what-is-luis",
@@ -34955,7 +35000,7 @@
3495535000
},
3495635001
{
3495735002
"source_path": "articles/security-center/security-center-disk-encryption.md",
34958-
"redirect_url": "/azure/security/azure-security-disk-encryption-overview",
35003+
"redirect_url": "/azure/security-center/security-center-apply-disk-encryption",
3495935004
"redirect_document_id": false
3496035005
},
3496135006
{

articles/active-directory-domain-services/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
href: notifications.md
6666
- name: Delete a managed domain
6767
href: delete-aadds.md
68+
- name: Migrate from a Classic deployment (preview)
69+
href: migrate-from-classic-vnet.md
6870
- name: Secure Azure AD DS
6971
items:
7072
- name: Secure your managed domain

articles/active-directory-domain-services/faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Classic virtual networks aren't supported for new deployments. Existing managed
4343
Yes. Azure AD Domain Services can be enabled in an Azure Resource Manager virtual network. Classic Azure virtual networks are no longer supported for when you create a new managed domain.
4444

4545
### Can I migrate my existing managed domain from a Classic virtual network to a Resource Manager virtual network?
46-
Not at this time. There's on-going engineering work to migrate existing managed domains from a Classic virtual network to a Resource Manager virtual network.
46+
Yes, this feature is in preview. For more information, see [Migrate Azure AD Domain Services from the Classic virtual network model to Resource Manager (preview)][migrate-from-classic-vnet.md]
4747

4848
### Can I enable Azure AD Domain Services in an Azure CSP (Cloud Solution Provider) subscription?
4949
Yes. For more information, see [how to enable Azure AD Domain Services in Azure CSP subscriptions](csp.md).
16.4 KB
Loading
16.3 KB
Loading
13.5 KB
Loading
8.31 KB
Loading
10.4 KB
Loading
7.62 KB
Loading
173 KB
Loading

0 commit comments

Comments
 (0)