mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-06-15 02:13:43 +00:00
resolve the conflict
This commit is contained in:
huaping yu
@ -12,7 +12,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 11/15/2017
|
||||
---
|
||||
|
||||
# Customize Windows 10 Start and taskbar with Group Policy
|
||||
|
||||
@ -12,7 +12,6 @@ author: dansimp
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.localizationpriority: medium
|
||||
ms.date: 11/15/2017
|
||||
---
|
||||
|
||||
# Customize Windows 10 Start and taskbar with provisioning packages
|
||||
@ -48,7 +47,7 @@ Three features enable Start and taskbar layout control:
|
||||
|
||||
<span id="escape"/>
|
||||
|
||||
## Prepare the Start layout XML file
|
||||
## <a href="" id="escape"></a>Prepare the Start layout XML file
|
||||
|
||||
The **Export-StartLayout** cmdlet produces an XML file. Because Windows Configuration Designer produces a customizations.xml file that contains the configuration settings, adding the Start layout section to the customizations.xml file directly would result in an XML file embedded in an XML file. Before you add the Start layout section to the customizations.xml file, you must replace the markup characters in your layout.xml with escape characters.
|
||||
|
||||
@ -131,7 +130,6 @@ Use the Windows Configuration Designer tool to create a provisioning package. [L
|
||||
|
||||
## Related topics
|
||||
|
||||
|
||||
- [Manage Windows 10 Start and taskbar layout](windows-10-start-layout-options-and-policies.md)
|
||||
- [Configure Windows 10 taskbar](configure-windows-10-taskbar.md)
|
||||
- [Customize and export Start layout](customize-and-export-start-layout.md)
|
||||
@ -140,12 +138,3 @@ Use the Windows Configuration Designer tool to create a provisioning package. [L
|
||||
- [Customize Windows 10 Start and taskbar with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md)
|
||||
- [Customize Windows 10 Start and tasbkar with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
|
||||
- [Changes to Start policies in Windows 10](changes-to-start-policies-in-windows-10.md)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -7,10 +7,10 @@ ms.mktglfcycl: manage
|
||||
ms.sitesec: library
|
||||
ms.pagetype: security
|
||||
ms.localizationpriority: high
|
||||
author: jdeckerms
|
||||
ms.author: jdecker
|
||||
manager: dansimp
|
||||
author: dansimp
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 05/11/2018
|
||||
---
|
||||
|
||||
# Configure Windows 10
|
||||
|
||||
@ -9,7 +9,6 @@ ms.localizationpriority: medium
|
||||
author: dansimp
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 06/27/2018
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
@ -111,7 +110,7 @@ In Microsoft Intune, you create a device restrictions policy to apply to device
|
||||
|
||||
### Using a provisioning package
|
||||
|
||||
#### Prepare the Start layout and Edge assets XML files
|
||||
#### <a href="" id="escape"></a>Prepare the Start layout and Edge assets XML files
|
||||
|
||||
The **export-StartLayout** and **export-StartLayoutEdgeAssets** cmdlets produce XML files. Because Windows Configuration Designer produces a customizations.xml file that contains the configuration settings, adding the Start layout and Edge assets sections to the customizations.xml file directly would result in an XML file embedded in an XML file. Before you add the Start layout and Edge assets sections to the customizations.xml file, you must replace the markup characters in your layout.xml with escape characters.
|
||||
|
||||
|
||||
@ -4,9 +4,10 @@ description: This section describes the DeviceUpdateCenter settings that you can
|
||||
ms.prod: w10
|
||||
ms.mktglfcycl: deploy
|
||||
ms.sitesec: library
|
||||
author: jdeckerMS
|
||||
author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: jdecker
|
||||
ms.author: dansimp
|
||||
manager: dansimp
|
||||
ms.topic: article
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 10/02/2018
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 04/30/2018
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 04/30/2018
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 09/12/2017
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 09/06/2017
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 09/06/2017
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 09/06/2017
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 09/06/2017
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 09/06/2017
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -4,9 +4,10 @@ description: This section describes the Privacy settings that you can configure
|
||||
ms.prod: w10
|
||||
ms.mktglfcycl: deploy
|
||||
ms.sitesec: library
|
||||
author: jdeckerMS
|
||||
author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: jdecker
|
||||
ms.author: dansimp
|
||||
manager: dansimp
|
||||
ms.topic: article
|
||||
---
|
||||
|
||||
|
||||
@ -4,10 +4,11 @@ description: This section describes the StorageD3InModernStandby settings that y
|
||||
ms.prod: w10
|
||||
ms.mktglfcycl: deploy
|
||||
ms.sitesec: library
|
||||
author: jdeckerMS
|
||||
author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: jdecker
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
# StorageD3InModernStandby (Windows Configuration Designer reference)
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 09/06/2017
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -4,9 +4,10 @@ description: This section describes the Time settings that you can configure in
|
||||
ms.prod: w10
|
||||
ms.mktglfcycl: deploy
|
||||
ms.sitesec: library
|
||||
author: jdeckerMS
|
||||
author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: jdecker
|
||||
ms.author: dansimp
|
||||
manager: dansimp
|
||||
ms.topic: article
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 10/02/2018
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 04/30/2018
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 09/14/2017
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 09/14/2017
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 04/30/2018
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 10/02/2018
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 04/30/2018
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
@ -8,7 +8,6 @@ author: dansimp
|
||||
ms.localizationpriority: medium
|
||||
ms.author: dansimp
|
||||
ms.topic: article
|
||||
ms.date: 07/19/2018
|
||||
ms.reviewer:
|
||||
manager: dansimp
|
||||
---
|
||||
|
||||
Reference in New Issue
Block a user