moved files

windows/security/docfx.json

@@ -71,11 +71,11 @@
     "fileMetadata": {
       "author":{
         "identity-protection/**/*.md": "paolomatarazzo",
-        "threat-protection/windows-firewall/**/*.md": "aczechowski"
+        "operating-system-security/network-security/windows-firewall/**/*.md": "aczechowski"
       },
       "ms.author":{
         "identity-protection/**/*.md": "paoloma",
-        "threat-protection/windows-firewall/*.md": "aaroncz"
+        "operating-system-security/network-security/windows-firewall/*.md": "nganguly"
       },
       "appliesto":{
         "identity-protection/**/*.md": [
@@ -115,8 +115,8 @@
         "identity-protection/hello-for-business/*.md": "erikdau",
         "identity-protection/credential-guard/*.md": "zwhittington",
         "identity-protection/access-control/*.md": "sulahiri",
-        "threat-protection/windows-firewall/*.md": "paoloma",
-        "identity-protection/vpn/*.md": "pesmith"
+        "operating-system-security/network-security/windows-firewall/*.md": "paoloma",
+        "operating-system-security/network-security/vpn/*.md": "pesmith"
       },
       "ms.collection":{
         "identity-protection/hello-for-business/*.md": "tier1",
@@ -126,7 +126,7 @@
         "information-protection/tpm/*.md": "tier1",
         "threat-protection/auditing/*.md": "tier3",
         "threat-protection/windows-defender-application-control/*.md": "tier3",
-        "threat-protection/windows-firewall/*.md": "tier3"
+        "operating-system-security/network-security/windows-firewall/*.md": "tier3"
       }
     },
     "template": [],

windows/security/identity-protection/user-account-control/user-account-control-overview.md

@@ -1,14 +1,14 @@
 ---
-title: User Account Control (Windows)
-description: User Account Control (UAC) helps prevent malware from damaging a PC and helps organizations deploy a better-managed desktop.
+title: User Account Control overview
+description: Learn about User Account Control (UAC) and how it helps preventing malware from damaging a device and helps organizations deploy a better-managed desktop.
 ms.collection: 
   - highpri
   - tier2
-ms.topic: article
-ms.date: 09/24/2011
+ms.topic: conceptual
+ms.date: 05/18/2023
 ---
 
-# User Account Control
+# User Account Control overview
 
 User Account Control (UAC) helps prevent malware from damaging a PC and helps organizations deploy a better-managed desktop. With UAC, apps and tasks always run in the security context of a non-administrator account, unless an administrator specifically authorizes administrator-level access to the system. UAC can block the automatic installation of unauthorized apps and prevent inadvertent changes to system settings.
 
@@ -24,8 +24,9 @@ When an app needs to run with more than standard user rights, UAC allows users t
 
 Admin Approval Mode in UAC helps prevent malware from silently installing without an administrator's knowledge. It also helps protect from inadvertent system-wide changes. Lastly, it can be used to enforce a higher level of compliance where administrators must actively consent or provide credentials for each administrative process.
 
+## Next steps
 
-## In this section
+Learn more about UAC and how to configure it for your organization.
 
 | Topic | Description |
 | - | - |
@@ -33,5 +34,3 @@ Admin Approval Mode in UAC helps prevent malware from silently installing withou
 | [User Account Control security policy settings](user-account-control-security-policy-settings.md) | You can use security policies to configure how User Account Control works in your organization. They can be configured locally by using the Local Security Policy snap-in (secpol.msc) or configured for the domain, OU, or specific groups by Group Policy. |
 | [User Account Control Group Policy and registry key settings](user-account-control-group-policy-and-registry-key-settings.md) | Here's a list of UAC  Group Policy and registry key settings that your organization can use to manage UAC. |
  
-
-

windows/security/operating-system-security/network-security/toc.yml

@@ -3,33 +3,33 @@ items:
   href: /windows-server/security/tls/tls-ssl-schannel-ssp-overview
 - name: WiFi Security
   href: https://support.microsoft.com/windows/faster-and-more-secure-wi-fi-in-windows-26177a28-38ed-1a8e-7eca-66f24dc63f09
-- name: Windows Firewall
-  href: ../../threat-protection/windows-firewall/windows-firewall-with-advanced-security.md
+- name: Windows Firewall 🔗
+  href: /windows-firewall/windows-firewall-with-advanced-security.md
 - name: Virtual Private Network (VPN)
-  href: ../../identity-protection/vpn/vpn-guide.md
+  href: /vpn/vpn-guide.md
   items:
   - name: VPN connection types
-    href: ../../identity-protection/vpn/vpn-connection-type.md
+    href: /vpn/vpn-connection-type.md
   - name: VPN routing decisions
-    href: ../../identity-protection/vpn/vpn-routing.md
+    href: /vpn/vpn-routing.md
   - name: VPN authentication options
-    href: ../../identity-protection/vpn/vpn-authentication.md
+    href: /vpn/vpn-authentication.md
   - name: VPN and conditional access
-    href: ../../identity-protection/vpn/vpn-conditional-access.md
+    href: /vpn/vpn-conditional-access.md
   - name: VPN name resolution
-    href: ../../identity-protection/vpn/vpn-name-resolution.md
+    href: /vpn/vpn-name-resolution.md
   - name: VPN auto-triggered profile options
-    href: ../../identity-protection/vpn/vpn-auto-trigger-profile.md
+    href: /vpn/vpn-auto-trigger-profile.md
   - name: VPN security features
-    href: ../../identity-protection/vpn/vpn-security-features.md
+    href: /vpn/vpn-security-features.md
   - name: VPN profile options
-    href: ../../identity-protection/vpn/vpn-profile-options.md
+    href: /vpn/vpn-profile-options.md
   - name: How to configure Diffie Hellman protocol over IKEv2 VPN connections
-    href: ../../identity-protection/vpn/how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md
+    href: /vpn/how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md
   - name: How to use single sign-on (SSO) over VPN and Wi-Fi connections
-    href: ../../identity-protection/vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md
+    href: /vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md
   - name: Optimizing Office 365 traffic with the Windows VPN client
-    href: ../../identity-protection/vpn/vpn-office-365-optimization.md
+    href: /vpn/vpn-office-365-optimization.md
 - name: Always On VPN
   href: /windows-server/remote/remote-access/vpn/always-on-vpn/
 - name: Direct Access

windows/security/operating-system-security/network-security/windows-firewall/TOC.yml

@@ -1,4 +1,4 @@
-- name: Windows Firewall with Advanced Security
+- name: Overview
   href: windows-firewall-with-advanced-security.md
   items: 
     - name: Plan deployment