diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index 52d9c0b701..b359a5d989 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -19447,7 +19447,7 @@ }, { "source_path": "windows/security/threat-protection/intelligence/supply-chain-malware.md", - "redirect_url": "/microsoft-365/security/intelligence/supply-chain-malware.md", + "redirect_url": "/microsoft-365/security/intelligence/supply-chain-malware", "redirect_document_id": false }, { @@ -19494,6 +19494,21 @@ "source_path": "windows/deployment/update/waas-microsoft-connected-cache.md", "redirect_url": "/windows/deployment/do/waas-microsoft-connected-cache", "redirect_document_id": false - } + }, + { + "source_path": "windows/education/itadmins.yml", + "redirect_url": "/education/", + "redirect_document_id": true + }, + { + "source_path": "windows/education/partners.yml", + "redirect_url": "/education/", + "redirect_document_id": true + }, + { + "source_path": "windows/education/developers.yml", + "redirect_url": "/education/", + "redirect_document_id": true + } ] } \ No newline at end of file diff --git a/education/developers.yml b/education/developers.yml deleted file mode 100644 index 5b67147739..0000000000 --- a/education/developers.yml +++ /dev/null @@ -1,33 +0,0 @@ -### YamlMime:Hub - -title: Microsoft 365 Education Documentation for developers -summary: Are you an app developer looking for information about developing solutions on Microsoft Education products? Start here. - -metadata: - title: Microsoft 365 Education Documentation for developers - description: Are you an app developer looking for information about developing solutions on Microsoft Education products? Start here. - ms.service: help - ms.topic: hub-page - author: LaurenMoynihan - ms.author: v-lamoyn - ms.date: 10/24/2019 - -additionalContent: - sections: - - items: - # Card - - title: UWP apps for education - summary: Learn how to write universal apps for education. - url: /windows/uwp/apps-for-education/ - # Card - - title: Take a test API - summary: Learn how web applications can use the API to provide a locked down experience for taking tests. - url: /windows/uwp/apps-for-education/take-a-test-api - # Card - - title: Office Education Dev center - summary: Integrate with Office 365 across devices and services to extend Microsoft enterprise-scale compliance and security to students, teachers, and staff in your education app - url: https://developer.microsoft.com/office/edu - # Card - - title: Data Streamer - summary: Bring new STEM experiences into the classroom with real-time data in Excel using Data Streamer. Data Streamer can send data to Excel from a sensor or application. - url: /microsoft-365/education/data-streamer \ No newline at end of file diff --git a/education/index.yml b/education/index.yml index 80796a921a..26aa73e3a7 100644 --- a/education/index.yml +++ b/education/index.yml @@ -2,6 +2,8 @@ title: Microsoft 365 Education Documentation summary: Microsoft 365 Education empowers educators to unlock creativity, promote teamwork, and provide a simple and safe experience in a single, affordable solution built for education. +# brand: aspnet | azure | dotnet | dynamics | m365 | ms-graph | office | power-apps | power-automate | power-bi | power-platform | power-virtual-agents | sql | sql-server | vs | visual-studio | windows | xamarin +brand: m365 metadata: title: Microsoft 365 Education Documentation @@ -13,23 +15,112 @@ metadata: ms.date: 10/24/2019 productDirectory: + title: For IT admins + summary: This guide is designed for IT admins looking for the simplest way to move their platform to the cloud. It does not capture all the necessary steps for large scale or complex deployments. items: # Card - - title: IT Admins - # imageSrc should be square in ratio with no whitespace - imageSrc: ./images/EDUAdmins.svg - links: - - url: itadmins.yml - text: Get started with deploying and managing a full cloud IT solution for your school. + - title: Phase 1 - Cloud deployment + imageSrc: ./images/EDU-Deploy.svg + summary: Create your Microsoft 365 tenant, secure and configure your environment, sync your active directry and SIS, and license users. + url: /microsoft-365/education/deploy/create-your-office-365-tenant # Card - - title: Developers - imageSrc: ./images/EDUDevelopers.svg - links: - - url: developers.yml - text: Looking for information about developing solutions on Microsoft Education products? Start here. + - title: Phase 2 - Device management + imageSrc: ./images/EDU-Device-Mgmt.svg + summary: Get started with Windows for Education, set up and enroll devices in Intune. + url: /microsoft-365/education/deploy/set-up-windows-10-education-devices # Card - - title: Partners - imageSrc: ./images/EDUPartners.svg + - title: Phase 3 - Apps management + imageSrc: ./images/EDU-Apps-Mgmt.svg + summary: Configure admin settings, set up Teams for Education, install apps and install Minecraft. + url: /microsoft-365/education/deploy/configure-admin-settings + # Card + - title: Phase 4 - Complete your deployment + # imageSrc should be square in ratio with no whitespace + imageSrc: ./images/EDU-Tasks.svg + summary: Configure settings for Exchange and SharePoint. + url: /microsoft-365/education/deploy/deploy-exchange-online + # Card + - title: Security & compliance + imageSrc: ./images/EDU-Lockbox.svg links: - - url: partners.yml - text: Looking for resources available to Microsoft Education partners? Start here. \ No newline at end of file + - url: /azure/active-directory/fundamentals/active-directory-deployment-checklist-p2 + text: AAD feature deployment guide + - url: https://techcommunity.microsoft.com/t5/Azure-Information-Protection/Azure-Information-Protection-Deployment-Acceleration-Guide/ba-p/334423 + text: Azure information protection deployment acceleration guide + - url: /cloud-app-security/getting-started-with-cloud-app-security + text: Microsoft Defender for Cloud Apps + - url: /microsoft-365/compliance/create-test-tune-dlp-policy + text: Data loss prevention + - url: /microsoft-365/compliance/ + text: Microsoft 365 Compliance + - url: https://social.technet.microsoft.com/wiki/contents/articles/35748.office-365-what-is-customer-lockbox-and-how-to-enable-it.aspx + text: Deploying Lockbox + # Card + - title: Analytics & insights + imageSrc: ./images/EDU-Education.svg + links: + - url: /power-bi/service-admin-administering-power-bi-in-your-organization + text: Power BI for IT admins + - url: /dynamics365/#pivot=get-started + text: Dynamics 365 + # Card + - title: Find deployment help and other support resources + imageSrc: ./images/EDU-Teachers.svg + links: + - url: /microsoft-365/education/deploy/find-deployment-help + text: IT admin help + - url: https://social.technet.microsoft.com/forums/en-us/home + text: TechNet + - url: https://support.office.com/en-us/education + text: Education help center + - url: https://support.office.com/en-us/article/teacher-training-packs-7a9ee74a-8fe5-43d3-bc23-a55185896921 + text: Teacher training packs + # Card + - title: Check out our education journey + imageSrc: ./images/EDU-ITJourney.svg + links: + - url: https://edujourney.microsoft.com/k-12/ + text: K-12 + - url: https://edujourney.microsoft.com/hed/ + text: Higher education + +additionalContent: + sections: + - title: For developers # < 60 chars (optional) + summary: Are you an app developer looking for information about developing solutions on Microsoft Education products? Start here. # < 160 chars (optional) + - items: + # Card + - title: UWP apps for education + summary: Learn how to write universal apps for education. + url: /windows/uwp/apps-for-education/ + # Card + - title: Take a test API + summary: Learn how web applications can use the API to provide a locked down experience for taking tests. + url: /windows/uwp/apps-for-education/take-a-test-api + # Card + - title: Office Education Dev center + summary: Integrate with Office 365 across devices and services to extend Microsoft enterprise-scale compliance and security to students, teachers, and staff in your education app + url: https://developer.microsoft.com/office/edu + # Card + - title: Data Streamer + summary: Bring new STEM experiences into the classroom with real-time data in Excel using Data Streamer. Data Streamer can send data to Excel from a sensor or application. + url: /microsoft-365/education/data-streamer + - title: For partners # < 60 chars (optional) + summary: Looking for resources available to Microsoft Education partners? Start here. # < 160 chars (optional) + - items: + # Card + - title: Microsoft Partner Network + summary: Discover the latest news and resources for Microsoft Education products, solutions, licensing and readiness. + url: https://partner.microsoft.com/solutions/education + # Card + - title: Authorized Education Partner (AEP) program + summary: Become authorized to purchase and resell academic priced offers and products to Qualified Educational Users (QEUs). + url: https://www.mepn.com/ + # Card + - title: Authorized Education Partner Directory + summary: Search through the list of Authorized Education Partners worldwide who can deliver on customer licensing requirements, and provide solutions and services to current and future school needs. + url: https://www.mepn.com/MEPN/AEPSearch.aspx + # Card + - title: Education Partner community Yammer group + summary: Sign in with your Microsoft Partner account and join the Education Partner community private group on Yammer. + url: https://www.yammer.com/mepn/ \ No newline at end of file diff --git a/education/itadmins.yml b/education/itadmins.yml deleted file mode 100644 index 2847e59b71..0000000000 --- a/education/itadmins.yml +++ /dev/null @@ -1,120 +0,0 @@ -### YamlMime:Hub - -title: Microsoft 365 Education Documentation for IT admins -summary: Microsoft 365 Education consists of Office 365 Education, Windows 10 Education, and security and management tools such as Intune for Education and School Data Sync. - -metadata: - title: Microsoft 365 Education Documentation for IT admins - description: M365 Education consists of Office 365 Education, Windows 10 Education, and security and management tools such as Intune for Education and School Data Sync. - ms.service: help - ms.topic: hub-page - author: LaurenMoynihan - ms.author: v-lamoyn - ms.date: 10/24/2019 - -productDirectory: - summary: This guide is designed for IT admins looking for the simplest way to move their platform to the cloud. It does not capture all the necessary steps for large scale or complex deployments. - items: - # Card - - title: Phase 1 - Cloud deployment - imageSrc: ./images/EDU-Deploy.svg - links: - - url: /microsoft-365/education/deploy/create-your-office-365-tenant - text: 1. Create your Office 365 tenant - - url: /microsoft-365/education/deploy/secure-and-configure-your-network - text: 2. Secure and configure your network - - url: /microsoft-365/education/deploy/aad-connect-and-adfs - text: 3. Sync your active directory - - url: /microsoft-365/education/deploy/school-data-sync - text: 4. Sync you SIS using School Data Sync - - url: /microsoft-365/education/deploy/license-users - text: 5. License users - # Card - - title: Phase 2 - Device management - imageSrc: ./images/EDU-Device-Mgmt.svg - links: - - url: ./windows/index.md - text: 1. Get started with Windows 10 for Education - - url: /microsoft-365/education/deploy/set-up-windows-10-education-devices - text: 2. Set up Windows 10 devices - - url: /microsoft-365/education/deploy/intune-for-education - text: 3. Get started with Intune for Education - - url: /microsoft-365/education/deploy/use-intune-for-education - text: 4. Use Intune to manage groups, apps, and settings - - url: /intune/enrollment/enrollment-autopilot - text: 5. Enroll devices using Windows Autopilot - # Card - - title: Phase 3 - Apps management - imageSrc: ./images/EDU-Apps-Mgmt.svg - links: - - url: /microsoft-365/education/deploy/configure-admin-settings - text: 1. Configure admin settings - - url: /microsoft-365/education/deploy/set-up-teams-for-education - text: 2. Set up Teams for Education - - url: /microsoft-365/education/deploy/deploy-office-365 - text: 3. Set up Office 365 - - url: /microsoft-365/education/deploy/microsoft-store-for-education - text: 4. Install apps from Microsoft Store for Education - - url: /microsoft-365/education/deploy/minecraft-for-education - text: 5. Install Minecraft - Education Edition - # Card - - title: Complete your deployment - # imageSrc should be square in ratio with no whitespace - imageSrc: ./images/EDU-Tasks.svg - links: - - url: /microsoft-365/education/deploy/deploy-exchange-online - text: Deploy Exchange Online - - url: /microsoft-365/education/deploy/deploy-sharepoint-online-and-onedrive - text: Deploy SharePoint Online and OneDrive - - url: /microsoft-365/education/deploy/deploy-exchange-server-hybrid - text: Deploy Exchange Server hybrid - - url: /microsoft-365/education/deploy/deploy-sharepoint-server-hybrid - text: Deploy SharePoint Server Hybrid - # Card - - title: Security & compliance - imageSrc: ./images/EDU-Lockbox.svg - links: - - url: /azure/active-directory/fundamentals/active-directory-deployment-checklist-p2 - text: AAD feature deployment guide - - url: https://techcommunity.microsoft.com/t5/Azure-Information-Protection/Azure-Information-Protection-Deployment-Acceleration-Guide/ba-p/334423 - text: Azure information protection deployment acceleration guide - - url: /cloud-app-security/getting-started-with-cloud-app-security - text: Microsoft Defender for Cloud Apps - - url: /microsoft-365/compliance/create-test-tune-dlp-policy - text: Office 365 data loss prevention - - url: /microsoft-365/compliance/ - text: Office 365 advanced compliance - - url: https://social.technet.microsoft.com/wiki/contents/articles/35748.office-365-what-is-customer-lockbox-and-how-to-enable-it.aspx - text: Deploying Lockbox - # Card - - title: Analytics & insights - imageSrc: ./images/EDU-Education.svg - links: - - url: /power-bi/service-admin-administering-power-bi-in-your-organization - text: Power BI for IT admins - - url: /dynamics365/#pivot=get-started - text: Dynamics 365 - # Card - - title: Find deployment help - imageSrc: ./images/EDU-FindHelp.svg - links: - - url: /microsoft-365/education/deploy/find-deployment-help - text: IT admin help - - url: https://social.technet.microsoft.com/forums/en-us/home - text: TechNet - # Card - - title: Check out our education journey - imageSrc: ./images/EDU-ITJourney.svg - links: - - url: https://edujourney.microsoft.com/k-12/ - text: K-12 - - url: https://edujourney.microsoft.com/hed/ - text: Higher education - # Card - - title: Additional support resources - imageSrc: ./images/EDU-Teachers.svg - links: - - url: https://support.office.com/en-us/education - text: Education help center - - url: https://support.office.com/en-us/article/teacher-training-packs-7a9ee74a-8fe5-43d3-bc23-a55185896921 - text: Teacher training packs diff --git a/education/partners.yml b/education/partners.yml deleted file mode 100644 index 42925925f4..0000000000 --- a/education/partners.yml +++ /dev/null @@ -1,33 +0,0 @@ -### YamlMime:Hub - -title: Microsoft 365 Education Documentation for partners -summary: Looking for resources available to Microsoft Education partners? Start here. - -metadata: - title: Microsoft 365 Education Documentation for partners - description: Looking for resources available to Microsoft Education partners? Start here. - ms.service: help - ms.topic: hub-page - author: LaurenMoynihan - ms.author: v-lamoyn - ms.date: 10/24/2019 - -additionalContent: - sections: - - items: - # Card - - title: Microsoft Partner Network - summary: Discover the latest news and resources for Microsoft Education products, solutions, licensing and readiness. - url: https://partner.microsoft.com/solutions/education - # Card - - title: Authorized Education Partner (AEP) program - summary: Become authorized to purchase and resell academic priced offers and products to Qualified Educational Users (QEUs). - url: https://www.mepn.com/ - # Card - - title: Authorized Education Partner Directory - summary: Search through the list of Authorized Education Partners worldwide who can deliver on customer licensing requirements, and provide solutions and services to current and future school needs. - url: https://www.mepn.com/MEPN/AEPSearch.aspx - # Card - - title: Education Partner community Yammer group - summary: Sign in with your Microsoft Partner account and join the Education Partner community private group on Yammer. - url: https://www.yammer.com/mepn/ \ No newline at end of file diff --git a/store-for-business/billing-understand-your-invoice-msfb.md b/store-for-business/billing-understand-your-invoice-msfb.md index bee1e82435..9f73223f1d 100644 --- a/store-for-business/billing-understand-your-invoice-msfb.md +++ b/store-for-business/billing-understand-your-invoice-msfb.md @@ -110,10 +110,10 @@ At the bottom of the invoice, there are instructions for paying your bill. You c If you have third-party services in your bill, the name and address of each publisher is listed at the bottom of your invoice. ## Next steps -If there are Azure charges on your invoice that you would like more details on, see [Understand the Azure charges on your Microsoft Customer Agreement invoice](/azure/billing/billing-understand-your-invoice-mca). +If there are Azure charges on your invoice that you would like more details on, see [Understand the Azure charges on your Microsoft Customer Agreement invoice](/azure/cost-management-billing/understand/download-azure-invoice#invoices-for-mca-and-mpa-billing-accounts). ## Need help? Contact us. If you have questions or need help with your Azure charges, [create a support request with Azure support](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest). -If you have questions or need help with your invoice in Microsoft Store for Business, [create a support request with Store for Business support](https://businessstore.microsoft.com/manage/support/summary). \ No newline at end of file +If you have questions or need help with your invoice in Microsoft Store for Business, [create a support request with Store for Business support](https://businessstore.microsoft.com/manage/support/summary). diff --git a/windows/application-management/app-v/appv-deploying-microsoft-office-2016-with-appv.md b/windows/application-management/app-v/appv-deploying-microsoft-office-2016-with-appv.md index ccb835f3f9..b8a5d91571 100644 --- a/windows/application-management/app-v/appv-deploying-microsoft-office-2016-with-appv.md +++ b/windows/application-management/app-v/appv-deploying-microsoft-office-2016-with-appv.md @@ -120,7 +120,7 @@ The XML file included in the Office Deployment Tool specifies the product detail |--------------|----------------------------|----------------| | Add element | Specifies which products and languages the package will include. | N/A | | **OfficeClientEdition** (attribute of **Add** element) | Specifies whether Office 2016 32-bit or 64-bit edition will be used. **OfficeClientEdition**  must be set to a valid value for the operation to succeed. | `OfficeClientEdition="32"`
`OfficeClientEdition="64"` | - | Product element | Specifies the application. Project 2016 and Visio 2016 must be specified here as added products to include them in the applications.
For more information about Product IDs, see [Product IDs that are supported by the Office Deployment Tool for Click-to-Run](/office365/troubleshoot/installation). | `Product ID ="O365ProPlusRetail"`
`Product ID ="VisioProRetail"`
`Product ID ="ProjectProRetail"` | + | Product element | Specifies the application. Project 2016 and Visio 2016 must be specified here as added products to include them in the applications.
For more information about Product IDs, see [Product IDs that are supported by the Office Deployment Tool for Click-to-Run](/office365/troubleshoot/installation/product-ids-supported-office-deployment-click-to-run). | `Product ID ="O365ProPlusRetail"`
`Product ID ="VisioProRetail"`
`Product ID ="ProjectProRetail"` | | Language element | Specifies which language the applications support. | `Language ID="en-us"` | | Version (attribute of **Add** element) | Optional. Specifies which build the package will use.
Defaults to latest advertised build (as defined in v32.CAB at the Office source). | `16.1.2.3` | | SourcePath (attribute of **Add** element) | Specifies the location the applications will be saved to. | `Sourcepath = "\\Server\Office2016"` | diff --git a/windows/client-management/advanced-troubleshooting-boot-problems.md b/windows/client-management/advanced-troubleshooting-boot-problems.md index 8dc1758ac1..858333629a 100644 --- a/windows/client-management/advanced-troubleshooting-boot-problems.md +++ b/windows/client-management/advanced-troubleshooting-boot-problems.md @@ -15,6 +15,8 @@ ms.collection: highpri # Advanced troubleshooting for Windows boot problems +

Try our Virtual Agent - It can help you quickly identify and fix common Windows boot issues + > [!NOTE] > This article is intended for use by support agents and IT professionals. If you're looking for more general information about recovery options, see [Recovery options in Windows 10](https://support.microsoft.com/help/12415). diff --git a/windows/client-management/mdm/vpnv2-csp.md b/windows/client-management/mdm/vpnv2-csp.md index add96c2ec0..4f5fc988ac 100644 --- a/windows/client-management/mdm/vpnv2-csp.md +++ b/windows/client-management/mdm/vpnv2-csp.md @@ -771,7 +771,9 @@ Reserved for future use. Reserved for future use. **VPNv2/**ProfileName**/NativeProfile/CryptographySuite** -Added in Windows 10, version 1607. Properties of IPSec tunnels. +Added in Windows 10, version 1607. Properties of IPSec tunnels. + +[!NOTE] If you specify any of the properties under CryptographySuite, you must specify all of them. It's not valid to specify just some of the properties. **VPNv2/**ProfileName**/NativeProfile/CryptographySuite/AuthenticationTransformConstants** Added in Windows 10, version 1607. diff --git a/windows/configuration/provisioning-packages/provisioning-packages.md b/windows/configuration/provisioning-packages/provisioning-packages.md index c0931e36ec..da386db801 100644 --- a/windows/configuration/provisioning-packages/provisioning-packages.md +++ b/windows/configuration/provisioning-packages/provisioning-packages.md @@ -79,7 +79,7 @@ The following table describes settings that you can configure using the wizards | Set up device | Assign device name, enter product key to upgrade Windows, configure shared used, remove pre-installed software | ✔️ | ✔️ | ✔️ | | Set up network | Connect to a Wi-Fi network | ✔️ | ✔️ | ✔️ | | Account management | Enroll device in Active Directory, enroll device in Azure Active Directory, or create a local administrator account | ✔️ | ✔️ | ✔️ | -| Bulk Enrollment in Azure AD | Enroll device in Azure Active Directory

Before you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, [set up Azure AD join in your organization](/azure/active-directory/active-directory-azureadjoin-setup). | ❌ | ❌ | ❌ | +| Bulk Enrollment in Azure AD | Enroll device in Azure Active Directory using Bulk Token

[Set up Azure AD join in your organization](/azure/active-directory/active-directory-azureadjoin-setup), before you use Windows Configuration Designer wizard to configure bulk Azure AD enrollment,. | ✔️ | ✔️ | ✔️ | | Add applications | Install applications using the provisioning package. | ✔️ | ✔️ | ❌ | | Add certificates | Include a certificate file in the provisioning package. | ✔️ | ✔️ | ✔️ | | Configure kiosk account and app | Create local account to run the kiosk mode app, specify the app to run in kiosk mode | ❌ | ✔️ | ❌ | diff --git a/windows/deployment/update/windows-update-troubleshooting.md b/windows/deployment/update/windows-update-troubleshooting.md index 6810663c1a..4c7a2d01ad 100644 --- a/windows/deployment/update/windows-update-troubleshooting.md +++ b/windows/deployment/update/windows-update-troubleshooting.md @@ -20,6 +20,8 @@ ms.collection: highpri - Windows 10 - Windows 11 +

Try our Virtual Agent - It can help you quickly identify and fix common Windows Update issues + If you run into problems when using Windows Update, start with the following steps: 1. Run the built-in Windows Update troubleshooter to fix common issues. Navigate to **Settings > Update & Security > Troubleshoot > Windows Update**. diff --git a/windows/deployment/windows-10-subscription-activation.md b/windows/deployment/windows-10-subscription-activation.md index 4a7dccff99..ad6bf5aa42 100644 --- a/windows/deployment/windows-10-subscription-activation.md +++ b/windows/deployment/windows-10-subscription-activation.md @@ -125,6 +125,8 @@ If the device is running Windows 10, version 1809 or later: ![Subscription Activation with MFA example 3.](images/sa-mfa3.png) +Organizations that use Azure Active Directory Conditional Access may want to exclude the Universal Store Service APIs and Web Application, AppID 45a330b1-b1ec-4cc1-9161-9f03992aa49f from their all users all cloud apps MFA policy to avoid this issue. + ### Windows 10/11 Education requirements - Windows 10 Pro Education, version 1903 or later installed on the devices to be upgraded. diff --git a/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services.md b/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services.md index b6b7503543..39f281139e 100644 --- a/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services.md +++ b/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services.md @@ -1,5 +1,5 @@ --- -title: Manage connections from Windows 10 and Windows 11 operating system components to Microsoft services +title: Manage connections from Windows 10 and Windows 11 Server/Enterprise editions operating system components to Microsoft services description: Learn how to minimize connections from Windows to Microsoft services, and configure particular privacy settings related to these connections. ms.assetid: ACCEB0DD-BC6F-41B1-B359-140B242183D9 ms.reviewer: diff --git a/windows/security/identity-protection/access-control/access-control.md b/windows/security/identity-protection/access-control/access-control.md index b4a6c2c7fa..eacb21eb26 100644 --- a/windows/security/identity-protection/access-control/access-control.md +++ b/windows/security/identity-protection/access-control/access-control.md @@ -131,7 +131,7 @@ For more information about user rights, see [User Rights Assignment](/windows/de With administrator's rights, you can audit users' successful or failed access to objects. You can select which object access to audit by using the access control user interface, but first you must enable the audit policy by selecting **Audit object access** under **Local Policies** in **Local Security Settings**. You can then view these security-related events in the Security log in Event Viewer. -For more information about auditing, see [Security Auditing Overview](/windows/device-security/auditing/security-auditing-overview). +For more information about auditing, see [Security Auditing Overview](/windows/security/threat-protection/auditing/security-auditing-overview). ## See also diff --git a/windows/security/identity-protection/hello-for-business/hello-deployment-issues.md b/windows/security/identity-protection/hello-for-business/hello-deployment-issues.md index 16f8e33766..b8c2e0c3b8 100644 --- a/windows/security/identity-protection/hello-for-business/hello-deployment-issues.md +++ b/windows/security/identity-protection/hello-for-business/hello-deployment-issues.md @@ -29,7 +29,7 @@ Applies to: - Windows 10, version 1803 and later - Windows 11 -PIN reset on Azure AD joined devices uses a flow called web sign-in to authenticate the user above lock. Web sign in only allows navigation to specific domains. If it attempts to navigate to a domain that is not allowed it will shows a page with the error message "We can't open that page right now". +PIN reset on Azure AD joined devices uses a flow called web sign-in to authenticate the user above lock. Web sign in only allows navigation to specific domains. If it attempts to navigate to a domain that is not allowed it will show a page with the error message "We can't open that page right now". ### Identifying Azure AD joined PIN Reset Allowed Domains Issue @@ -57,11 +57,11 @@ In Hybrid key trust deployments with domain controllers running certain builds o After the user provisions a Windows Hello for Business credential in a hybrid key trust environment, the key must sync from Azure AD to AD during an Azure AD Connect sync cycle. The user's public key will be written to the msDS-KeyCredentialLink attribute of the user object. -Before the user's Windows Hello for Business key is synced, sign-in's with Windows Hello for Business will fail with the error message, *"That option is temporarily unavailable. For now, please use a different method to sign in."* After the sync is successful, the user should be able to login and unlock with their PIN or enrolled biometrics. +Before the user's Windows Hello for Business key is synced, sign-in's with Windows Hello for Business will fail with the error message, *"That option is temporarily unavailable. For now, please use a different method to sign in."* After the sync is successful, the user should be able to log in and unlock with their PIN or enrolled biometrics. In environments impacted with this issue, after the first sign-in with Windows Hello for Business after provisioning is completed, the next sign-in attempt will fail. In environments where domain controllers are running a mix of builds, only some may be impacted by this issue and subsequent logon attempts may be sent different domain controllers. This may result in the sign-in failures appearing to be intermittent. -After the initial logon attempt, the user's Windows Hello for Business public key is being deleted from the msDS-KeyCredentialLink attribute. This can be verified by querying a user's msDS-KeyCredentialLink attribute before and after sign-in. The msDS-KeyCredentialLink can be queried in AD using [Get-ADUser](/powershell/module/addsadministration/get-aduser) and specifying *msds-keycredentiallink* for the *-Properties* parameter. +After the initial logon attempt, the user's Windows Hello for Business public key is being deleted from the msDS-KeyCredentialLink attribute. This can be verified by querying a user's msDS-KeyCredentialLink attribute before and after sign-in. The msDS-KeyCredentialLink can be queried in AD using [Get-ADUser](/powershell/module/activedirectory/get-aduser) and specifying *msds-keycredentiallink* for the *-Properties* parameter. ### Resolving User Public Key Deletion Issue diff --git a/windows/security/information-protection/encrypted-hard-drive.md b/windows/security/information-protection/encrypted-hard-drive.md index 9bbeeb2de3..cebb1539b9 100644 --- a/windows/security/information-protection/encrypted-hard-drive.md +++ b/windows/security/information-protection/encrypted-hard-drive.md @@ -21,6 +21,7 @@ ms.date: 04/02/2019 - Windows Server 2022 - Windows Server 2019 - Windows Server 2016 +- Azure Stack HCI Encrypted Hard Drive uses the rapid encryption that is provided by BitLocker Drive Encryption to enhance data security and management. @@ -32,8 +33,8 @@ Encrypted Hard Drives provide: - **Better performance**: Encryption hardware, integrated into the drive controller, allows the drive to operate at full data rate with no performance degradation. - **Strong security based in hardware**: Encryption is always "on" and the keys for encryption never leave the hard drive. User authentication is performed by the drive before it will unlock, independently of the operating system -- **Ease of use**: Encryption is transparent to the user, and the user doesn't need to enable it. Encrypted Hard Drives are easily erased using on-board encryption key; there is no need to re-encrypt data on the drive. -- **Lower cost of ownership**: There is no need for new infrastructure to manage encryption keys, since BitLocker leverages your existing infrastructure to store recovery information. Your device operates more efficiently because processor cycles do not need to be used for the encryption process. +- **Ease of use**: Encryption is transparent to the user, and the user doesn't need to enable it. Encrypted Hard Drives are easily erased using on-board encryption key; there's no need to re-encrypt data on the drive. +- **Lower cost of ownership**: There's no need for new infrastructure to manage encryption keys, since BitLocker leverages your existing infrastructure to store recovery information. Your device operates more efficiently because processor cycles don't need to be used for the encryption process. Encrypted Hard Drives are supported natively in the operating system through the following mechanisms: @@ -77,13 +78,13 @@ Rapid encryption in BitLocker directly addresses the security needs of enterpris Configuration of Encrypted Hard Drives as startup drives is done using the same methods as standard hard drives. These methods include: - **Deploy from media**: Configuration of Encrypted Hard Drives happens automatically through the installation process. -- **Deploy from network**: This deployment method involves booting a Windows PE environment and using imaging tools to apply a Windows image from a network share. Using this method, the Enhanced Storage optional component needs to be included in the Windows PE image. You can enable this component using Server Manager, Windows PowerShell, or the DISM command line tool. If this component is not present, configuration of Encrypted Hard Drives will not work. +- **Deploy from network**: This deployment method involves booting a Windows PE environment and using imaging tools to apply a Windows image from a network share. Using this method, the Enhanced Storage optional component needs to be included in the Windows PE image. You can enable this component using Server Manager, Windows PowerShell, or the DISM command line tool. If this component isn't present, configuration of Encrypted Hard Drives won't work. - **Deploy from server**: This deployment method involves PXE booting a client with Encrypted Hard Drives present. Configuration of Encrypted Hard Drives happens automatically in this environment when the Enhanced Storage component is added to the PXE boot image. During deployment, the [TCGSecurityActivationDisabled](/windows-hardware/customize/desktop/unattend/microsoft-windows-enhancedstorage-adm-tcgsecurityactivationdisabled) setting in unattend.xml controls the encryption behavior of Encrypted Hard Drives. -- **Disk Duplication**: This deployment method involves use of a previously configured device and disk duplication tools to apply a Windows image to an Encrypted Hard Drive. Disks must be partitioned using at least Windows 8 or Windows Server 2012 for this configuration to work. Images made using disk duplicators will not work. +- **Disk Duplication**: This deployment method involves use of a previously configured device and disk duplication tools to apply a Windows image to an Encrypted Hard Drive. Disks must be partitioned using at least Windows 8 or Windows Server 2012 for this configuration to work. Images made using disk duplicators won't work. ## Configuring hardware-based encryption with Group Policy -There are three related Group Policy settings that help you manage how BitLocker uses hardware-based encryption and which encryption algorithms to use. If these settings are not configured or disabled on systems that are equipped with encrypted drives, BitLocker uses software-based encryption: +There are three related Group Policy settings that help you manage how BitLocker uses hardware-based encryption and which encryption algorithms to use. If these settings aren't configured or disabled on systems that are equipped with encrypted drives, BitLocker uses software-based encryption: - [Configure use of hardware-based encryption for fixed data drives](bitlocker/bitlocker-group-policy-settings.md#bkmk-hdefxd) - [Configure use of hardware-based encryption for removable data drives](bitlocker/bitlocker-group-policy-settings.md#configure-use-of-hardware-based-encryption-for-removable-data-drives) @@ -93,14 +94,14 @@ There are three related Group Policy settings that help you manage how BitLocker Encrypted Hard Drives utilize two encryption keys on the device to control the locking and unlocking of data on the drive. These are the Data Encryption Key (DEK) and the Authentication Key (AK). -The Data Encryption Key is the key used to encrypt all of the data on the drive. The drive generates the DEK and it never leaves the device. It is stored in an encrypted format at a random location on the drive. If the DEK is changed or erased, data encrypted using the DEK is irrecoverable. +The Data Encryption Key is the key used to encrypt all of the data on the drive. The drive generates the DEK and it never leaves the device. It's stored in an encrypted format at a random location on the drive. If the DEK is changed or erased, data encrypted using the DEK is irrecoverable. The Authentication Key is the key used to unlock data on the drive. A hash of the key is stored on drive and requires confirmation to decrypt the DEK. When a computer with an Encrypted Hard Drive is in a powered off state, the drive locks automatically. As a computer powers on, the device remains in a locked state and is only unlocked after the Authentication Key decrypts the Data Encryption Key. Once the Authentication Key decrypts the Data Encryption Key, read-write operations can take place on the device. -When writing data to the drive, it passes through an encryption engine before the write operation completes. Likewise, reading data from the drive requires the encryption engine to decrypt the data before passing that data back to the user. In the event that the DEK needs to be changed or erased, the data on the drive does not need to be re-encrypted. A new Authentication Key needs to be created and it will re-encrypt the DEK. Once completed, the DEK can now be unlocked using the new AK and read-writes to the volume can continue. +When writing data to the drive, it passes through an encryption engine before the write operation completes. Likewise, reading data from the drive requires the encryption engine to decrypt the data before passing that data back to the user. In the event that the DEK needs to be changed or erased, the data on the drive doesn't need to be re-encrypted. A new Authentication Key needs to be created and it will re-encrypt the DEK. Once completed, the DEK can now be unlocked using the new AK and read-writes to the volume can continue. ## Re-configuring Encrypted Hard Drives diff --git a/windows/security/threat-protection/security-policy-settings/minimum-password-length.md b/windows/security/threat-protection/security-policy-settings/minimum-password-length.md index 7921cdcc37..d116884fca 100644 --- a/windows/security/threat-protection/security-policy-settings/minimum-password-length.md +++ b/windows/security/threat-protection/security-policy-settings/minimum-password-length.md @@ -14,7 +14,7 @@ manager: dansimp audience: ITPro ms.collection: M365-security-compliance ms.topic: conceptual -ms.date: 04/19/2017 +ms.date: 03/30/2022 ms.technology: windows-sec --- @@ -36,7 +36,7 @@ The **Minimum password length** policy setting determines the least number of ch ### Best practices -Set Minimum password length to at least a value of 8. If the number of characters is set to 0, no password is required. In most environments, an eight-character password is recommended because it's long enough to provide adequate security and still short enough for users to easily remember. A minimum password length greater than 14 isn't supported at this time. This value will help provide adequate defense against a brute force attack. Adding complexity requirements will help reduce the possibility of a dictionary attack. For more info, see [Password must meet complexity requirements](password-must-meet-complexity-requirements.md). +Set Minimum password length to at least a value of 14. If the number of characters is set to 0, no password is required. In most environments, an eight-character password is recommended because it's long enough to provide adequate security and still short enough for users to easily remember. A minimum password length greater than 14 isn't supported at this time. This value will help provide adequate defense against a brute force attack. Adding complexity requirements will help reduce the possibility of a dictionary attack. For more info, see [Password must meet complexity requirements](password-must-meet-complexity-requirements.md). Permitting short passwords reduces security because short passwords can be easily broken with tools that do dictionary or brute force attacks against the passwords. Requiring very long passwords can result in mistyped passwords that might cause account lockouts and might increase the volume of Help Desk calls. diff --git a/windows/security/threat-protection/windows-defender-application-control/deployment/deploy-wdac-policies-with-script.md b/windows/security/threat-protection/windows-defender-application-control/deployment/deploy-wdac-policies-with-script.md index e7c5dca396..43ecea1845 100644 --- a/windows/security/threat-protection/windows-defender-application-control/deployment/deploy-wdac-policies-with-script.md +++ b/windows/security/threat-protection/windows-defender-application-control/deployment/deploy-wdac-policies-with-script.md @@ -85,8 +85,8 @@ In addition to the steps outlined above, the binary policy file must also be cop 1. Mount the EFI volume and make the directory, if it does not exist, in an elevated PowerShell prompt: ```powershell - $MountPoint = 'C:\EFI' - $EFIDestinationFolder = "$MountPoint\Microsoft\Boot\CiPolicies\Active" + $MountPoint = 'C:\EFIMount' + $EFIDestinationFolder = "$MountPoint\EFI\Microsoft\Boot\CiPolicies\Active" $EFIPartition = (Get-Partition | Where-Object IsSystem).AccessPaths[0] mountvol $MountPoint $EFIPartition mkdir $EFIDestinationFolder diff --git a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md.bak b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md.bak deleted file mode 100644 index 357a184c9b..0000000000 --- a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md.bak +++ /dev/null @@ -1,1176 +0,0 @@ ---- -title: Microsoft recommended driver block rules (Windows) -description: View a list of recommended block rules to block vulnerable third-party drivers discovered by Microsoft and the security research community. -keywords: security, malware, kernel mode, driver -ms.assetid: 8d6e0474-c475-411b-b095-1c61adb2bdbb -ms.prod: m365-security -ms.mktglfcycl: deploy -ms.sitesec: library -ms.pagetype: security -ms.localizationpriority: medium -audience: ITPro -ms.collection: M365-security-compliance -author: jgeurten -ms.reviewer: isbrahm -ms.author: dansimp -manager: dansimp ---- - -# Microsoft recommended driver block rules - -**Applies to:** - -- Windows 10 -- Windows 11 -- Windows Server 2016 and above - ->[!NOTE] ->Some capabilities of Windows Defender Application Control are only available on specific Windows versions. Learn more about the [Windows Defender Application Control feature availability](feature-availability.md). - -Microsoft has strict requirements for code running in kernel. So, malicious actors are turning to exploit vulnerabilities in legitimate and signed kernel drivers to run malware in kernel. One of the many strengths of the Windows platform is our strong collaboration with independent hardware vendors (IHVs) and OEMs. Microsoft works closely with our IHVs and security community to ensure the highest level of driver security for our customers and when vulnerabilities in drivers do arise, that they're quickly patched and rolled out to the ecosystem. Microsoft then adds the vulnerable versions of the drivers to our ecosystem block policy, which is applied to the following sets of devices: - -- Hypervisor-protected code integrity (HVCI) enabled devices -- Windows 10 in S mode (S mode) devices - -The vulnerable driver blocklist is designed to help harden systems against third party-developed drivers across the Windows ecosystem with any of the following attributes: - -- Known security vulnerabilities that can be exploited by attackers to elevate privileges in the Windows kernel -- Malicious behaviors (malware) or certificates used to sign malware -- Behaviors that are not malicious but circumvent the Windows Security Model and can be exploited by attackers to elevate privileges in the Windows kernel - -Drivers can be submitted to Microsoft for security analysis at the [Microsoft Security Intelligence Driver Submission page](https://www.microsoft.com/en-us/wdsi/driversubmission). To report an issue or request a change to the vulnerable driver blocklist, including updating a block rule once a driver vulnerability has been patched, visit the [Microsoft Security Intelligence portal](https://www.microsoft.com/wdsi) or submit feedback on this article. - -Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity) or S mode to protect your devices against security threats. If this isn't possible, Microsoft recommends blocking this list of drivers within your existing Windows Defender Application Control policy. Blocking kernel drivers without sufficient testing can result in devices or software to malfunction, and in rare cases, blue screen. It's recommended to first validate this policy in [audit mode](audit-windows-defender-application-control-policies.md) and review the audit block events. - -```xml - - - 10.0.25090.0 - {D2BDA982-CCF6-4344-AC5B-0B44427B6816} - {2E07F7E4-194C-4D20-B7C9-6F44A6C5A234} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - Microsoft Windows Driver Policy - - - - - 10.0.25000.0 - - - - -``` -
- - -## More information - -- [Merge Windows Defender Application Control policies](merge-windows-defender-application-control-policies.md) diff --git a/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview.md b/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview.md index 65b8c21047..bb68f8ea94 100644 --- a/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview.md +++ b/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview.md @@ -59,7 +59,7 @@ The following video provides an overview of Windows Sandbox. Set-VMProcessor -VMName \ -ExposeVirtualizationExtensions $true ``` -3. Use the search bar on the task bar and type **Turn Windows Features on and off** to access the Windows Optional Features tool. Select **Windows Sandbox** and then **OK**. Restart the computer if you're prompted. +3. Use the search bar on the task bar and type **Turn Windows Features on or off** to access the Windows Optional Features tool. Select **Windows Sandbox** and then **OK**. Restart the computer if you're prompted. If the **Windows Sandbox** option is unavailable, your computer doesn't meet the requirements to run Windows Sandbox. If you think this is incorrect, review the prerequisite list as well as steps 1 and 2.