updates

education/windows/TOC.yml

@@ -23,7 +23,7 @@ items:
     - name: Windows 10 editions for education customers
       href: windows-editions-for-education-customers.md
     - name: Shared PC mode
-      href: ../../windows/configuration/shared-pc-mode-technical.md
+      href: ../../windows/configuration/shared-devices-concepts.md
     - name: Windows 10 configuration recommendations for education customers
       href: configure-windows-for-education.md
     - name: Take tests and assessments in Windows
@@ -37,7 +37,7 @@ items:
     - name: Configure Take a Test in kiosk mode
       href: edu-take-a-test-kiosk-mode.md
     - name: Configure Shared PC mode
-      href: ../../windows/configuration/shared-pc-mode-technical.md
+      href: ../../windows/configuration/shared-pc-technical.md
     - name: Use the Set up School PCs app
       href: use-set-up-school-pcs-app.md
     - name: Change Windows edition
@@ -97,5 +97,5 @@ items:
     - name: Take a Test technical reference
       href: take-a-test-app-technical.md
     - name: Shared PC mode technical reference
-      href: ../../windows/configuration/shared-pc-mode-technical.md
+      href: ../../windows/configuration/shared-pc-technical.md
       

education/windows/index.yml

@@ -94,4 +94,4 @@ landingContent:
         - text: Configure Take a Test in kiosk mode
           url: edu-take-a-test-kiosk-mode.md
         - text: Configure Shared PC mode
-          url: ../../windows/configuration/shared-pc-mode-technical.md
+          url: ../../windows/configuration/shared-pc-technical.md

education/windows/set-up-school-pcs-shared-pc-mode.md

@@ -1,79 +0,0 @@
----
-title: Shared PC mode for school devices
-description: Describes how shared PC mode is set for devices set up with the Set up School PCs app.
-keywords: shared PC, school, set up school pcs
-ms.prod: windows
-ms.mktglfcycl: plan
-ms.sitesec: library
-ms.pagetype: edu
-ms.localizationpriority: medium
-ms.collection: education
-author: paolomatarazzo
-ms.author: paoloma
-ms.date: 08/10/2022
-ms.reviewer: 
-manager: aaroncz
-appliesto:
-- ✅ <b>Windows 10</b>
----  
-
-# Shared PC mode for school devices
-
-Shared PC mode optimizes Windows 10 for shared use scenarios, such as classrooms and school libraries.  A Windows 10 PC in shared PC mode requires minimal to zero maintenance and management. Update settings are optimized for classroom settings, so that they automatically occur outside of school hours.
-
-Shared PC mode can be applied on devices running:
-* Windows 10 Pro
-* Windows 10 Pro Education
-* Windows 10 Education
-* Windows 10 Enterprise  
-
-To learn more about how to set up a device in shared PC mode, see [Set up a shared or guest PC with Windows 10](/windows/configuration/set-up-shared-or-guest-pc).  
-
-## Windows Updates
-Shared PC mode configures power and Windows Update settings so that computers update regularly. Computers that are set up through the Set up School PCs app are configured to:  
-* Wake nightly.  
-* Check for and install updates.  
-* Forcibly reboot, when necessary, to complete updates.  
-
-These configurations reduce the need to update and reboot computers during daytime work hours. Notifications about needed updates are also blocked from disrupting students.
-
-## Default admin accounts in Azure Active Directory  
-By default, the account that joins your computer to Azure AD will be given admin permissions on the computer. Global administrators in the joined Azure AD domain will also have admin permissions when signed in to the joined computer.  
-
-An Azure AD Premium subscription lets you specify the accounts that get admin accounts on a computer. These accounts are configured in Intune in the Azure portal.  
-
-## Account deletion policies
-This section describes the deletion behavior for the accounts configured in shared PC mode. A delete policy makes sure that outdated or stale accounts are regularly removed to make room for new accounts. 
-
-### Azure AD accounts
-
-The default deletion policy is set to automatically cache accounts. Cached accounts are automatically deleted when disk space gets too low, or when there's an extended period of inactivity. Accounts continue to delete until the computer reclaims sufficient disk space. Deletion policies behave the same for Azure AD and Active Directory domain accounts. 
-
-### Guest and Kiosk accounts
-Guest accounts and accounts created through Kiosk are deleted after they sign out of their account.
-
-### Local accounts
-Local accounts that you created before enabling shared PC mode aren't deleted. Local accounts that you create through the following path, after enabling PC mode, are not deleted: **Settings** app > **Accounts** > **Other people** > **Add someone**     
-
-## Create custom Windows images
-Shared PC mode is compatible with custom Windows images.  
-
-To create a compatible image, first create your custom Windows image with all software, updates, and drivers. Then use the System Preparation (Sysprep) tool with the `/oobe` flag to create the SharedPC-compatible version. For example, `sysrep/oobe`.
-
-Teachers can then run the Set up School PCs package on the computer.  
-
-## Optimize device for use by a single student
-Shared PC mode is enabled by default. This mode optimizes device settings for schools where PCs are shared by students. The  Set up School PCs app also offers the option to configure settings for devices that aren't shared.
-  
-If you select this setting, the app modifies shared PC mode so that it's appropriate for a single device. To see how the settings differ, refer to the Shared PC mode policy table in the article [What's in my provisioning package?](set-up-school-pcs-provisioning-package.md)  
-1. In the app, go to the **Create package** > **Settings** step. 
-2. Select **Optimize device for a single student, instead of a shared cart or lab**.  
-
-## Next steps  
-Learn more about setting up devices with the Set up School PCs app.  
-* [Azure AD Join with Set up School PCs](set-up-school-pcs-azure-ad-join.md)
-* [Set up School PCs technical reference](set-up-school-pcs-technical.md)
-* [What's in my provisioning package](set-up-school-pcs-provisioning-package.md)
-* [Set up Windows 10 devices for education](set-up-windows-10.md) 
-
-When you're ready to create and apply your provisioning package, see [Use Set up School PCs app](use-set-up-school-pcs-app.md).

windows/configuration/set-up-shared-or-guest-pc.md

@@ -18,7 +18,7 @@ appliesto:
 
 # Set up a shared or guest Windows device
 
-Shared PC mode exposes a set of customizations to tailor the behavior to your requirements. These customizations are the options that you'll set either using Intune/MDM, a provisioning package, or via PowerShell scripting as explained in [Configuring Shared PC mode](#configuring-shared-pc-mode). The customizations offered by Shared PC are listed in the following table.
+Shared PC mode exposes a set of customizations to tailor the behavior to your requirements. These customizations are the options that you'll set either using Intune/MDM, a provisioning package, or via PowerShell scripting as explained in [Configure Shared PC mode](#configure-shared-pc-mode). The customizations offered by Shared PC are listed in the following table.
 
 | Setting | Description|
 |:---|:---|
@@ -26,7 +26,6 @@ Shared PC mode exposes a set of customizations to tailor the behavior to your re
 | SetEduPolicies | When enabled, different settings designed for education devices are configured in the local GPO. For a detailed list of settings enabled SetEduPolicies, see [Technical Guide]</li><li>This setting controls the API:[IsEducationEnvironment](/uwp/api/windows.system.profile.educationsettings)|
 | SetPowerPolicies | When enabled, different power settings optimized for shared devices are configured in the local GPO, preventing users from making any changes. This policy ensures that devices wake during the maintenance period. For a detailed list of settings enabled SetPowerPolicies, see [Technical Guide]</li>**configures lid close and power button actions to sleep and disables hibernate**|
 | AccountModel | This option controls how users can sign-in on the PC. <li>Specifying **Domain-joined and guest** option to add the **Guest** button to the sign-in screen</li><li>Specify **Domain-joined only** to only allow users to sign in with an Active Directory, Azure AD, or local account</li> |
-
 | AccountManagement| DeletionPolicy | - **Delete immediately** will delete the account on sign-out. <br/><br/>- **Delete at disk space threshold** will start deleting accounts when available disk space falls below the threshold you set for **DiskLevelDeletion**, and it will stop deleting accounts when the available disk space reaches the threshold you set for **DiskLevelCaching**. Accounts are deleted in order of oldest accessed to most recently accessed. <br/><br/>Example: The caching number is 50 and the deletion number is 25. Accounts will be cached while the free disk space is above 25%. When the free disk space is less than 25% (the deletion number) at a maintenance period, accounts will be deleted (oldest last used first) until the free disk space is above 50% (the caching number). Accounts will be deleted immediately at sign-off of an account if free space is under the deletion threshold and disk space is very low, regardless if the PC is actively in use or not. <br/>- **Delete at disk space threshold and inactive threshold** will apply the same disk space checks as noted above, but also delete accounts if they have not signed in within the number of days specified by **InactiveThreshold**  |
 | AccountManagement| DiskLevelCaching | If you set **DeletionPolicy** to **Delete at disk space threshold**, set the percent of total disk space to be used as the disk space threshold for account caching.   |
 | AccountManagement| DiskLevelDeletion | If you set **DeletionPolicy** to **Delete at disk space threshold**, set the percent of total disk space to be used as the disk space threshold for account deletion.   |
@@ -37,8 +36,6 @@ Shared PC mode exposes a set of customizations to tailor the behavior to your re
 | Customization| MaintenanceStartTime | By default, the maintenance start time (which is when automatic maintenance tasks run, such as Windows Update) is midnight. You can adjust the start time in this setting by entering a new start time in minutes from midnight. For example, if you want maintenance to begin at 2 AM, enter `120` as the value.   |
 | Customization| MaxPageFileSizeMB | Adjusts the maximum page file size in MB. This can be used to fine-tune page file behavior, especially on low end PCs.  |  
 | Customization| RestrictLocalStorage | Set as **True** to restrict the user from saving or viewing local storage when using File Explorer. This setting controls this API: [ShouldAvoidLocalStorage](/uwp/api/windows.system.profile.sharedmodesettings)  | 
-
-
 | Customization| SignInOnResume | This setting specifies if the user is required to sign in with a password when the PC wakes from sleep.     |
 | Customization| SleepTimeout | Specifies all timeouts for when the PC should sleep. Enter the amount of idle time in seconds. If you don't set sleep timeout, the default of 1 hour applies.     |
 [Policies: Authentication](wcd/wcd-policies.md#authentication) (optional related setting) | Enables a quick first sign-in experience for a user by automatically connecting new non-admin Azure AD accounts to the pre-configured candidate local accounts.