mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-06-15 10:23:37 +00:00
resolved merge errors (there were none)
This commit is contained in:
@ -73,16 +73,23 @@ MBR2GPT: Validation completed successfully
|
||||
|
||||
In the following example:
|
||||
|
||||
1. The current disk partition layout is displayed prior to conversion - three partitions are present on the MBR disk (disk 0): a system reserved partition, a Windows partition, and a recovery partition. A DVD-ROM is also present as volume 0.
|
||||
1. Using DiskPart, the current disk partition layout is displayed prior to conversion - three partitions are present on the MBR disk (disk 0): a system reserved partition, a Windows partition, and a recovery partition. A DVD-ROM is also present as volume 0.
|
||||
2. The OS volume is selected, partitions are listed, and partition details are displayed for the OS partition. The [MBR partition type](https://msdn.microsoft.com/library/windows/desktop/aa363990.aspx) is **07** corresponding to the installable file system (IFS) type.
|
||||
2. The MBR2GPT tool is used to convert disk 0.
|
||||
3. The DISKPART tool displays that disk 0 is now using the GPT format.
|
||||
3. The DiskPart tool displays that disk 0 is now using the GPT format.
|
||||
4. The new disk layout is displayed - four partitions are present on the GPT disk: three are identical to the previous partitions and one is the new EFI system partition (volume 3).
|
||||
5. The OS volume is selected again, and detail displays that it has been converted to the [GPT partition type](https://msdn.microsoft.com/library/windows/desktop/aa365449.aspx) of **ebd0a0a2-b9e5-4433-87c0-68b6b72699c7** corresponding to the **PARTITION_BASIC_DATA_GUID** type.
|
||||
|
||||
>As noted in the output from the MBR2GPT tool, you must make changes to the computer firmware so that the new EFI system partition will boot properly.
|
||||
|
||||
```
|
||||
X:\>DiskPart
|
||||
|
||||
Microsoft DiskPart version 10.0.15048.0
|
||||
|
||||
Copyright (C) Microsoft Corporation.
|
||||
On computer: MININT-K71F13N
|
||||
|
||||
DISKPART> list volume
|
||||
|
||||
Volume ### Ltr Label Fs Type Size Status Info
|
||||
@ -140,7 +147,7 @@ MBR2GPT: Fixing drive letter mapping
|
||||
MBR2GPT: Conversion completed successfully
|
||||
MBR2GPT: Before the new system can boot properly you need to switch the firmware to boot to UEFI mode!
|
||||
|
||||
X:\>diskpart
|
||||
X:\>DiskPart
|
||||
|
||||
Microsoft DiskPart version 10.0.15048.0
|
||||
|
||||
@ -364,9 +371,16 @@ You can also view the partition type of a disk by opening the Disk Management to
|
||||

|
||||
|
||||
|
||||
If Windows PowerShell and Disk Management are not available, such as when you are using Windows PE, you can determine the partition type at a command prompt with the diskpart tool. To determine the partition style, type **diskpart** and then type **list disk**. See the following example:
|
||||
If Windows PowerShell and Disk Management are not available, such as when you are using Windows PE, you can determine the partition type at a command prompt with the DiskPart tool. To determine the partition style from a command line, type **diskpart** and then type **list disk**. See the following example:
|
||||
|
||||
```
|
||||
X:\>DiskPart
|
||||
|
||||
Microsoft DiskPart version 10.0.15048.0
|
||||
|
||||
Copyright (C) Microsoft Corporation.
|
||||
On computer: MININT-K71F13N
|
||||
|
||||
DISKPART> list disk
|
||||
|
||||
Disk ### Status Size Free Dyn Gpt
|
||||
|
@ -44,7 +44,7 @@ With Windows Update for Business, you can set a device to be on either the Curre
|
||||
| GPO for version 1607 and above: </br>Computer Configuration > Administrative Templates > Windows Components > Windows Update > Defer Windows Updates > **Select when Feature Updates are received** | \Policies\Microsoft\Windows\WindowsUpdate\BranchReadinessLevel |
|
||||
| GPO for version 1511: </br>Computer Configuration > Administrative Templates > Windows Components > Windows Update > **Defer Upgrades and Updates** | \Policies\Microsoft\Windows\WindowsUpdate\DeferUpgrade |
|
||||
| MDM for version 1607 and above: </br>../Vendor/MSFT/Policy/Config/Update/</br>**BranchReadinessLevel** | \Microsoft\PolicyManager\default\Update\BranchReadinessLevel |
|
||||
| MDM for version 1511: </br>../Vendor/MSFT/Policy/Config/Update/</br>**RequireDeferredUpgrade** | \Microsoft\PolicyManager\default\Update\RequireDeferUpgrade |
|
||||
| MDM for version 1511: </br>../Vendor/MSFT/Policy/Config/Update/</br>**RequireDeferUpgrade** | \Microsoft\PolicyManager\default\Update\RequireDeferUpgrade |
|
||||
|
||||
Starting with version 1703, users are able to configure their device's branch readiness level, by going to **Settings > Update & security > Windows Update > Advanced options**.
|
||||
|
||||
|
@ -60,7 +60,7 @@ Current Branch is the default servicing branch for all Windows 10 devices except
|
||||
|
||||
- In Windows 10, version 1511:
|
||||
|
||||
../Vendor/MSFT/Policy/Config/Update/**RequireDeferredUpgrade**
|
||||
../Vendor/MSFT/Policy/Config/Update/**RequireDeferUpgrade**
|
||||
|
||||
- In Windows 10, version 1607:
|
||||
|
||||
@ -70,7 +70,7 @@ Current Branch is the default servicing branch for all Windows 10 devices except
|
||||
|
||||
- In Windows 10 Mobile Enterprise, version 1511:
|
||||
|
||||
../Vendor/MSFT/Policy/Config/Update/RequireDeferredUpgrade
|
||||
../Vendor/MSFT/Policy/Config/Update/RequireDeferUpgrade
|
||||
|
||||
- In Windows 10 Mobile Enterprise, version 1607:
|
||||
|
||||
|
@ -16,17 +16,19 @@ This topic provides information on additional features that are available in Upg
|
||||
|
||||
The site discovery feature in Upgrade Readiness provides an inventory of web sites that are accessed by client computers using Internet Explorer on Windows 8.1 and Windows 7. Site discovery does not include sites that are accessed using other Web browsers, such as Microsoft Edge. Site inventory information is provided as optional data related to upgrading to Windows 10 and Internet Explorer 11, and is meant to help prioritize compatibility testing for web applications. You can make more informed decisions about testing based on usage data.
|
||||
|
||||
> Note: Site discovery data is disabled by default; you can find documentation on what is collected in the [Windows 7, Windows 8, and Windows 8.1 appraiser telemetry events and fields](https://go.microsoft.com/fwlink/?LinkID=822965). After you turn on this feature, data is collected on all sites visited by Internet Explorer, except during InPrivate sessions. In addition, the data collection process is silent, without notification to the employee. You are responsible for ensuring that your use of this feature complies with all applicable local laws and regulatory requirements, including any requirements to provide notice to employees.
|
||||
> [!NOTE]
|
||||
> Site discovery data is disabled by default; you can find documentation on what is collected in the [Windows 7, Windows 8, and Windows 8.1 appraiser telemetry events and fields](https://go.microsoft.com/fwlink/?LinkID=822965). After you turn on this feature, data is collected on all sites visited by Internet Explorer, except during InPrivate sessions. In addition, the data collection process is silent, without notification to the employee. You are responsible for ensuring that your use of this feature complies with all applicable local laws and regulatory requirements, including any requirements to provide notice to employees.
|
||||
|
||||
### Install prerequisite security update for Internet Explorer
|
||||
|
||||
Ensure the following prerequisites are met before using site discovery:
|
||||
|
||||
1. Install the latest [Windows Monthly Rollup](http://catalog.update.microsoft.com/v7/site/Search.aspx?q=security%20monthly%20quality%20rollup). This functionality has been included in Internet Explorer 11 starting with the July 2016 Cumulative Update.
|
||||
2. Install the update for customer experience and diagnostic telemetery ([KB3080149](https://support.microsoft.com/kb/3080149)).
|
||||
3. Enable Internet Explorer data collection, which is disabled by default. The best way to enable it is to modify the [Upgrade Readiness deployment script](upgrade-readiness-deployment-script.md) to allow Internet Explorer data collection before you run it.
|
||||
1. Install the prerequisite KBs to add Site Discovery support and the latest fixes from the [Microsoft Update Catalog](http://www.catalog.update.microsoft.com/home.aspx). Install the following:
|
||||
- For Windows 7 and Windows 8.1 - March, 2017 (or later) Security Monthly Rollup
|
||||
- For Windows 10 - Cumulative Update for Windows 10 Version 1607 (KB4015217) (or later)
|
||||
2. Enable Internet Explorer data collection, which is disabled by default. The best way to enable it is to modify the [Upgrade Readiness deployment script](upgrade-readiness-deployment-script.md) to allow Internet Explorer data collection before you run it. In addition, to enable Site Discovery on Windows 10 set **Enhanced Telemetry Level** for the Feedback and Diagnostics setting (Privacy > Feedback & Diagnostics settings), and enable **Page Prediction within Internet Explorer 11**.
|
||||
|
||||
If necessary, you can also enable it by creating the following registry entry.
|
||||
If necessary, you can also enable data collection by creating the following registry entry.
|
||||
|
||||
HKLM\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection
|
||||
|
||||
|
Reference in New Issue
Block a user