diff --git a/windows/keep-secure/audit-account-lockout.md b/windows/keep-secure/audit-account-lockout.md index 4085b5a63b..edda775a9d 100644 --- a/windows/keep-secure/audit-account-lockout.md +++ b/windows/keep-secure/audit-account-lockout.md @@ -2,12 +2,8 @@ title: Audit Account Lockout (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit Account Lockout, which enables you to audit security events that are generated by a failed attempt to log on to an account that is locked out. ms.assetid: da68624b-a174-482c-9bc5-ddddab38e589 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-application-generated.md b/windows/keep-secure/audit-application-generated.md index 5ba97a5c15..a031b2592f 100644 --- a/windows/keep-secure/audit-application-generated.md +++ b/windows/keep-secure/audit-application-generated.md @@ -2,12 +2,8 @@ title: Audit Application Generated (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Application Generated, which determines whether the operating system generates audit events when applications attempt to use the Windows Auditing application programming interfaces (APIs). ms.assetid: 6c58a365-b25b-42b8-98ab-819002e31871 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-application-group-management.md b/windows/keep-secure/audit-application-group-management.md index 0deb3d5319..c4ee29610f 100644 --- a/windows/keep-secure/audit-application-group-management.md +++ b/windows/keep-secure/audit-application-group-management.md @@ -2,12 +2,8 @@ title: Audit Application Group Management (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit Application Group Management, which determines whether the operating system generates audit events when application group management tasks are performed. ms.assetid: 1bcaa41e-5027-4a86-96b7-f04eaf1c0606 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-audit-policy-change.md b/windows/keep-secure/audit-audit-policy-change.md index c29f789d2c..dca7c1278d 100644 --- a/windows/keep-secure/audit-audit-policy-change.md +++ b/windows/keep-secure/audit-audit-policy-change.md @@ -2,12 +2,8 @@ title: Audit Audit Policy Change (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Audit Policy Change, which determines whether the operating system generates audit events when changes are made to audit policy. ms.assetid: 7153bf75-6978-4d7e-a821-59a699efb8a9 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-authentication-policy-change.md b/windows/keep-secure/audit-authentication-policy-change.md index 2c23a6ded7..60d6e969e5 100644 --- a/windows/keep-secure/audit-authentication-policy-change.md +++ b/windows/keep-secure/audit-authentication-policy-change.md @@ -2,12 +2,8 @@ title: Audit Authentication Policy Change (Windows 10) description: This topic for the IT professional describes this Advanced Security Audit policy setting, Audit Authentication Policy Change, which determines whether the operating system generates audit events when changes are made to authentication policy. ms.assetid: aa9cea7a-aadf-47b7-b704-ac253b8e79be -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-authorization-policy-change.md b/windows/keep-secure/audit-authorization-policy-change.md index 6b5711357a..e12e71d60c 100644 --- a/windows/keep-secure/audit-authorization-policy-change.md +++ b/windows/keep-secure/audit-authorization-policy-change.md @@ -2,12 +2,8 @@ title: Audit Authorization Policy Change (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Authorization Policy Change, which determines whether the operating system generates audit events when specific changes are made to the authorization policy. ms.assetid: ca0587a2-a2b3-4300-aa5d-48b4553c3b36 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-central-access-policy-staging.md b/windows/keep-secure/audit-central-access-policy-staging.md index 207c079556..dba31f0402 100644 --- a/windows/keep-secure/audit-central-access-policy-staging.md +++ b/windows/keep-secure/audit-central-access-policy-staging.md @@ -2,12 +2,8 @@ title: Audit Central Access Policy Staging (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Central Access Policy Staging, which determines permissions on a Central Access Policy. ms.assetid: D9BB11CE-949A-4B48-82BF-30DC5E6FC67D -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-certification-services.md b/windows/keep-secure/audit-certification-services.md index 33ee066f97..8faf626674 100644 --- a/windows/keep-secure/audit-certification-services.md +++ b/windows/keep-secure/audit-certification-services.md @@ -2,12 +2,8 @@ title: Audit Certification Services (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Certification Services, which determines whether the operating system generates events when Active Directory Certificate Services (ADÂ CS) operations are performed. ms.assetid: cdefc34e-fb1f-4eff-b766-17713c5a1b03 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-computer-account-management.md b/windows/keep-secure/audit-computer-account-management.md index c9daef323f..5f7450d6f6 100644 --- a/windows/keep-secure/audit-computer-account-management.md +++ b/windows/keep-secure/audit-computer-account-management.md @@ -2,12 +2,8 @@ title: Audit Computer Account Management (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit Computer Account Management, which determines whether the operating system generates audit events when a computer account is created, changed, or deleted. ms.assetid: 6c406693-57bf-4411-bb6c-ff83ce548991 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-credential-validation.md b/windows/keep-secure/audit-credential-validation.md index ea6a2314ca..6b101b70a6 100644 --- a/windows/keep-secure/audit-credential-validation.md +++ b/windows/keep-secure/audit-credential-validation.md @@ -2,12 +2,8 @@ title: Audit Credential Validation (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit Credential Validation, which determines whether the operating system generates audit events on credentials that are submitted for a user account logon request. ms.assetid: 6654b33a-922e-4a43-8223-ec5086dfc926 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-detailed-file-share.md b/windows/keep-secure/audit-detailed-file-share.md index bbdf44acb2..e3bcefa79b 100644 --- a/windows/keep-secure/audit-detailed-file-share.md +++ b/windows/keep-secure/audit-detailed-file-share.md @@ -2,12 +2,8 @@ title: Audit Detailed File Share (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Detailed File Share, which allows you to audit attempts to access files and folders on a shared folder. ms.assetid: 60310104-b820-4033-a1cb-022a34f064ae -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-directory-service-access.md b/windows/keep-secure/audit-directory-service-access.md index e61d72c1ed..90f32dc571 100644 --- a/windows/keep-secure/audit-directory-service-access.md +++ b/windows/keep-secure/audit-directory-service-access.md @@ -2,12 +2,8 @@ title: Audit Directory Service Access (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit Directory Service Access, which determines whether the operating system generates audit events when an Active Directory Domain Services (ADÂ DS) object is accessed. ms.assetid: ba2562ba-4282-4588-b87c-a3fcb771c7d0 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-directory-service-changes.md b/windows/keep-secure/audit-directory-service-changes.md index a0257170d5..681d62c3bd 100644 --- a/windows/keep-secure/audit-directory-service-changes.md +++ b/windows/keep-secure/audit-directory-service-changes.md @@ -2,12 +2,8 @@ title: Audit Directory Service Changes (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit Directory Service Changes, which determines whether the operating system generates audit events when changes are made to objects in Active Directory Domain Services (ADÂ DS). ms.assetid: 9f7c0dd4-3977-47dd-a0fb-ec2f17cad05e -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-directory-service-replication.md b/windows/keep-secure/audit-directory-service-replication.md index d84bf022c9..9852d81d51 100644 --- a/windows/keep-secure/audit-directory-service-replication.md +++ b/windows/keep-secure/audit-directory-service-replication.md @@ -2,12 +2,8 @@ title: Audit Directory Service Replication (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit Directory Service Replication, which determines whether the operating system generates audit events when replication between two domain controllers begins and ends. ms.assetid: b95d296c-7993-4e8d-8064-a8bbe284bd56 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-distribution-group-management.md b/windows/keep-secure/audit-distribution-group-management.md index 13404964d7..a8818d7fbe 100644 --- a/windows/keep-secure/audit-distribution-group-management.md +++ b/windows/keep-secure/audit-distribution-group-management.md @@ -2,12 +2,8 @@ title: Audit Distribution Group Management (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Distribution Group Management, which determines whether the operating system generates audit events for specific distribution-group management tasks. ms.assetid: d46693a4-5887-4a58-85db-2f6cba224a66 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-dpapi-activity.md b/windows/keep-secure/audit-dpapi-activity.md index 4c66459ce0..c7c323e5a3 100644 --- a/windows/keep-secure/audit-dpapi-activity.md +++ b/windows/keep-secure/audit-dpapi-activity.md @@ -2,12 +2,8 @@ title: Audit DPAPI Activity (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit DPAPI Activity, which determines whether the operating system generates audit events when encryption or decryption calls are made into the data protection application interface (DPAPI). ms.assetid: be4d4c83-c857-4e3d-a84e-8bcc3f2c99cd -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-file-share.md b/windows/keep-secure/audit-file-share.md index 6005f92a3e..2e3b971917 100644 --- a/windows/keep-secure/audit-file-share.md +++ b/windows/keep-secure/audit-file-share.md @@ -2,12 +2,8 @@ title: Audit File Share (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit File Share, which determines whether the operating system generates audit events when a file share is accessed. ms.assetid: 9ea985f8-8936-4b79-abdb-35cbb7138f78 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-file-system.md b/windows/keep-secure/audit-file-system.md index 55cac2e347..c2067f4580 100644 --- a/windows/keep-secure/audit-file-system.md +++ b/windows/keep-secure/audit-file-system.md @@ -2,12 +2,8 @@ title: Audit File System (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit File System, which determines whether the operating system generates audit events when users attempt to access file system objects. ms.assetid: 6a71f283-b8e5-41ac-b348-0b7ec6ea0b1f -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-filtering-platform-connection.md b/windows/keep-secure/audit-filtering-platform-connection.md index d284284a07..e07ed53034 100644 --- a/windows/keep-secure/audit-filtering-platform-connection.md +++ b/windows/keep-secure/audit-filtering-platform-connection.md @@ -2,12 +2,8 @@ title: Audit Filtering Platform Connection (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Filtering Platform Connection, which determines whether the operating system generates audit events when connections are allowed or blocked by the Windows Filtering Platform. ms.assetid: d72936e9-ff01-4d18-b864-a4958815df59 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-filtering-platform-packet-drop.md b/windows/keep-secure/audit-filtering-platform-packet-drop.md index 033b1048e4..2f1d92d144 100644 --- a/windows/keep-secure/audit-filtering-platform-packet-drop.md +++ b/windows/keep-secure/audit-filtering-platform-packet-drop.md @@ -2,12 +2,8 @@ title: Audit Filtering Platform Packet Drop (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Filtering Platform Packet Drop, which determines whether the operating system generates audit events when packets are dropped by the Windows Filtering Platform. ms.assetid: 95457601-68d1-4385-af20-87916ddab906 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-filtering-platform-policy-change.md b/windows/keep-secure/audit-filtering-platform-policy-change.md index 8035115b4a..c6b29136a8 100644 --- a/windows/keep-secure/audit-filtering-platform-policy-change.md +++ b/windows/keep-secure/audit-filtering-platform-policy-change.md @@ -2,12 +2,8 @@ title: Audit Filtering Platform Policy Change (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Filtering Platform Policy Change, which determines whether the operating system generates audit events for certain IPsec and Windows Filtering Platform actions. ms.assetid: 0eaf1c56-672b-4ea9-825a-22dc03eb4041 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-group-membership.md b/windows/keep-secure/audit-group-membership.md index 9a770e3e95..2fbda5d3b5 100644 --- a/windows/keep-secure/audit-group-membership.md +++ b/windows/keep-secure/audit-group-membership.md @@ -2,12 +2,8 @@ title: Audit Group Membership (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit Group Membership, which enables you to audit group memberships when they are enumerated on the client PC. ms.assetid: 1CD7B014-FBD9-44B9-9274-CC5715DE58B9 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-handle-manipulation.md b/windows/keep-secure/audit-handle-manipulation.md index 54bcdc2d64..5cff0de163 100644 --- a/windows/keep-secure/audit-handle-manipulation.md +++ b/windows/keep-secure/audit-handle-manipulation.md @@ -2,12 +2,8 @@ title: Audit Handle Manipulation (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Handle Manipulation, which determines whether the operating system generates audit events when a handle to an object is opened or closed. ms.assetid: 1fbb004a-ccdc-4c80-b3da-a4aa7a9f4091 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-ipsec-driver.md b/windows/keep-secure/audit-ipsec-driver.md index 8125b82896..8816a8e2ba 100644 --- a/windows/keep-secure/audit-ipsec-driver.md +++ b/windows/keep-secure/audit-ipsec-driver.md @@ -2,12 +2,8 @@ title: Audit IPsec Driver (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit IPsec Driver, which determines whether the operating system generates audit events for the activities of the IPsec driver. ms.assetid: c8b8c02f-5ad0-4ee5-9123-ea8cdae356a5 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-ipsec-extended-mode.md b/windows/keep-secure/audit-ipsec-extended-mode.md index cf9bd5a83c..7220d5ead8 100644 --- a/windows/keep-secure/audit-ipsec-extended-mode.md +++ b/windows/keep-secure/audit-ipsec-extended-mode.md @@ -2,12 +2,8 @@ title: Audit IPsec Extended Mode (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit IPsec Extended Mode, which determines whether the operating system generates audit events for the results of the Internet Key Exchange (IKE) protocol and Authenticated Internet Protocol (AuthIP) during Extended Mode negotiations. ms.assetid: 2b4fee9e-482a-4181-88a8-6a79d8fc8049 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-ipsec-main-mode.md b/windows/keep-secure/audit-ipsec-main-mode.md index 1af0eed70b..4d9716ac60 100644 --- a/windows/keep-secure/audit-ipsec-main-mode.md +++ b/windows/keep-secure/audit-ipsec-main-mode.md @@ -2,12 +2,8 @@ title: Audit IPsec Main Mode (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit IPsec Main Mode, which determines whether the operating system generates events for the results of the Internet Key Exchange (IKE) protocol and Authenticated Internet Protocol (AuthIP) during Main Mode negotiations. ms.assetid: 06ed26ec-3620-4ef4-a47a-c70df9c8827b -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-ipsec-quick-mode.md b/windows/keep-secure/audit-ipsec-quick-mode.md index 71f1afee93..a6ce77cdf4 100644 --- a/windows/keep-secure/audit-ipsec-quick-mode.md +++ b/windows/keep-secure/audit-ipsec-quick-mode.md @@ -2,12 +2,8 @@ title: Audit IPsec Quick Mode (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit IPsec Quick Mode, which determines whether the operating system generates audit events for the results of the Internet Key Exchange (IKE) protocol and Authenticated Internet Protocol (AuthIP) during Quick Mode negotiations. ms.assetid: 7be67a15-c2ce-496a-9719-e25ac7699114 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-kerberos-authentication-service.md b/windows/keep-secure/audit-kerberos-authentication-service.md index 7d2af0f81d..b0e5ccc886 100644 --- a/windows/keep-secure/audit-kerberos-authentication-service.md +++ b/windows/keep-secure/audit-kerberos-authentication-service.md @@ -2,12 +2,8 @@ title: Audit Kerberos Authentication Service (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Kerberos Authentication Service, which determines whether to generate audit events for Kerberos authentication ticket-granting ticket (TGT) requests. ms.assetid: 990dd6d9-1a1f-4cce-97ba-5d7e0a7db859 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-kerberos-service-ticket-operations.md b/windows/keep-secure/audit-kerberos-service-ticket-operations.md index 5fbdfa66fe..0a45922c00 100644 --- a/windows/keep-secure/audit-kerberos-service-ticket-operations.md +++ b/windows/keep-secure/audit-kerberos-service-ticket-operations.md @@ -2,12 +2,8 @@ title: Audit Kerberos Service Ticket Operations (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Kerberos Service Ticket Operations, which determines whether the operating system generates security audit events for Kerberos service ticket requests. ms.assetid: ddc0abef-ac7f-4849-b90d-66700470ccd6 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-kernel-object.md b/windows/keep-secure/audit-kernel-object.md index e8928abb49..80a0b5e30f 100644 --- a/windows/keep-secure/audit-kernel-object.md +++ b/windows/keep-secure/audit-kernel-object.md @@ -2,12 +2,8 @@ title: Audit Kernel Object (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Kernel Object, which determines whether the operating system generates audit events when users attempt to access the system kernel, which includes mutexes and semaphores. ms.assetid: 75619d8b-b1eb-445b-afc9-0f9053be97fb -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-logoff.md b/windows/keep-secure/audit-logoff.md index 81be31807c..66730b6282 100644 --- a/windows/keep-secure/audit-logoff.md +++ b/windows/keep-secure/audit-logoff.md @@ -2,12 +2,8 @@ title: Audit Logoff (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Logoff, which determines whether the operating system generates audit events when logon sessions are terminated. ms.assetid: 681e51f2-ba06-46f5-af8c-d9c48d515432 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-logon.md b/windows/keep-secure/audit-logon.md index f7ff28f320..194c1f3d0b 100644 --- a/windows/keep-secure/audit-logon.md +++ b/windows/keep-secure/audit-logon.md @@ -2,12 +2,8 @@ title: Audit Logon (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Logon, which determines whether the operating system generates audit events when a user attempts to log on to a computer. ms.assetid: ca968d03-7d52-48c4-ba0e-2bcd2937231b -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-mpssvc-rule-level-policy-change.md b/windows/keep-secure/audit-mpssvc-rule-level-policy-change.md index 83a72a4045..e7eb1410f4 100644 --- a/windows/keep-secure/audit-mpssvc-rule-level-policy-change.md +++ b/windows/keep-secure/audit-mpssvc-rule-level-policy-change.md @@ -2,12 +2,8 @@ title: Audit MPSSVC Rule-Level Policy Change (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit MPSSVC Rule-Level Policy Change, which determines whether the operating system generates audit events when changes are made to policy rules for the Microsoft Protection Service (MPSSVC.exe). ms.assetid: 263461b3-c61c-4ec3-9dee-851164845019 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-network-policy-server.md b/windows/keep-secure/audit-network-policy-server.md index 859c030a3a..c053aab03a 100644 --- a/windows/keep-secure/audit-network-policy-server.md +++ b/windows/keep-secure/audit-network-policy-server.md @@ -2,12 +2,8 @@ title: Audit Network Policy Server (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Network Policy Server, which determines whether the operating system generates audit events for RADIUS (IAS) and Network Access Protection (NAP) activity on user access requests (Grant, Deny, Discard, Quarantine, Lock, and Unlock). ms.assetid: 43b2aea4-26df-46da-b761-2b30f51a80f7 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-non-sensitive-privilege-use.md b/windows/keep-secure/audit-non-sensitive-privilege-use.md index b787a4a0a1..a6052e4d5d 100644 --- a/windows/keep-secure/audit-non-sensitive-privilege-use.md +++ b/windows/keep-secure/audit-non-sensitive-privilege-use.md @@ -2,12 +2,8 @@ title: Audit Non Sensitive Privilege Use (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Non-Sensitive Privilege Use, which determines whether the operating system generates audit events when non-sensitive privileges (user rights) are used. ms.assetid: 8fd74783-1059-443e-aa86-566d78606627 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-other-account-logon-events.md b/windows/keep-secure/audit-other-account-logon-events.md index 68e947de07..ee92107d00 100644 --- a/windows/keep-secure/audit-other-account-logon-events.md +++ b/windows/keep-secure/audit-other-account-logon-events.md @@ -2,12 +2,8 @@ title: Audit Other Account Logon Events (Windows 10) description: This topic for the IT professional describes the advanced security audit policy setting, Audit Other Account Logon Events, which allows you to audit events generated by responses to credential requests submitted for a user account logon that are not credential validation or Kerberos tickets. ms.assetid: c8c6bfe0-33d2-4600-bb1a-6afa840d75b3 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-other-account-management-events.md b/windows/keep-secure/audit-other-account-management-events.md index fd359417f7..bce48fe3a4 100644 --- a/windows/keep-secure/audit-other-account-management-events.md +++ b/windows/keep-secure/audit-other-account-management-events.md @@ -2,12 +2,8 @@ title: Audit Other Account Management Events (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Other Account Management Events, which determines whether the operating system generates user account management audit events. ms.assetid: 4ce22eeb-a96f-4cf9-a46d-6642961a31d5 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh diff --git a/windows/keep-secure/audit-other-logonlogoff-events.md b/windows/keep-secure/audit-other-logonlogoff-events.md index b8119d7835..da62c1ddac 100644 --- a/windows/keep-secure/audit-other-logonlogoff-events.md +++ b/windows/keep-secure/audit-other-logonlogoff-events.md @@ -2,12 +2,8 @@ title: Audit Other Logon/Logoff Events (Windows 10) description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Other Logon/Logoff Events, which determines whether Windows generates audit events for other logon or logoff events. ms.assetid: 76d987cd-1917-4907-a739-dd642609a458 -<<<<<<< HEAD -ms.prod: w10 -======= ms.pagetype: security ms.prod: W10 ->>>>>>> secaudit ms.mktglfcycl: deploy ms.sitesec: library author: Mir0sh