fix merge conflict, update links

This commit is contained in:
Meghan Stewart
2024-06-07 08:04:59 -07:00
parent 3fcd8f2542
commit b4ad36c3c3

View File

@ -1,11 +1,7 @@
--- ---
title: Resources for deprecated features in the Windows client title: Resources for deprecated features in the Windows client
description: Resources and details for deprecated features in the Windows client. description: Resources and details for deprecated features in the Windows client.
<<<<<<< HEAD
ms.date: 06/17/2024 ms.date: 06/17/2024
=======
ms.date: 06/03/2024
>>>>>>> 31265cfecbcd5148d609eedc50e016cdc9ac82ca
ms.service: windows-client ms.service: windows-client
ms.subservice: itpro-fundamentals ms.subservice: itpro-fundamentals
ms.localizationpriority: medium ms.localizationpriority: medium
@ -25,26 +21,22 @@ appliesto:
This article provides additional resources about [deprecated features for Windows client](deprecated-features.md) that may be needed by IT professionals. The following information is provided to help IT professionals plan for the removal of deprecated features: This article provides additional resources about [deprecated features for Windows client](deprecated-features.md) that may be needed by IT professionals. The following information is provided to help IT professionals plan for the removal of deprecated features:
<<<<<<< HEAD
## Paint 3D ## Paint 3D
Paint 3D is deprecated and will be removed from the Microsoft Store on September 3, 2024. Existing installations of Paint 3D will continue to work, but the app will no longer be available for download from the Microsoft Store. If you remove the app, you can reinstall it from the Microsoft Store until September 3, 2024. After that date, Paint 3D will no longer be available for download. Paint 3D was preinstalled on some Windows 10 devices, but wasn't preinstalled on Windows 11 devices. Some alternatives to Paint 3D include: Paint 3D is deprecated and will be removed from the Microsoft Store on September 3, 2024. Existing installations of Paint 3D will continue to work, but the app will no longer be available for download from the Microsoft Store. If you remove the app, you can reinstall it from the Microsoft Store until September 3, 2024. After that date, Paint 3D will no longer be available for download. Paint 3D was preinstalled on some Windows 10 devices, but wasn't preinstalled on Windows 11 devices. Some alternatives to Paint 3D include:
- View and edit 2D images: [Paint](https://www.microsoft.com/windows/paint) or [Photos](https://support.microsoft.com/topic/c0c6422f-d4cb-2e3d-eb65-7069071b2f9b) - View and edit 2D images: [Paint](https://apps.microsoft.com/detail/9pcfs5b6t72h) or [Photos](https://apps.microsoft.com/detail/9wzdncrfjbh4)
- View 3D content: [3D Viewer](https://apps.microsoft.com/detail/9nblggh42ths). - View 3D content: [3D Viewer](https://apps.microsoft.com/detail/9nblggh42ths).
=======
## NTLM ## NTLM
Customers concerned about NTLM usage in their environments are encouraged to utilize [NTLM auditing](/previous-versions/windows/it-pro/windows-10/security/threat-protection/security-policy-settings/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain) to [investigate how NTLM is being used](https://techcommunity.microsoft.com/t5/ask-the-directory-services-team/ntlm-blocking-and-you-application-analysis-and-auditing/ba-p/397191). Customers concerned about NTLM usage in their environments are encouraged to utilize [NTLM auditing](/previous-versions/windows/it-pro/windows-10/security/threat-protection/security-policy-settings/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain) to [investigate how NTLM is being used](https://techcommunity.microsoft.com/t5/ask-the-directory-services-team/ntlm-blocking-and-you-application-analysis-and-auditing/ba-p/397191).
In many cases, applications should be able to replace NTLM with Negotiate using a one-line change in their `AcquireCredentialsHandle` request to the SSPI. One known exception is for applications that have made hard assumptions about the maximum number of round trips needed to complete authentication. In most cases, Negotiate will add at least one additional round trip. Some scenarios may require additional configuration. For more information, see [Kerberos authentication troubleshooting guidance](/troubleshoot/windows-server/windows-security/kerberos-authentication-troubleshooting-guidance). In many cases, applications should be able to replace NTLM with Negotiate using a one-line change in their `AcquireCredentialsHandle` request to the SSPI. One known exception is for applications that have made hard assumptions about the maximum number of round trips needed to complete authentication. In most cases, Negotiate will add at least one additional round trip. Some scenarios may require additional configuration. For more information, see [Kerberos authentication troubleshooting guidance](/troubleshoot/windows-server/windows-security/kerberos-authentication-troubleshooting-guidance).
Negotiate's built-in fallback to NTLM is preserved to mitigate compatibility issues during this transition. For updates on NTLM deprecation, see [https://aka.ms/ntlm](https://aka.ms/ntlm). Negotiate's built-in fallback to NTLM is preserved to mitigate compatibility issues during this transition. For updates on NTLM deprecation, see [https://aka.ms/ntlm](https://aka.ms/ntlm).
>>>>>>> 31265cfecbcd5148d609eedc50e016cdc9ac82ca
## WordPad ## WordPad
WordPad will be removed from all editions of Windows starting in Windows 11, version 24H2 and Windows Server 2025. As a result, Windows will no longer have a built-in, default RTF reader. We recommend Microsoft Word for rich text documents like .doc and .rtf and Notepad for plain text documents like .txt. The following binaries will be removed as a result of WordPad removal:
- wordpad.exe - wordpad.exe
- wordpadfilter.dll - wordpadfilter.dll