Merge pull request #2763 from MicrosoftDocs/master

Publish 3:40 PM, 05/13/2020
2025-06-29 09:13:39 +00:00 · 2020-05-13 15:55:26 -07:00
parent 872208140a 10d0c64c97
commit 70f197d75c
9 changed files with 122 additions and 62 deletions
--- a/devices/hololens/hololens-identity.md
+++ b/devices/hololens/hololens-identity.md
@ -32,7 +32,7 @@ HoloLens supports several kinds of user identities. You can use one or more user

 | Identity type | Accounts per device | Authentication options |
 | --- | --- | --- |
-| [Azure Active Directory (AAD)](https://docs.microsoft.com/azure/active-directory/) | 32 (see details) | <ul><li>Azure web credential provider</li><li>Azure Authenticator App</li><li>Biometric (Iris) &ndash; HoloLens 2 only</li><li>PIN &ndash; Optional for HoloLens (1st gen), required for HoloLens 2</li><li>Password</li></ul> |
+| [Azure Active Directory (AAD)](https://docs.microsoft.com/azure/active-directory/) | 64 | <ul><li>Azure web credential provider</li><li>Azure Authenticator App</li><li>Biometric (Iris) &ndash; HoloLens 2 only</li><li>PIN &ndash; Optional for HoloLens (1st gen), required for HoloLens 2</li><li>Password</li></ul> |
 | [Microsoft Account (MSA)](https://docs.microsoft.com/windows/security/identity-protection/access-control/microsoft-accounts) | 1 | <ul><li>Biometric (Iris) &ndash; HoloLens 2 only</li><li>PIN &ndash; Optional for HoloLens (1st gen), required for HoloLens 2</li><li>Password</li></ul> |
 | [Local account](https://docs.microsoft.com/windows/security/identity-protection/access-control/local-accounts) | 1 | Password |

--- a/devices/surface-hub/surface-hub-2s-recover-reset.md
+++ b/devices/surface-hub/surface-hub-2s-recover-reset.md
@ -60,16 +60,6 @@ Using Surface Hub 2S, you can reinstall the device by using a recovery image. By

 When the first-time setup screen appears,remove the USB drive.

-## Recover a locked Surface Hub
-
-At the end of a session, Surface Hub 2S may occasionally encounter an error during the cleanup of user and app data at the end of a session. If this occurs, the device automatically reboots and resumes the data cleanup. However, if this operation repeatedly fails, the device automatically locks to protect user data.
-
-**To unlock a Surface Hub 2S:** <br>
- Reset or recover the device from the Windows Recovery Environment. For more information, see [What is Windows RE?](https://technet.microsoft.com/library/cc765966.aspx)
-
-> [!NOTE]
-> To enter recovery mode, unplug the power cord and plug it in again three times.
-
 ## Contact Support

 If you have questions or need help, you can [create a support request](https://support.microsoft.com/supportforbusiness/productselection).
--- a/devices/surface/get-started.yml
+++ b/devices/surface/get-started.yml
@ -28,20 +28,9 @@ landingContent:
            url: https://www.microsoft.com/surface/business/surface-go-2
          - text: Surface Book 3 for Business
            url: https://www.microsoft.com/surface/business/surface-book-3
-          - text: Surface Pro 7 for Business
-            url: https://www.microsoft.com/surface/business/surface-pro-7
-          - text: Surface Pro X for Business
-            url: https://www.microsoft.com/surface/business/surface-pro-x
-          - text: Surface Laptop 3 for Business
-            url: https://www.microsoft.com/surface/business/surface-laptop-3
-          - text: Surface Studio 2 for Business
-            url: https://www.microsoft.com/surface/business/surface-studio-2
-          
-      - linkListType: video
-        links:
-          - text: Microsoft Mechanics Surface videos
-            url: https://www.youtube.com/watch?v=Uk2kJ5FUZxY&list=PLXtHYVsvn_b__1Baibdu4elN4SoF3JTBZ
-
+          - text: Explore all Surface family products
+            url: https://www.microsoft.com/surface/business
+  
  # Card (optional)
  - title: Get started
    linkLists:
@ -52,38 +41,34 @@ landingContent:
         - text: Surface Book 3 Quadro RTX 3000 technical overview
           url: surface-book-quadro.md
         - text: What’s new in Surface Dock 2
-           url: surface-dock-whats-new.md
-         - text: Surface and Endpoint Configuration Manager considerations
-           url: considerations-for-surface-and-system-center-configuration-manager.md
-         - text: Wake On LAN for Surface devices
-           url: wake-on-lan-for-surface-devices.md
-
+           url: surface-dock-whats-new.md    
+ 
  # Card
  - title: Deploy Surface devices
    linkLists:
      - linkListType: deploy
        links:
-          - text: Manage and deploy Surface driver and firmware updates
-            url: manage-surface-driver-and-firmware-updates.md
+          - text: Surface Deployment Accelerator tool
+            url: microsoft-surface-deployment-accelerator.md
          - text: Autopilot and Surface devices
            url: windows-autopilot-and-surface-devices.md
          - text: Deploying, managing, and servicing Surface Pro X
            url: surface-pro-arm-app-management.md
-
-  # Card
+  
+    # Card
  - title: Manage Surface devices
    linkLists:
      - linkListType: how-to-guide
        links:
-          - text: Optimize Wi-Fi connectivity for Surface devices
-            url: surface-wireless-connect.md
+          - text: Manage and deploy Surface driver and firmware updates
+            url: manage-surface-driver-and-firmware-updates.md
          - text: Best practice power settings for Surface devices
            url: maintain-optimal-power-settings-on-Surface-devices.md
-          - text: Manage battery limit with UEFI
-            url: battery-limit.md
+          - text: Optimize Wi-Fi connectivity for Surface devices
+            url: surface-wireless-connect.md

  # Card
-  - title: Secure Surface devices
+  - title: Explore security guidance
    linkLists:
      - linkListType: how-to-guide
        links:
@ -93,37 +78,39 @@ landingContent:
            url: surface-enterprise-management-mode.md
          - text: Surface Data Eraser tool
            url: microsoft-surface-data-eraser.md
-
-  # Card
+ 
+ # Card
  - title: Discover Surface tools
    linkLists:
      - linkListType: how-to-guide
        links:
-          - text: Surface Dock Firmware Update
-            url: surface-dock-firmware-update.md
          - text: Surface Diagnostic Toolkit for Business
            url: surface-diagnostic-toolkit-for-business-intro.md
          - text: SEMM and UEFI
            url: surface-enterprise-management-mode.md
-          - text: Surface Brightness Control
-            url: microsoft-surface-brightness-control.md
          - text: Battery Limit setting
            url: battery-limit.md         

-  # Card
-  - title: Support and community 
+ # Card
+  - title: Browse support solutions
    linkLists:
      - linkListType: learn
        links:
          - text: Top support solutions
            url: support-solutions-surface.md
-          - text: Maximize your Surface battery life
-            url: https://support.microsoft.com/help/4483194/maximize-surface-battery-life
+          - text: Protecting your data during Surface repair or service
+            url: https://support.microsoft.com/help/4023508/surface-faq-protecting-your-data-service
          - text: Troubleshoot Surface Dock and docking stations
            url: https://support.microsoft.com/help/4023468/surface-troubleshoot-surface-dock-and-docking-stations
-      - linkListType: reference
+            
+# Card
+  - title: Participate in Surface Community 
+    linkLists:
+      - linkListType: learn
        links:
          - text: Surface IT Pro blog
            url: https://techcommunity.microsoft.com/t5/Surface-IT-Pro-Blog/bg-p/SurfaceITPro
          - text: Surface Devices Tech Community
            url: https://techcommunity.microsoft.com/t5/Surface-Devices/ct-p/SurfaceDevices
+          - text: Microsoft Mechanics Surface videos
+            url: https://www.youtube.com/watch?v=Uk2kJ5FUZxY&list=PLXtHYVsvn_b__1Baibdu4elN4SoF3JTBZ
--- a/devices/surface/microsoft-surface-data-eraser.md
+++ b/devices/surface/microsoft-surface-data-eraser.md
@ -168,7 +168,9 @@ After you create a Microsoft Surface Data Eraser USB stick, you can boot a suppo
 Microsoft Surface Data Eraser is periodically updated by Microsoft. For information about the changes provided in each new version, see the following:

 ### 3.30.139
-This version of Surface Data Eraser to be released May 11, 2020 adds support for: 
+*Release Date: 11 May 2020*
+
+This version of Surface Data Eraser adds support for: 
 - Surface Book 3
 - Surface Go 2
 - New SSD in Surface Go
--- a/devices/surface/surface-diagnostic-toolkit-business.md
+++ b/devices/surface/surface-diagnostic-toolkit-business.md
@ -176,8 +176,8 @@ You can select to run a wide range of logs across applications, drivers, hardwar
 ## Changes and updates

 ### Version 2.94.139.0
-
-This version of Surface Diagnostic Toolkit for Business to be released May 11, 2020 adds support for the following:
+*Release date: May 11, 2020*<br>
+This version of Surface Diagnostic Toolkit for Business adds support for the following:

 - Ability to skip Windows Update to perform hardware check.
 - Ability to receive notifications for about the latest version update
--- a/devices/surface/surface-enterprise-management-mode.md
+++ b/devices/surface/surface-enterprise-management-mode.md
@ -228,7 +228,7 @@ create a reset package using PowerShell to reset SEMM.

 ## Version History

-The latest version of SEMM to be released May 11, 2020 includes: 
+The latest version of SEMM released May 11, 2020 includes: 
 - Support for Surface Go 2
 - Support for Surface Book 3
 - Bug fixes
--- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
+++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
@ -429,6 +429,7 @@ Policy, Policy/Channels, Policy/Channels/ChannelName, Policy/Channels/ChannelNam
 <li>TextInput/TouchKeyboardSplitModeAvailability</li>
 <li>TextInput/TouchKeyboardWideModeAvailability</li>
 <li>Update/ConfigureFeatureUpdateUninstallPeriod</li>
+<li>Update/TargetReleaseVersion</li>
 <li>UserRights/AccessCredentialManagerAsTrustedCaller</li>
 <li>UserRights/AccessFromNetwork</li>
 <li>UserRights/ActAsPartOfTheOperatingSystem</li>
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@ -3747,6 +3747,10 @@ The following diagram shows the Policy configuration service provider in tree fo
  <dd>
    <a href="./policy-csp-update.md#update-setedurestart" id="update-setedurestart">Update/SetEDURestart</a>
  </dd>
+  <dd> 
+    <a href="./policy-csp-update.md#update-targetreleaseversion"id="update-targetreleaseversion">Update/TargetReleaseVersion</a> 
+  </dd>
+  <dd>
  <dd>
    <a href="./policy-csp-update.md#update-updatenotificationlevel" id="update-updatenotificationlevel">Update/UpdateNotificationLevel</a>
  </dd>
--- a/windows/client-management/mdm/policy-csp-update.md
+++ b/windows/client-management/mdm/policy-csp-update.md
@ -7,13 +7,16 @@ ms.prod: w10
 ms.technology: windows
 author: manikadhiman
 ms.localizationpriority: medium
-ms.date: 10/04/2019
+ms.date: 02/10/2020
 ms.reviewer: 
 manager: dansimp
 ---

 # Policy CSP - Update

+> [!WARNING] 
+> Some information relates to prereleased products, which may be substantially modified before it's commercially released. Microsoft makes no warranties, expressed or implied, concerning the information provided here.
+
 > [!NOTE]
 > If the MSA service is disabled, Windows Update will no longer offer feature updates to devices running Windows 10 1709 or higher. See [Feature updates are not being offered while other updates are](https://docs.microsoft.com/windows/deployment/update/windows-update-troubleshooting#feature-updates-are-not-being-offered-while-other-updates-are).

@ -194,6 +197,9 @@ manager: dansimp
  <dd>
    <a href="#update-setedurestart">Update/SetEDURestart</a>
  </dd>
+  <dd> 
+    <a href="#update-targetreleaseversion">Update/TargetReleaseVersion</a> 
+  </dd>
  <dd>
    <a href="#update-updatenotificationlevel">Update/UpdateNotificationLevel</a>
  </dd>
@ -4130,6 +4136,74 @@ The following list shows the supported values:

 <hr/>

+<!--Policy-->
+<a href="" id="update-targetreleaseversion"></a>**Update/TargetReleaseVersion**  
+
+<!--SupportedSKUs-->
+<table>
+<tr>
+    <th>Windows Edition</th>
+    <th>Supported?</th>
+</tr>
+<tr>
+    <td>Home</td>
+    <td><img src="images/crossmark.png" alt="cross mark" /></td>
+</tr>
+<tr>
+    <td>Pro</td>
+    <td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+</tr>
+<tr>
+    <td>Business</td>
+    <td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+</tr>
+<tr>
+    <td>Enterprise</td>
+    <td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+</tr>
+<tr>
+    <td>Education</td>
+    <td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+</tr>
+</table>
+
+<!--/SupportedSKUs-->
+<hr/>
+
+<!--Scope-->
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+<hr/>
+
+<!--/Scope-->
+<!--Description-->
+Available in Windows 10, version 1803 and later. Enables IT administrators to specify which version they would like their device(s) to move to and/or stay on until they reach end of service or reconfigure the policy. For details about different Windows 10 versions, see [Windows 10 release information](https://docs.microsoft.com/windows/release-information/).
+<!--/Description-->
+<!--ADMXMapped-->
+ADMX Info:  
+-   GP English name: *Select the target Feature Update version*
+-   GP name: *TargetReleaseVersion*
+-   GP element: *TargetReleaseVersionId*
+-   GP path: *Windows Components/Windows Update/Windows Update for Business*
+-   GP ADMX file name: *WindowsUpdate.admx*
+
+<!--/ADMXMapped-->
+<!--SupportedValues-->
+Value type is a string containing Windows 10 version number. For example, 1809, 1903.
+<!--/SupportedValues-->
+<!--Example-->
+
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--/Policy-->
+
+<hr/>
+
 <!--Policy-->
 <a href="" id="update-updatenotificationlevel"></a>**Update/UpdateNotificationLevel**  

@ -4371,11 +4445,13 @@ ADMX Info:

 Footnotes:

-   1 - Added in Windows 10, version 1607.
-   2 - Added in Windows 10, version 1703.
-   3 - Added in Windows 10, version 1709.
-   4 - Added in Windows 10, version 1803.
-   5 - Added in Windows 10, version 1809.
-   6 - Added in Windows 10, version 1903.
+-   1 - Available in Windows 10, version 1607.
+-   2 - Available in Windows 10, version 1703.
+-   3 - Available in Windows 10, version 1709.
+-   4 - Available in Windows 10, version 1803.
+-   5 - Available in Windows 10, version 1809.
+-   6 - Available in Windows 10, version 1903.
+-   7 - Available in Windows 10, version 1909.
+
 <!--/Policies-->