Merge branch 'master' of https://github.com/microsoft/azure-docs-pr into dawesl-qf-use-portal-june1

Dan Wesley · Dan Wesley · commit 65c4bafe3be7 · 2018-06-01T11:06:16.000-07:00
diff --git a/articles/active-directory/active-directory-conditional-access-best-practices.md b/articles/active-directory/active-directory-conditional-access-best-practices.md
@@ -10,6 +10,7 @@ editor: ''
 
 ms.assetid: 8c1d978f-e80b-420e-853a-8bbddc4bcdad
 ms.service: active-directory
+ms.component: protection
 ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
diff --git a/articles/active-directory/active-directory-conditional-access-conditions.md b/articles/active-directory/active-directory-conditional-access-conditions.md
@@ -10,6 +10,7 @@ editor: ''
 
 ms.assetid: 8c1d978f-e80b-420e-853a-8bbddc4bcdad
 ms.service: active-directory
+ms.component: protection
 ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
diff --git a/articles/active-directory/active-directory-conditional-access-controls.md b/articles/active-directory/active-directory-conditional-access-controls.md
@@ -10,6 +10,7 @@ editor: ''
 
 ms.assetid: 8c1d978f-e80b-420e-853a-8bbddc4bcdad
 ms.service: active-directory
+ms.component: protection
 ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
diff --git a/articles/active-directory/active-directory-conditional-access-device-policies.md b/articles/active-directory/active-directory-conditional-access-device-policies.md
@@ -9,6 +9,7 @@ editor: ''
 
 ms.assetid: 8664c0bb-bba1-4012-b321-e9c8363080a0
 ms.service: active-directory
+ms.component: protection
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
diff --git a/articles/active-directory/active-directory-conditional-access-device-remediation.md b/articles/active-directory/active-directory-conditional-access-device-remediation.md
@@ -9,6 +9,7 @@ manager: mtillman
 
 ms.assetid: 8ad0156c-0812-4855-8563-6fbff6194174
 ms.service: active-directory
+ms.component: protection
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
diff --git a/articles/active-directory/active-directory-conditional-access-locations.md b/articles/active-directory/active-directory-conditional-access-locations.md
@@ -10,6 +10,7 @@ editor: ''
 
 ms.assetid: 8c1d978f-e80b-420e-853a-8bbddc4bcdad
 ms.service: active-directory
+ms.component: protection
 ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
diff --git a/articles/active-directory/active-directory-conditional-access-mam.md b/articles/active-directory/active-directory-conditional-access-mam.md
@@ -10,6 +10,7 @@ editor: ''
 
 ms.assetid: 8c1d978f-e80b-420e-853a-8bbddc4bcdad
 ms.service: active-directory
+ms.component: protection
 ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
