From 4582fb684df2c803eae540b99140893aa42441f5 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Tue, 28 Feb 2017 16:17:04 -0800 Subject: [PATCH 01/54] stub topic --- windows/deploy/TOC.md | 1 + windows/deploy/index.md | 1 + windows/deploy/mbr-to-gpt.md | 82 ++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 windows/deploy/mbr-to-gpt.md diff --git a/windows/deploy/TOC.md b/windows/deploy/TOC.md index 98951382e3..e4aced3ac2 100644 --- a/windows/deploy/TOC.md +++ b/windows/deploy/TOC.md @@ -51,6 +51,7 @@ ## [Upgrade to Windows 10 with the Microsoft Deployment Toolkit](upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md) ## [Upgrade to Windows 10 with System Center Configuration Manager](upgrade-to-windows-10-with-system-center-configuraton-manager.md) ## [Resolve Windows 10 upgrade errors](resolve-windows-10-upgrade-errors.md) +## [Convert MBR partition to GPT](mbr-to-gpt.md) ## [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) ## [Windows 10 upgrade paths](windows-10-upgrade-paths.md) ## [Windows 10 edition upgrade](windows-10-edition-upgrades.md) diff --git a/windows/deploy/index.md b/windows/deploy/index.md index b2d4ab858c..e3af726270 100644 --- a/windows/deploy/index.md +++ b/windows/deploy/index.md @@ -24,6 +24,7 @@ Learn about deploying Windows 10 for IT professionals. |[Upgrade to Windows 10 with the Microsoft Deployment Toolkit](upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md) |The simplest path to upgrade PCs that are currently running Windows 7, Windows 8, or Windows 8.1 to Windows 10 is through an in-place upgrade. You can use a Microsoft Deployment Toolkit (MDT) 2013 Update 2 task sequence to completely automate the process. | |[Upgrade to Windows 10 with System Center Configuration Manager](upgrade-to-windows-10-with-system-center-configuraton-manager.md) |The simplest path to upgrade PCs currently running Windows 7, Windows 8, or Windows 8.1 to Windows 10 is through an in-place upgrade. You can use a System Center Configuration Manager task sequence to completely automate the process. | |[Resolve Windows 10 upgrade errors](resolve-windows-10-upgrade-errors.md) |This topic provides a brief introduction to Windows 10 installation processes, and provides resolution procedures that IT administrators can use to resolve issues with Windows 10 upgrade. | +|[Convert MBR partition to GPT](mbr-to-gpt.md) |This topic provides detailed instructions for using the MBR2GPT partition conversion tool. | |[Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) |This guide describes how to configure a PXE server to load Windows PE by booting a client computer from the network. | |[Windows 10 edition upgrade](windows-10-edition-upgrades.md) |With Windows 10, you can quickly upgrade from one edition of Windows 10 to another, provided the upgrade path is supported. | | [Provisioning packages for Windows 10](provisioning-packages.md) | Learn how to use the Windows Imaging and Configuration Designer (ICD) and provisioning packages to easily configure multiple devices. | diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md new file mode 100644 index 0000000000..8e861df720 --- /dev/null +++ b/windows/deploy/mbr-to-gpt.md @@ -0,0 +1,82 @@ +--- +title: MBR to GPT partition conversion tool +description: How to use the MBR2GPT tool to convert partitions +keywords: deploy, troubleshoot, windows, 10, upgrade, partition, mbr, gpt +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: deploy +author: greg-lindsay +localizationpriority: high +--- + +# MBR to GPT conversion tool + +**Applies to** +- Windows 10 + +>**Important**: This topic contains technical instructions for IT administrators. If you are not an IT administrator, .... + +## In this topic + +This topic contains ...: + +- [Background](#background): A.
+- [Requirements](#requirements): B.
+- [Syntax](#syntax): C. + - [Command line options](#command-line-options): D. + - [Examples](#examples): E. +- [Conversion workflow](#conversion-workflow): F. + - [Validation](#validation): G. + - [Repartitioning](#repartitioning): H. +- [Troubleshooting](#troubleshooting): I. + + +## Background + +The ...: + +1. **Something**: 1 +2. **Something**: 2 + - Example +3. **Something**: 3 + - Example +4. **Something**: 4 + - Example +5. **Something**: 5 + - Example + +**Figure 1**: 1: + +Image here + +definitions + +## Requirements + +The following ... + +Table or list here + +## Syntax + +### Command line options + +### Examples + +## Conversion workflow + +### Validation + +### Repartitioning + +## Troubleshooting + + +## Related topics + +[Windows 10 FAQ for IT professionals](https://technet.microsoft.com/en-us/windows/dn798755.aspx) +
[Windows 10 Enterprise system requirements](https://technet.microsoft.com/en-us/windows/dn798752.aspx) +
[Windows 10 Specifications](https://www.microsoft.com/en-us/windows/Windows-10-specifications) +
[Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro) +
[Fix Windows Update errors by using the DISM or System Update Readiness tool](https://support.microsoft.com/kb/947821) From a7c17cf6c3279549d735c79c9fab59ee3b07a37b Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Tue, 28 Feb 2017 16:59:38 -0800 Subject: [PATCH 02/54] stub topic --- windows/deploy/mbr-to-gpt.md | 54 ++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 8e861df720..12758b48e6 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -23,6 +23,7 @@ This topic contains ...: - [Background](#background): A.
- [Requirements](#requirements): B.
+- [How to use MBR2GPT](#how-to): BB - [Syntax](#syntax): C. - [Command line options](#command-line-options): D. - [Examples](#examples): E. @@ -58,10 +59,63 @@ The following ... Table or list here +## How to use MBR2GPT + ## Syntax ### Command line options +| Option | Description | +|----|-------------| +|/disk:\| This option specifies the Diskpart-reported disk number of the disk to be converted to GPT. If the option isn’t specified, the system disk is used. (System disk is determined using the same mechanism behind Diskpart’s “SELECT DISK SYSTEM” command.) | +|opt|desc| +|opt|desc| +|opt|desc| +|opt|desc| +|opt|desc| +|opt|desc| + +### Help + +``` + +C:\> mbr2gpt /? + +Converts a disk from MBR to GPT partitioning without modifying or deleting data on the disk. + +MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS] + +Where: + + /validate + - Validates that the selected disk can be converted + without performing the actual conversion. + + /convert + - Validates that the selected disk can be converted + and performs the actual conversion. + + /disk: + - Specifies the disk number of the disk to be processed. + If not specified, the system disk is processed. + + /logs: + - Specifies the directory for logging. By default logs + are created in the %windir% directory. + + /map:= + - Specifies the GPT partition type to be used for a + given MBR partition type not recognized by Windows. + Multiple /map switches are allowed. + + /allowFullOS + - Allows the tool to be used from the full Windows + environment. By default, this tool can only be used + from the Windows Preinstallation Environment. + + +``` + ### Examples ## Conversion workflow From 236f22d261dfbf3e3699a0062704f5b4dd8ec42f Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Wed, 1 Mar 2017 14:12:12 -0800 Subject: [PATCH 03/54] draft --- windows/deploy/mbr-to-gpt.md | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 12758b48e6..24f6985f1c 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -1,5 +1,5 @@ --- -title: MBR to GPT partition conversion tool +title: MBR2GPT description: How to use the MBR2GPT tool to convert partitions keywords: deploy, troubleshoot, windows, 10, upgrade, partition, mbr, gpt ms.prod: w10 @@ -10,27 +10,29 @@ author: greg-lindsay localizationpriority: high --- -# MBR to GPT conversion tool +# MBR2GPT.EXE **Applies to** - Windows 10 ->**Important**: This topic contains technical instructions for IT administrators. If you are not an IT administrator, .... +MBR2GPT.EXE converts a disk from Master Boot Record (MBR) to GUID Partition Table (GPT) partition style without modifying or deleting data on the disk. -## In this topic -This topic contains ...: +## Syntax + +``` +MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS] +``` + +| Option | Description | +|----|-------------| +|/validate| This option instructs MBR2GPT.exe to perform only the disk validation steps and reports whether the disk is eligible for conversion. | +|/convert| This option instructs MBR2GPT.exe to perform the disk validation and to proceed with the conversion if all validations pass. | +|/disk:| This option specifies the Diskpart-reported disk number of the disk to be converted to GPT. If the option isn’t specified, the system disk is used. (System disk is determined using the same mechanism behind Diskpart’s “SELECT DISK SYSTEM” command.)| +|/logs:| This options specifies the directory where MBR2GPT.exe’s logs should be written. If not specified, %windir% is used.| +|/map:=| This option specifies additional partition type mappings between MBR and GPT.| +|/allowFullOS| By default, MBR2GPT.exe is blocked unless it is run from WinPE. This option overrides this block and allows conversion while running in the full Windows environment.| -- [Background](#background): A.
-- [Requirements](#requirements): B.
-- [How to use MBR2GPT](#how-to): BB -- [Syntax](#syntax): C. - - [Command line options](#command-line-options): D. - - [Examples](#examples): E. -- [Conversion workflow](#conversion-workflow): F. - - [Validation](#validation): G. - - [Repartitioning](#repartitioning): H. -- [Troubleshooting](#troubleshooting): I. ## Background From 8e55bd2f43398bad4923c84c89b8ed0afef471b0 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Wed, 1 Mar 2017 16:18:03 -0800 Subject: [PATCH 04/54] draft --- windows/deploy/images/mbr2gpt-volume.PNG | Bin 0 -> 16765 bytes windows/deploy/mbr-to-gpt.md | 71 ++++++++--------------- 2 files changed, 24 insertions(+), 47 deletions(-) create mode 100644 windows/deploy/images/mbr2gpt-volume.PNG diff --git a/windows/deploy/images/mbr2gpt-volume.PNG b/windows/deploy/images/mbr2gpt-volume.PNG new file mode 100644 index 0000000000000000000000000000000000000000..d69bed87fb01a1134dde922ecf9df866000528bc GIT binary patch literal 16765 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] [/logs:] [/map: | Option | Description | |----|-------------| -|/validate| This option instructs MBR2GPT.exe to perform only the disk validation steps and reports whether the disk is eligible for conversion. | -|/convert| This option instructs MBR2GPT.exe to perform the disk validation and to proceed with the conversion if all validations pass. | -|/disk:| This option specifies the Diskpart-reported disk number of the disk to be converted to GPT. If the option isn’t specified, the system disk is used. (System disk is determined using the same mechanism behind Diskpart’s “SELECT DISK SYSTEM” command.)| -|/logs:| This options specifies the directory where MBR2GPT.exe’s logs should be written. If not specified, %windir% is used.| -|/map:=| This option specifies additional partition type mappings between MBR and GPT.| -|/allowFullOS| By default, MBR2GPT.exe is blocked unless it is run from WinPE. This option overrides this block and allows conversion while running in the full Windows environment.| +|/validate| Instructs MBR2GPT.exe to perform only the disk validation steps and report whether the disk is eligible for conversion. | +|/convert| Instructs MBR2GPT.exe to perform the disk validation and to proceed with the conversion if all validation tests pass. | +|/disk:\| Specifies the disk number of the disk to be converted to GPT. If not specified, the system disk is used. The mechanism used is the same as that used by the diskpart.exe tool **SELECT DISK SYSTEM** command.| +|/logs:\| Specifies the directory where MBR2GPT.exe logs should be written. If not specified, **%windir%** is used.| +|/map:\=\| Specifies additional partition type mappings between MBR and GPT.| +|/allowFullOS| By default, MBR2GPT.exe is blocked unless it is run from WinPE. This option overrides this block and enables disk conversion while running in the full Windows environment. You cannot convert the system disk using this option.| +|/silent| Suppresses all warning messages so that the utility can be used in scripts.| + +>You can use MBR2GPT to convert an MBR disk with BitLocker-encrypted volumes as long as protection has been suspended. To resume BitLocker after conversion, you will need to delete the existing protectors and recreate them. + +## Examples -## Background +## Specifications -The ...: -1. **Something**: 1 -2. **Something**: 2 - - Example -3. **Something**: 3 - - Example -4. **Something**: 4 - - Example -5. **Something**: 5 - - Example +### Troubleshooting -**Figure 1**: 1: +#### Determining partition type -Image here +You can type the following command at a Windows PowerShell prompt to display the disk number and partition type. Example output is also shown. -definitions -## Requirements +``` +PS C:\> Get-Disk | ft -Auto -The following ... +Number Friendly Name Serial Number HealthStatus OperationalStatus Total Size Partition Style +------ ------------- ------------- ------------ ----------------- ---------- --------------- +0 MTFDDAK256MAM-1K1 13050928F47C Healthy Online 238.47 GB MBR +1 ST1000DM003-1ER162 Z4Y3GD8F Healthy Online 931.51 GB GPT +``` -Table or list here +You can also view the partition type of a disk by opening the Disk Management tool, right-clicking the disk number, clicking **Properties**, and then clicking the **Volumes** tab. See the following example: -## How to use MBR2GPT +![Volumes](images/mbr2gpt-volume.PNG) -## Syntax -### Command line options -| Option | Description | -|----|-------------| -|/disk:\| This option specifies the Diskpart-reported disk number of the disk to be converted to GPT. If the option isn’t specified, the system disk is used. (System disk is determined using the same mechanism behind Diskpart’s “SELECT DISK SYSTEM” command.) | -|opt|desc| -|opt|desc| -|opt|desc| -|opt|desc| -|opt|desc| -|opt|desc| - -### Help ``` @@ -118,15 +104,6 @@ Where: ``` -### Examples - -## Conversion workflow - -### Validation - -### Repartitioning - -## Troubleshooting ## Related topics From a2cc430a2f762e7b61901e73f3e74ce700fb452c Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 16:12:36 -0800 Subject: [PATCH 05/54] updates on preview topic --- .../preview-windows-defender-advanced-threat-protection.md | 6 +++--- ...le-alerts-windows-defender-advanced-threat-protection.md | 2 +- ...ne-alerts-windows-defender-advanced-threat-protection.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md b/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md index a85f157968..497bdf6d58 100644 --- a/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md @@ -34,12 +34,12 @@ For more information, see [Turn on the preview experience](preview-settings-wind ## Preview features The following features are included in the preview release: -- [Take response actions on a machine](respond-machine-alerts-windows-defender-advanced-threat-protection.md) - Take action on machine related alerts to quickly respond to detected attacks by isolating machines or collecting an investigation package. +- [Take response actions on a machine](respond-machine-alerts-windows-defender-advanced-threat-protection.md) - Quickly respond to detected attacks by isolating machines or collecting an investigation package. - [Isolate machines from the network](respond-machine-alerts-windows-defender-advanced-threat-protection.md#isolate-machines-from-the-network) - [Undo machine isolation](respond-machine-alerts-windows-defender-advanced-threat-protection.md#undo-machine-isolation) - [Collect investigation package](respond-machine-alerts-windows-defender-advanced-threat-protection.md#collect-investigation-package-from-machines) -- [Take response actions on a file](respond-file-alerts-windows-defender-advanced-threat-protection.md) - Take action on file related alerts to quickly respond to detected attacks by stopping and quarantining files or blocking a file. +- [Take response actions on a file](respond-file-alerts-windows-defender-advanced-threat-protection.md) - Quickly respond to detected attacks by stopping and quarantining files or blocking a file. - [Stop and quarantine files in your network](respond-file-alerts-windows-defender-advanced-threat-protection.md#stop-and-quarantine-files-in-your-network) - [Remove file from quarantine](respond-file-alerts-windows-defender-advanced-threat-protection.md#remove-file-from-quarantine) - [Block files in your network](respond-file-alerts-windows-defender-advanced-threat-protection.md#block-files-in-your-network) @@ -48,4 +48,4 @@ The following features are included in the preview release: - [Fix unhealthy sensors](fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md) >[!NOTE] -> All response features require machines to be on the latest Windows 10 Insider Preview build and above. +> All response actions require machines to be on the latest Windows 10 Insider build. diff --git a/windows/keep-secure/respond-file-alerts-windows-defender-advanced-threat-protection.md b/windows/keep-secure/respond-file-alerts-windows-defender-advanced-threat-protection.md index 4cd712c7a8..0d15caf8a1 100644 --- a/windows/keep-secure/respond-file-alerts-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/respond-file-alerts-windows-defender-advanced-threat-protection.md @@ -23,7 +23,7 @@ localizationpriority: high [Some information relates to pre–released product, which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.] -You can take action on file related alerts to quickly respond to detected attacks by stopping and quarantining files or blocking a file. After taking action on files, you can check activity details on the Action center. +Quickly respond to detected attacks by stopping and quarantining files or blocking a file. After taking action on files, you can check activity details on the Action center. >[!NOTE] > These response actions are only available for machines on Windows 10, version 1703. diff --git a/windows/keep-secure/respond-machine-alerts-windows-defender-advanced-threat-protection.md b/windows/keep-secure/respond-machine-alerts-windows-defender-advanced-threat-protection.md index e4ffc6abe9..7262eeac48 100644 --- a/windows/keep-secure/respond-machine-alerts-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/respond-machine-alerts-windows-defender-advanced-threat-protection.md @@ -23,7 +23,7 @@ localizationpriority: high [Some information relates to pre-released product, which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.] -You can take action on machine related alerts to quickly respond to detected attacks by isolating machines or collecting an investigation package. After taking action on machines, you can check activity details on the Action center. +Quickly respond to detected attacks by isolating machines or collecting an investigation package. After taking action on machines, you can check activity details on the Action center. >[!NOTE] > These response actions are only available for machines on Windows 10, version 1703. From 68e5ef2174a0348c4446de9f1917ef2b4b295d8f Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 16:16:39 -0800 Subject: [PATCH 06/54] update product name --- .../preview-windows-defender-advanced-threat-protection.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md b/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md index 497bdf6d58..a64d8eede0 100644 --- a/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md @@ -48,4 +48,4 @@ The following features are included in the preview release: - [Fix unhealthy sensors](fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md) >[!NOTE] -> All response actions require machines to be on the latest Windows 10 Insider build. +> All response actions require machines to be on the latest Windows 10 Insider Preview build. From 79b5c19cf2c6938e0adcdcadc3823dffb5adbd4a Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Thu, 2 Mar 2017 16:26:06 -0800 Subject: [PATCH 07/54] draft done --- windows/deploy/images/mbr2gpt-workflow.png | Bin 0 -> 29166 bytes windows/deploy/mbr-to-gpt.md | 251 ++++++++++++++++++++- 2 files changed, 242 insertions(+), 9 deletions(-) create mode 100644 windows/deploy/images/mbr2gpt-workflow.png diff --git a/windows/deploy/images/mbr2gpt-workflow.png b/windows/deploy/images/mbr2gpt-workflow.png new file mode 100644 index 0000000000000000000000000000000000000000..f7741cf0c36e6a8ae1785b18536933ee50696c81 GIT binary patch literal 29166 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⋘a~oM45UDU?ekpW+4yZoB%4ANy!rpP_-M|f5K_e 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 i*T?_=M^M|^zw=LAJ~9{{(`+SW6 literal 0 HcmV?d00001 diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index f8b724027f..40afa86627 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -1,6 +1,6 @@ --- title: MBR2GPT -description: How to use the MBR2GPT tool to convert partitions +description: How to use the MBR2GPT tool to convert MBR partitions to GPT keywords: deploy, troubleshoot, windows, 10, upgrade, partition, mbr, gpt ms.prod: w10 ms.mktglfcycl: deploy @@ -15,7 +15,14 @@ localizationpriority: high **Applies to** - Windows 10 -MBR2GPT.EXE converts a disk from Master Boot Record (MBR) to GUID Partition Table (GPT) partition style without modifying or deleting data on the disk. +MBR2GPT.EXE converts a disk from Master Boot Record (MBR) to GUID Partition Table (GPT) partition style without modifying or deleting data on the disk. The tool is designed to be run from a Windows PE command prompt. + +MBR2GPT is available in Windows 10 version 1703, also known as Windows 10 Creator's Update, and later versions. The tool is available in both the full OS environment and the Windows Preinstallation Environment (WinPE). + +You can use MBR2GPT to perform the following: + +- Within the WinPE environment: Convert any attached MBR-formatted disk to GPT, including the system disk. +- From within the currently running OS: Convert any attached MBR-formatted disk to GPT, including the system disk. ## Syntax @@ -28,23 +35,236 @@ MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map: |/validate| Instructs MBR2GPT.exe to perform only the disk validation steps and report whether the disk is eligible for conversion. | |/convert| Instructs MBR2GPT.exe to perform the disk validation and to proceed with the conversion if all validation tests pass. | |/disk:\| Specifies the disk number of the disk to be converted to GPT. If not specified, the system disk is used. The mechanism used is the same as that used by the diskpart.exe tool **SELECT DISK SYSTEM** command.| -|/logs:\| Specifies the directory where MBR2GPT.exe logs should be written. If not specified, **%windir%** is used.| -|/map:\=\| Specifies additional partition type mappings between MBR and GPT.| -|/allowFullOS| By default, MBR2GPT.exe is blocked unless it is run from WinPE. This option overrides this block and enables disk conversion while running in the full Windows environment. You cannot convert the system disk using this option.| +|/logs:\| Specifies the directory where MBR2GPT.exe logs should be written. If not specified, **%windir%** is used. If specified, the directory must already exist, it will not be automatically created or overwritten.| +|/map:\=\| Specifies additional partition type mappings between MBR and GPT. The MBR partition number is specified in decimal notation, not hexidecimal. The GPT GUID can contain brackets (ex: /map:42={af9b60a0-1431-4f62-bc68-3311714a69ad}) but brackets are not required. | +|/allowFullOS| By default, MBR2GPT.exe is blocked unless it is run from WinPE. This option overrides this block and enables disk conversion while running in the full Windows environment.| |/silent| Suppresses all warning messages so that the utility can be used in scripts.| >You can use MBR2GPT to convert an MBR disk with BitLocker-encrypted volumes as long as protection has been suspended. To resume BitLocker after conversion, you will need to delete the existing protectors and recreate them. ## Examples +In the following example, disk 0 is validated for conversion. Errors and warnings are logged to the default location, **%windir%**. +``` +X:\>mbr2gpt /validate /disk:0 +MBR2GPT: Attempting to validate disk 0 +MBR2GPT: Retrieving layout of disk +MBR2GPT: Validating layout, disk sector size is: 512 +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. +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. +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 [GPT partition type](https://msdn.microsoft.com/library/windows/desktop/aa365449.aspx) 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. + +``` +DISKPART> list volume + + Volume ### Ltr Label Fs Type Size Status Info + ---------- --- ----------- ----- ---------- ------- --------- -------- + Volume 0 F CENA_X64FRE UDF DVD-ROM 4027 MB Healthy + Volume 1 C System Rese NTFS Partition 499 MB Healthy + Volume 2 D Windows NTFS Partition 58 GB Healthy + Volume 3 E Recovery NTFS Partition 612 MB Healthy Hidden + +DISKPART> select volume 2 + +Volume 2 is the selected volume. + +DISKPART> list partition + + Partition ### Type Size Offset + ------------- ---------------- ------- ------- + Partition 1 Primary 499 MB 1024 KB +* Partition 2 Primary 58 GB 500 MB + Partition 3 Recovery 612 MB 59 GB + +DISKPART> detail partition + +Partition 2 +Type : 07 +Hidden: No +Active: No +Offset in Bytes: 524288000 + + Volume ### Ltr Label Fs Type Size Status Info + ---------- --- ----------- ----- ---------- ------- --------- -------- +* Volume 2 D Windows NTFS Partition 58 GB Healthy + +DISKPART> exit + +Leaving DiskPart... + +X:\>mbr2gpt /convert /disk:0 + +MBR2GPT will now attempt to convert disk 0. +If conversion is successful the disk can only be booted in GPT mode. +These changes cannot be undone! + +MBR2GPT: Attempting to convert disk 0 +MBR2GPT: Retrieving layout of disk +MBR2GPT: Validating layout, disk sector size is: 512 bytes +MBR2GPT: Trying to shrink the system partition +MBR2GPT: Trying to shrink the OS partition +MBR2GPT: Creating the EFI system partition +MBR2GPT: Installing the new boot files +MBR2GPT: Performing the layout conversion +MBR2GPT: Migrating default boot entry +MBR2GPT: Adding recovery boot entry +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 + +Microsoft DiskPart version 10.0.15048.0 + +Copyright (C) Microsoft Corporation. +On computer: MININT-K71F13N + +DISKPART> list disk + + Disk ### Status Size Free Dyn Gpt + -------- ------------- ------- ------- --- --- + Disk 0 Online 60 GB 0 B * + +DISKPART> select disk 0 + +Disk 0 is now the selected disk. + +DISKPART> list volume + + Volume ### Ltr Label Fs Type Size Status Info + ---------- --- ----------- ----- ---------- ------- --------- -------- + Volume 0 F CENA_X64FRE UDF DVD-ROM 4027 MB Healthy + Volume 1 D Windows NTFS Partition 58 GB Healthy + Volume 2 C System Rese NTFS Partition 499 MB Healthy Hidden + Volume 3 FAT32 Partition 100 MB Healthy Hidden + Volume 4 E Recovery NTFS Partition 612 MB Healthy Hidden + +DISKPART> select volume 1 + +Volume 1 is the selected volume. + +DISKPART> list partition + + Partition ### Type Size Offset + ------------- ---------------- ------- ------- + Partition 1 Recovery 499 MB 1024 KB +* Partition 2 Primary 58 GB 500 MB + Partition 4 System 100 MB 59 GB + Partition 3 Recovery 612 MB 59 GB + +DISKPART> detail partition + +Partition 2 +Type : ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 +Hidden : No +Required: No +Attrib : 0000000000000000 +Offset in Bytes: 524288000 + + Volume ### Ltr Label Fs Type Size Status Info + ---------- --- ----------- ----- ---------- ------- --------- -------- +* Volume 1 D Windows NTFS Partition 58 GB Healthy + +``` + +X:>mbr2gpt /convert /disk:0 ## Specifications +### Disk conversion workflow -### Troubleshooting +The following diagram illustrates the high-level phases of the MBR-to-GPT conversion process: -#### Determining partition type +![Workflow](images/mbr2gpt-workflow.PNG) + +1. Disk validation is performed. +2. The disk is repartitioned to create an EFI system partition (ESP) if one does not already exist. +3. UEFI boot files are installed to the ESP. +4. GPT metatdata and layout information is applied. +5. The BCD store is updated. +6. Drive letter assignments are restored. + +### Disk validation + +Before any change to the disk is made, MBR2GPT validates the layout and geometry of the selected disk to ensure that: +- The disk is currently using MBR +- There is enough space not occupied by partitions to meet GPT’s reserved space requirements: + - 16KB + 2 sectors at the front of the disk + - 16KB + 1 sector at the end of the disk +- There are at most 3 primary partitions in the MBR partition table +- One of the partitions is set as active and is the system partition +- The BCD store on the system partition contains a default OS entry pointing to an OS partition +- The volume IDs can retrieved for each volume which has a drive letter assigned +- All partitions on the disk are of MBR types recognized by Windows or has a mapping specified using the /map command-line option + +If any of these checks fails, the conversion will not proceed and an error will be returned. + +### Creating an EFI system partition + +For Windows to remain bootable after the conversion, an EFI system partition (ESP) must be in place. MBR2GPT creates the ESP using the following rules: + +1. The existing MBR system partition is reused if it meets these requirements: + a. It is not also the OS or WinRE partition + b. It is at least 100MB (or 256MB for 4K-sector-size disks) in size + c. It is less than or equal to 1GB in size. This is a safety precaution to ensure it is not a data partition. + d. If the conversion is being performed from the full OS, the disk being converted is not the system disk. +2. If the existing MBR system partition cannot be reused, a new ESP is created by shrinking the OS partition. This new partition has a size of 100MB (or 256MB for 4K-sector-size disks) and is formatted FAT32. + +If the existing MBR system partition is not reused for the ESP, it is no longer by the boot process after the conversion. Other partitions are not modified. + +### Partition type mapping and partition attributes + +Since GPT partitions use a different set of type IDs than MBR partitions, each partition on the converted disk must be assigned a new type ID. The partition type mapping follows these rules: + +1. The ESP is always set to partition type PARTITION_SYSTEM_GUID (c12a7328-f81f-11d2-ba4b-00a0c93ec93b). +2. If an MBR partition is of a type that matches one of the entries specified in the /map switch, the specified GPT partition type ID is used. +3. If the MBR partition is of type 0x27, the partition is converted to a GPT partition of type PARTITION_MSFT_RECOVERY_GUID (de94bba4-06d1-4d40-a16a-bfd50179d6ac). +4. All other MBR partitions recognized by Windows are converted to GPT partitions of type PARTITION_BASIC_DATA_GUID (ebd0a0a2-b9e5-4433-87c0-68b6b72699c7). + +In addition to applying the correct partition types, partitions of type PARTITION_MSFT_RECOVERY_GUID also have the following GPT attributes set: +- GPT_ATTRIBUTE_PLATFORM_REQUIRED (0x0000000000000001) +- GPT_BASIC_DATA_ATTRIBUTE_NO_DRIVE_LETTER (0x8000000000000000) + +### Persisting drive letter assignments + +The conversion tool will attempt to remap all entries from **HKLM\SYSTEM\MountedDevices** that correspond to the volumes that are part of the converted disk. If an entry cannot be converted and it represents a drive letter assignment, an error will be issued at the console and in the log, giving the user the ability to manually perform the correct assignment of the drive letter. **Important**: this code runs after the layout conversion has taken place, so the operation cannot be undone at this stage. + +The conversion tool will obtain volume unique ID before and after the layout conversion, organizing this information into a lookup table. It will then iterate through all the entries in **HKLM\SYSTEM\MountedDevices**, and for each entry do the following: + +1. Check if the unique ID corresponds to any of the unique IDs for any of the volumes that are part of the converted disk. +2. If found, set the value to be the new unique ID, obtained after the layout conversion. +3. If the new unique ID cannot be set and the value name starts with \DosDevices, issue a console and log warning about the need for manual intervention in properly restoring the drive letter assignment. + +## Troubleshooting + +The tool will display status information in its output. Both validation and conversion are clear if any errors are encountered. For example, if one or more partitions do not translate properly, this is displayed and the conversion not performed. To view more detail about any errors that are encountered, see the associated log files. + +### Logs + +Two log files are created by the MBR2GPT tool: + +diagerr.xml +diagwrn.xml + +These files contain errors and warnings, respectively, encountered during disk validation and conversion. These tool-specific logs can be helpful in diagnosing problems with the tool, however they are not meant to replace the default Windows Setup log files: + +setupact.log +setuperr.log + +The default location for all these log files in Windows PE is %windir%. + +### Determining the partition type You can type the following command at a Windows PowerShell prompt to display the disk number and partition type. Example output is also shown. @@ -63,7 +283,22 @@ You can also view the partition type of a disk by opening the Disk Management to ![Volumes](images/mbr2gpt-volume.PNG) +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: +``` +DISKPART> list disk + + Disk ### Status Size Free Dyn Gpt + -------- ------------- ------- ------- --- --- + Disk 0 Online 238 GB 0 B + Disk 1 Online 931 GB 0 B * +``` + +In this example, Disk 0 is formatted with the MBR partition style, and Disk 1 is formatted using GPT. + +### Interactive help + +To view a list of options available when using the tool, type **mbr2gpt /?**. See the following example: ``` @@ -105,11 +340,9 @@ Where: ``` - ## Related topics [Windows 10 FAQ for IT professionals](https://technet.microsoft.com/en-us/windows/dn798755.aspx)
[Windows 10 Enterprise system requirements](https://technet.microsoft.com/en-us/windows/dn798752.aspx)
[Windows 10 Specifications](https://www.microsoft.com/en-us/windows/Windows-10-specifications)
[Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro) -
[Fix Windows Update errors by using the DISM or System Update Readiness tool](https://support.microsoft.com/kb/947821) From 156786da311e09d44feb97c6f4aba333b4be90de Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 16:30:51 -0800 Subject: [PATCH 08/54] add link to anchor --- ...rs-windows-defender-advanced-threat-protection.md | 12 ++++++------ ...es-windows-defender-advanced-threat-protection.md | 2 +- ...ew-windows-defender-advanced-threat-protection.md | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/windows/keep-secure/fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md b/windows/keep-secure/fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md index 897187ce25..749d25c114 100644 --- a/windows/keep-secure/fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md @@ -50,10 +50,10 @@ This status indicates that there's limited communication between the machine and The following suggested actions can help fix issues related to a misconfigured machine with impaired communication: -- [Ensure the endpoint has Internet connection](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md#ensure-the-endpoint-has-an-internet-connection) +- [Ensure the endpoint has Internet connection](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md#ensure-the-endpoint-has-an-internet-connection)
The Window Defender ATP sensor requires Microsoft Windows HTTP (WinHTTP) to report sensor data and communicate with the Windows Defender ATP service. -- Verify client connectivity to Windows Defender ATP service URLs
+- [Verify client connectivity to Windows Defender ATP service URLs](configure-proxy-internet-windows-defender-advanced-threat-protection.md#verify-client-connectivity-to-windows-defender-atp-service-urls)
Verify the proxy configuration completed successfully, that WinHTTP can discover and communicate through the proxy server in your environment, and that the proxy server allows traffic to the Windows Defender ATP service URLs. If you took corrective actions and the machine status is still misconfigured, [open a support ticket](http://go.microsoft.com/fwlink/?LinkID=761093&clcid=0x409). @@ -62,16 +62,16 @@ If you took corrective actions and the machine status is still misconfigured, [o A misconfigured machine with status ‘No sensor data’ has communication with the service but can only report partial sensor data. Follow theses actions to correct known issues related to a misconfigured machine with status ‘Impaired communication’: -- [Ensure the endpoint has Internet connection](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md#ensure-the-endpoint-has-an-internet-connection) +- [Ensure the endpoint has Internet connection](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md#ensure-the-endpoint-has-an-internet-connection)
The Window Defender ATP sensor requires Microsoft Windows HTTP (WinHTTP) to report sensor data and communicate with the Windows Defender ATP service. -- Verify client connectivity to Windows Defender ATP service URLs
+- [Verify client connectivity to Windows Defender ATP service URLs](configure-proxy-internet-windows-defender-advanced-threat-protection.md#verify-client-connectivity-to-windows-defender-atp-service-urls)
Verify the proxy configuration completed successfully, that WinHTTP can discover and communicate through the proxy server in your environment, and that the proxy server allows traffic to the Windows Defender ATP service URLs. -- [Ensure the telemetry and diagnostics service is enabled](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md#ensure-the-telemetry-and-diagnostics-service-is-enabled) +- [Ensure the telemetry and diagnostics service is enabled](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md#ensure-the-telemetry-and-diagnostics-service-is-enabled)
If the endpoints aren't reporting correctly, you might need to check that the Windows 10 telemetry and diagnostics service is set to automatically start and is running on the endpoint. -- [Ensure that Windows Defender is not disabled by policy](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md#ensure-that-windows-defender-is-not-disabled-by-a-policy) +- [Ensure that Windows Defender is not disabled by policy](troubleshoot-onboarding-windows-defender-advanced-threat-protection.md#ensure-that-windows-defender-is-not-disabled-by-a-policy)
If your endpoints are running a third-party antimalware client, the Windows Defender ATP agent needs the Windows Defender Early Launch Antimalware (ELAM) driver to be enabled. If you took corrective actions and the machine status is still misconfigured, [open a support ticket](http://go.microsoft.com/fwlink/?LinkID=761093&clcid=0x409). diff --git a/windows/keep-secure/investigate-machines-windows-defender-advanced-threat-protection.md b/windows/keep-secure/investigate-machines-windows-defender-advanced-threat-protection.md index 69a0b102c6..640b0a524c 100644 --- a/windows/keep-secure/investigate-machines-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/investigate-machines-windows-defender-advanced-threat-protection.md @@ -40,7 +40,7 @@ When you investigate a specific machine, you'll see: ![Image of machine details page](images/atp-machine-details-view.png) -The machine details, total logged on users and machine reporting sections display various attributes about the machine. You’ll see details such as machine name, health status, actions you can take on the machine. For more information on how to take action on a machine, see [Take response action on a machine](respond-machine-alerts-windows-defender-advanced-threat-protection.md). +The machine details, total logged on users and machine reporting sections display various attributes about the machine. You’ll see details such as machine name, health state, actions you can take on the machine. For more information on how to take action on a machine, see [Take response action on a machine](respond-machine-alerts-windows-defender-advanced-threat-protection.md). You'll also see other information such as domain, operating system (OS), total logged on users and who frequently and less frequently logged on, IP address, and how long it's been reporting sensor data to the Windows Defender ATP service. diff --git a/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md b/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md index a64d8eede0..e4a19d51d6 100644 --- a/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/preview-windows-defender-advanced-threat-protection.md @@ -44,7 +44,7 @@ The following features are included in the preview release: - [Remove file from quarantine](respond-file-alerts-windows-defender-advanced-threat-protection.md#remove-file-from-quarantine) - [Block files in your network](respond-file-alerts-windows-defender-advanced-threat-protection.md#block-files-in-your-network) -- [Check sensor status](check-sensor-status-windows-defender-advanced-threat-protection.md) - Check an endpoint's ability to provide sensor data and communicate with the Windows Defender ATP service and fix sensor issues if you identify problematic machines. +- [Check sensor health state](check-sensor-status-windows-defender-advanced-threat-protection.md) - Check an endpoint's ability to provide sensor data and communicate with the Windows Defender ATP service and fix known issues. - [Fix unhealthy sensors](fix-unhealhty-sensors-windows-defender-advanced-threat-protection.md) >[!NOTE] From 28fdb29580e81f2340bc74ee259d59f7e36a0ec2 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Thu, 2 Mar 2017 16:44:50 -0800 Subject: [PATCH 09/54] draft done --- windows/deploy/mbr-to-gpt.md | 123 +++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 55 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 40afa86627..3cf9862d26 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -15,21 +15,26 @@ localizationpriority: high **Applies to** - Windows 10 -MBR2GPT.EXE converts a disk from Master Boot Record (MBR) to GUID Partition Table (GPT) partition style without modifying or deleting data on the disk. The tool is designed to be run from a Windows PE command prompt. +## Summary -MBR2GPT is available in Windows 10 version 1703, also known as Windows 10 Creator's Update, and later versions. The tool is available in both the full OS environment and the Windows Preinstallation Environment (WinPE). +**MBR2GPT.EXE** converts a disk from Master Boot Record (MBR) to GUID Partition Table (GPT) partition style without modifying or deleting data on the disk. The tool is designed to be run from a Windows PE command prompt. You can use MBR2GPT to perform the following: - Within the WinPE environment: Convert any attached MBR-formatted disk to GPT, including the system disk. - From within the currently running OS: Convert any attached MBR-formatted disk to GPT, including the system disk. +>MBR2GPT is available in Windows 10 version 1703, also known as Windows 10 Creator's Update, and later versions. +>The tool is available in both the full OS environment and the Windows Preinstallation Environment (WinPE). + ## Syntax ``` MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS] ``` +### Options + | Option | Description | |----|-------------| |/validate| Instructs MBR2GPT.exe to perform only the disk validation steps and report whether the disk is eligible for conversion. | @@ -44,6 +49,8 @@ MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map: ## Examples +### Validatiion example + In the following example, disk 0 is validated for conversion. Errors and warnings are logged to the default location, **%windir%**. ``` @@ -54,6 +61,8 @@ MBR2GPT: Validating layout, disk sector size is: 512 MBR2GPT: Validation completed successfully ``` +### Conversion example + 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. @@ -61,8 +70,9 @@ In the following example: 2. The MBR2GPT tool is used to convert disk 0. 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 [GPT partition type](https://msdn.microsoft.com/library/windows/desktop/aa365449.aspx) ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 corresponding to the PARTITION_BASIC_DATA_GUID type. +5. The OS volume is selected again, and detail displays that it has been converted to [GPT partition type](https://msdn.microsoft.com/library/windows/desktop/aa365449.aspx) **ebd0a0a2-b9e5-4433-87c0-68b6b72699c7** corresponding to the **PARTITION_BASIC_DATA_GUID** type. +>[!IMPORTANT] >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. ``` @@ -178,15 +188,11 @@ Offset in Bytes: 524288000 ``` -X:>mbr2gpt /convert /disk:0 - ## Specifications ### Disk conversion workflow -The following diagram illustrates the high-level phases of the MBR-to-GPT conversion process: - -![Workflow](images/mbr2gpt-workflow.PNG) +The following steps illustrate high-level phases of the MBR-to-GPT conversion process: 1. Disk validation is performed. 2. The disk is repartitioned to create an EFI system partition (ESP) if one does not already exist. @@ -195,6 +201,10 @@ The following diagram illustrates the high-level phases of the MBR-to-GPT conver 5. The BCD store is updated. 6. Drive letter assignments are restored. +These steps are summarized in the diagram below: + +![Workflow](images/mbr2gpt-workflow.PNG) + ### Disk validation Before any change to the disk is made, MBR2GPT validates the layout and geometry of the selected disk to ensure that: @@ -250,55 +260,11 @@ The conversion tool will obtain volume unique ID before and after the layout con The tool will display status information in its output. Both validation and conversion are clear if any errors are encountered. For example, if one or more partitions do not translate properly, this is displayed and the conversion not performed. To view more detail about any errors that are encountered, see the associated log files. -### Logs - -Two log files are created by the MBR2GPT tool: - -diagerr.xml -diagwrn.xml - -These files contain errors and warnings, respectively, encountered during disk validation and conversion. These tool-specific logs can be helpful in diagnosing problems with the tool, however they are not meant to replace the default Windows Setup log files: - -setupact.log -setuperr.log - -The default location for all these log files in Windows PE is %windir%. - -### Determining the partition type - -You can type the following command at a Windows PowerShell prompt to display the disk number and partition type. Example output is also shown. - - -``` -PS C:\> Get-Disk | ft -Auto - -Number Friendly Name Serial Number HealthStatus OperationalStatus Total Size Partition Style ------- ------------- ------------- ------------ ----------------- ---------- --------------- -0 MTFDDAK256MAM-1K1 13050928F47C Healthy Online 238.47 GB MBR -1 ST1000DM003-1ER162 Z4Y3GD8F Healthy Online 931.51 GB GPT -``` - -You can also view the partition type of a disk by opening the Disk Management tool, right-clicking the disk number, clicking **Properties**, and then clicking the **Volumes** tab. See the following example: - -![Volumes](images/mbr2gpt-volume.PNG) - - -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: - -``` -DISKPART> list disk - - Disk ### Status Size Free Dyn Gpt - -------- ------------- ------- ------- --- --- - Disk 0 Online 238 GB 0 B - Disk 1 Online 931 GB 0 B * -``` - -In this example, Disk 0 is formatted with the MBR partition style, and Disk 1 is formatted using GPT. - ### Interactive help -To view a list of options available when using the tool, type **mbr2gpt /?**. See the following example: +To view a list of options available when using the tool, type **mbr2gpt /?** + +See the following example: ``` @@ -336,8 +302,55 @@ Where: environment. By default, this tool can only be used from the Windows Preinstallation Environment. +``` + +### Logs + +Two log files are created by the MBR2GPT tool: + +- diagerr.xml +- diagwrn.xml + +These files contain errors and warnings, respectively, encountered during disk validation and conversion. These tool-specific logs can be helpful in diagnosing problems with the tool, however they are not meant to replace the default Windows Setup log files: + +- setupact.log +- setuperr.log + +The default location for all these log files in Windows PE is **%windir%**. + +### Determining the partition type + +You can type the following command at a Windows PowerShell prompt to display the disk number and partition type. Example output is also shown. + ``` +PS C:\> Get-Disk | ft -Auto + +Number Friendly Name Serial Number HealthStatus OperationalStatus Total Size Partition Style +------ ------------- ------------- ------------ ----------------- ---------- --------------- +0 MTFDDAK256MAM-1K1 13050928F47C Healthy Online 238.47 GB MBR +1 ST1000DM003-1ER162 Z4Y3GD8F Healthy Online 931.51 GB GPT +``` + +You can also view the partition type of a disk by opening the Disk Management tool, right-clicking the disk number, clicking **Properties**, and then clicking the **Volumes** tab. See the following example: + +![Volumes](images/mbr2gpt-volume.PNG) + + +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: + +``` +DISKPART> list disk + + Disk ### Status Size Free Dyn Gpt + -------- ------------- ------- ------- --- --- + Disk 0 Online 238 GB 0 B + Disk 1 Online 931 GB 0 B * +``` + +In this example, Disk 0 is formatted with the MBR partition style, and Disk 1 is formatted using GPT. + + ## Related topics From cee4eac0aef5e15abb8d5325500635df8de14f90 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Thu, 2 Mar 2017 16:50:00 -0800 Subject: [PATCH 10/54] draft done --- windows/deploy/mbr-to-gpt.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 3cf9862d26..5e0fff79f4 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -17,7 +17,7 @@ localizationpriority: high ## Summary -**MBR2GPT.EXE** converts a disk from Master Boot Record (MBR) to GUID Partition Table (GPT) partition style without modifying or deleting data on the disk. The tool is designed to be run from a Windows PE command prompt. +**MBR2GPT.EXE** converts a disk from Master Boot Record (MBR) to GUID Partition Table (GPT) partition style without modifying or deleting data on the disk. The tool is designed to be run from a Windows PE command prompt, but can also be run from the full Windows 10 operating system (OS). You can use MBR2GPT to perform the following: @@ -264,7 +264,7 @@ The tool will display status information in its output. Both validation and conv To view a list of options available when using the tool, type **mbr2gpt /?** -See the following example: +The following text is displayed: ``` @@ -320,7 +320,7 @@ The default location for all these log files in Windows PE is **%windir%**. ### Determining the partition type -You can type the following command at a Windows PowerShell prompt to display the disk number and partition type. Example output is also shown. +You can type the following command at a Windows PowerShell prompt to display the disk number and partition type. Example output is also shown: ``` From bd19a97d144b9df2ff46cd872d4dbfbe669c2576 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Thu, 2 Mar 2017 17:02:49 -0800 Subject: [PATCH 11/54] draft done --- windows/deploy/mbr-to-gpt.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 5e0fff79f4..a5b06869f5 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -27,6 +27,8 @@ You can use MBR2GPT to perform the following: >MBR2GPT is available in Windows 10 version 1703, also known as Windows 10 Creator's Update, and later versions. >The tool is available in both the full OS environment and the Windows Preinstallation Environment (WinPE). +You can use MBR2GPT to convert an MBR disk with BitLocker-encrypted volumes as long as protection has been suspended. To resume BitLocker after conversion, you will need to delete the existing protectors and recreate them. + ## Syntax ``` @@ -41,12 +43,10 @@ MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map: |/convert| Instructs MBR2GPT.exe to perform the disk validation and to proceed with the conversion if all validation tests pass. | |/disk:\| Specifies the disk number of the disk to be converted to GPT. If not specified, the system disk is used. The mechanism used is the same as that used by the diskpart.exe tool **SELECT DISK SYSTEM** command.| |/logs:\| Specifies the directory where MBR2GPT.exe logs should be written. If not specified, **%windir%** is used. If specified, the directory must already exist, it will not be automatically created or overwritten.| -|/map:\=\| Specifies additional partition type mappings between MBR and GPT. The MBR partition number is specified in decimal notation, not hexidecimal. The GPT GUID can contain brackets (ex: /map:42={af9b60a0-1431-4f62-bc68-3311714a69ad}) but brackets are not required. | +|/map:\=\| Specifies additional partition type mappings between MBR and GPT. The MBR partition number is specified in decimal notation, not hexidecimal. The GPT GUID can contain brackets, for example: **/map:42={af9b60a0-1431-4f62-bc68-3311714a69ad}**. | |/allowFullOS| By default, MBR2GPT.exe is blocked unless it is run from WinPE. This option overrides this block and enables disk conversion while running in the full Windows environment.| |/silent| Suppresses all warning messages so that the utility can be used in scripts.| ->You can use MBR2GPT to convert an MBR disk with BitLocker-encrypted volumes as long as protection has been suspended. To resume BitLocker after conversion, you will need to delete the existing protectors and recreate them. - ## Examples ### Validatiion example @@ -355,7 +355,7 @@ In this example, Disk 0 is formatted with the MBR partition style, and Disk 1 is ## Related topics -[Windows 10 FAQ for IT professionals](https://technet.microsoft.com/en-us/windows/dn798755.aspx) +[Using MBR2GPT with Configuration Manager OSD](https://miketerrill.net/tag/mbr2gpt/)
[Windows 10 Enterprise system requirements](https://technet.microsoft.com/en-us/windows/dn798752.aspx)
[Windows 10 Specifications](https://www.microsoft.com/en-us/windows/Windows-10-specifications)
[Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro) From 2cc3440284892a9d910b3ca2fe74b270a0d867bb Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 18:12:39 -0800 Subject: [PATCH 12/54] add powershell code snippet --- windows/keep-secure/code/example.ps1 | 53 +++++++++++++++++++ ...ows-defender-advanced-threat-protection.md | 19 +------ 2 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 windows/keep-secure/code/example.ps1 diff --git a/windows/keep-secure/code/example.ps1 b/windows/keep-secure/code/example.ps1 new file mode 100644 index 0000000000..0cbdecefac --- /dev/null +++ b/windows/keep-secure/code/example.ps1 @@ -0,0 +1,53 @@ +$tenantId = '{Your Tenant ID}’ +$clientId = '{Your Client ID}' +$clientSecret = '{Your Client Secret}' + +$authUrl = "https://login.windows.net/{0}/oauth2/token" -f $tenantId + +$tokenPayload = @{ + "resource"='https://graph.windows.net' + "client_id" = $clientId + "client_secret" = $clientSecret + "grant_type"='client_credentials'} + +$response = Invoke-RestMethod $authUrl -Method Post -Body $tokenPayload +$token = $response.access_token + +$headers = @{ + "Content-Type"="application/json" + "Accept"="application/json" + "Authorization"="Bearer {0}" -f $token } + +$apiBaseUrl = "https://ti.securitycenter.windows.com/V1.0/" + +$alertDefinitions = + (Invoke-RestMethod ("{0}AlertDefinitions" -f $apiBaseUrl) -Method Get -Headers $headers).value + +$alertDefinitionPayload = @{ + "Name"= "The Alert's Name" + "Severity"= "Low" + "InternalDescription"= "An internal description of the Alert" + "Title"= "The Title" + + "UxDescription"= "Description of the alerts" + "RecommendedAction"= "The alert's recommended action" + "Category"= "Trojan" + "Enabled"= "true"} + +$alertDefinition = + Invoke-RestMethod ("{0}AlertDefinitions" -f $apiBaseUrl) ` + -Method Post -Headers $headers -Body ($alertDefinitionPayload | ConvertTo-Json) + +$alertDefinitionId = $alertDefinition.Id + +$iocPayload = @{ + "Type"="Sha1" + "Value"="dead1111eeaabbccddeeaabbccddee11ffffffff" + "DetectionFunction"="Equals" + "Enabled"="true" + "AlertDefinition@odata.bind"="AlertDefinitions({0})" -f $alertDefinitionId } + + +$ioc = + Invoke-RestMethod ("{0}IndicatorsOfCompromise" -f $apiBaseUrl) ` + -Method Post -Headers $headers -Body ($iocPayload | ConvertTo-Json) diff --git a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md index b06391c16d..91887039fa 100644 --- a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md @@ -37,24 +37,7 @@ The following example demonstrates how to obtain an Azure AD access token that y Replace the *tenant\_id*, *client_id*, and *client_secret* values with the ones you got from **Preferences settings** page in the portal: -``` - -$tenantId = '{Your Tenant ID} -$clientId = '{Your Client ID}' -$clientSecret = '{Your Client Secret}' - -$authUrl = "https://login.windows.net/{0}/oauth2/token" -f $tenantId - -$tokenPayload = @{ - "resource"='https://graph.windows.net' - "client_id" = $clientId - "client_secret" = $clientSecret - "grant_type"='client_credentials'} - -$response = Invoke-RestMethod $authUrl -Method Post -Body $tokenPayload -$token = $response.access_token - -``` +[!code[CustomTIAPI](./code/example.ps1#L1-L14)] ## Create headers The following example demonstrates how to create headers used for the requests with the API. From faf66032008f741826a35ff16e983e71245e1c3a Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 19:33:20 -0800 Subject: [PATCH 13/54] add code lines --- windows/keep-secure/code/example.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/keep-secure/code/example.ps1 b/windows/keep-secure/code/example.ps1 index 0cbdecefac..3bba0ef005 100644 --- a/windows/keep-secure/code/example.ps1 +++ b/windows/keep-secure/code/example.ps1 @@ -1,4 +1,4 @@ -$tenantId = '{Your Tenant ID}’ +$tenantId = '{Your Tenant ID}' $clientId = '{Your Client ID}' $clientSecret = '{Your Client Secret}' From 953d497b7f055f536633f28a58f2cfb61049d606 Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 19:33:28 -0800 Subject: [PATCH 14/54] add codes --- ...ows-defender-advanced-threat-protection.md | 43 +++---------------- 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md index 91887039fa..199f4fcfb3 100644 --- a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md @@ -37,60 +37,27 @@ The following example demonstrates how to obtain an Azure AD access token that y Replace the *tenant\_id*, *client_id*, and *client_secret* values with the ones you got from **Preferences settings** page in the portal: -[!code[CustomTIAPI](./code/example.ps1#L1-L14)] +[!code[-powershell][CustomTIAPI](./code/example.ps1#L1-L14)] ## Create headers The following example demonstrates how to create headers used for the requests with the API. -``` -$headers = @{} -$headers.Add("Content-Type", "application/json") -$headers.Add("Accept", "application/json") -$headers.Add("Authorization", "Bearer {0}" -f $token) +[!code[-powershell][CustomTIAPI](./code/example.ps1#L16-L19)] -``` ## Create calls to the custom threat intelligence API The following example demonstrates how to view all alert definition entities by creating a call to the API. -``` -$apiBaseUrl = "https://ti.securitycenter.windows.com/V1.0/" -$alertDefinitions = - (Invoke-RestMethod ("{0}AlertDefinitions" -f $apiBaseUrl) -Method Get -Headers $headers).value -``` +[!code[-powershell][CustomTIAPI](./code/example.ps1#L21-L24)] If this is the first time to use the API, the response is empty. ## Create a new alert definition The following example shows how to create a new alert definition. -``` -$alertDefinitionPayload = @{ - "Name"= "The Alert's Name" - "Severity"= "Low" - "InternalDescription"= "An internal description of the Alert" - "Title"= "The Title" - "UxDescription"= "Description of the alerts" - "RecommendedAction"= "The alert's recommended action" - "Category"= "Trojan" - "Enabled"= "true"} - - -$alertDefinition = - Invoke-RestMethod ("{0}AlertDefinitions" -f $apiBaseUrl) -Method Post -Headers $headers -Body ($alertDefinitionPayload | ConvertTo-Json) -``` +[!code[-powershell][CustomTIAPI](./code/example.ps1#L26-L39)] ## Create a new indicator of compromise The following example shows how to use the alert ID obtained from creating a new alert definition to create a new indicator of compromise. -``` -$iocPayload = @{ - "Type"="Sha1" - "Value"="dead1111eeaabbccddeeaabbccddee11ffffffff" - "DetectionFunction"="Equals" - "Enabled"="true" - "AlertDefinition@odata.bind"="AlertDefinitions({0})" -f $alertDefinitionId } - - -$ioc = Invoke-RestMethod ("{0}IndicatorsOfCompromise" -f $apiBaseUrl) -Method Post -Headers $headers -Body ($iocPayload | ConvertTo-Json) -``` +[!code[-powershell][CustomTIAPI](./code/example.ps1#L43-L53)] From 0de716bae56d120d97897db239a92ccf88a516b5 Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 19:47:00 -0800 Subject: [PATCH 15/54] remove powershell --- ...code-windows-defender-advanced-threat-protection.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md index 199f4fcfb3..171ccbcc93 100644 --- a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md @@ -37,27 +37,27 @@ The following example demonstrates how to obtain an Azure AD access token that y Replace the *tenant\_id*, *client_id*, and *client_secret* values with the ones you got from **Preferences settings** page in the portal: -[!code[-powershell][CustomTIAPI](./code/example.ps1#L1-L14)] +[!code[CustomTIAPI](./code/example.ps1#L1-L14)] ## Create headers The following example demonstrates how to create headers used for the requests with the API. -[!code[-powershell][CustomTIAPI](./code/example.ps1#L16-L19)] +[!code[CustomTIAPI](./code/example.ps1#L16-L19)] ## Create calls to the custom threat intelligence API The following example demonstrates how to view all alert definition entities by creating a call to the API. -[!code[-powershell][CustomTIAPI](./code/example.ps1#L21-L24)] +[!code[CustomTIAPI](./code/example.ps1#L21-L24)] If this is the first time to use the API, the response is empty. ## Create a new alert definition The following example shows how to create a new alert definition. -[!code[-powershell][CustomTIAPI](./code/example.ps1#L26-L39)] +[!code[CustomTIAPI](./code/example.ps1#L26-L39)] ## Create a new indicator of compromise The following example shows how to use the alert ID obtained from creating a new alert definition to create a new indicator of compromise. -[!code[-powershell][CustomTIAPI](./code/example.ps1#L43-L53)] +[!code[CustomTIAPI](./code/example.ps1#L43-L53)] From 66a3d95786fee31900cbeb0f6ca941c7509a555b Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 20:15:34 -0800 Subject: [PATCH 16/54] add complete code --- ...ows-defender-advanced-threat-protection.md | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md index 171ccbcc93..4c7572c61a 100644 --- a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md @@ -32,32 +32,37 @@ These code examples demonstrate the following tasks: - [Create a new alert definition](#create-a-new-alert-definition) - [Create a new indicator of compromise](#create-a-new-indicator-of-compromise) -## Obtain an Azure AD access token +## Step 1: Obtain an Azure AD access token The following example demonstrates how to obtain an Azure AD access token that you can use to call methods in the custom threat intelligence API. After you obtain a token, you have 60 minutes to use this token in calls to the custom threat intelligence API before the token expires. After the token expires, you can generate a new token. -Replace the *tenant\_id*, *client_id*, and *client_secret* values with the ones you got from **Preferences settings** page in the portal: +Replace the *tenantid*, *clientid*, and *clientSecret* values with the ones you got from **Preferences settings** page in the portal: [!code[CustomTIAPI](./code/example.ps1#L1-L14)] -## Create headers -The following example demonstrates how to create headers used for the requests with the API. +## Step 2: Create headers used for the requests with the API +Use the following code to create the headers used for the requests with the API: [!code[CustomTIAPI](./code/example.ps1#L16-L19)] -## Create calls to the custom threat intelligence API -The following example demonstrates how to view all alert definition entities by creating a call to the API. +## Step 3: Create calls to the custom threat intelligence API +After creating the headers, you can now create calls to the API. The following example demonstrates how you can view all the alert definition entities: [!code[CustomTIAPI](./code/example.ps1#L21-L24)] If this is the first time to use the API, the response is empty. -## Create a new alert definition +## Step 4: Create a new alert definition The following example shows how to create a new alert definition. [!code[CustomTIAPI](./code/example.ps1#L26-L39)] ## Create a new indicator of compromise -The following example shows how to use the alert ID obtained from creating a new alert definition to create a new indicator of compromise. +You can now use the alert ID obtained from creating a new alert definition to create a new indicator of compromise. [!code[CustomTIAPI](./code/example.ps1#L43-L53)] + +## Complete code +You can use the complete code to create calls to the API. + +[!code[CustomTIAPI](./code/example.ps1#L1-L53)] From 8bf1e05b7f66f84ae64b0cf0db1875dbddd0ede5 Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 20:20:12 -0800 Subject: [PATCH 17/54] add anchors --- ...indows-defender-advanced-threat-protection.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md index 4c7572c61a..76e7f4138e 100644 --- a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md @@ -26,12 +26,13 @@ localizationpriority: high This article provides PowerShell code examples for using the custom threat intelligence API. These code examples demonstrate the following tasks: -- [Obtain an Azure AD access token](#obtain-an-azure-ad-access-token) -- [Create headers](#create-headers) -- [Create calls to the custom threat intelligence API](#create-calls-to-the-custom-threat-intelligence-api) -- [Create a new alert definition](#create-a-new-alert-definition) -- [Create a new indicator of compromise](#create-a-new-indicator-of-compromise) +- [Obtain an Azure AD access token](#token) +- [Create headers](#headers) +- [Create calls to the custom threat intelligence API](#calls) +- [Create a new alert definition](#alert-definition) +- [Create a new indicator of compromise](#ioc) + ## Step 1: Obtain an Azure AD access token The following example demonstrates how to obtain an Azure AD access token that you can use to call methods in the custom threat intelligence API. After you obtain a token, you have 60 minutes to use this token in calls to the custom threat intelligence API before the token expires. After the token expires, you can generate a new token. @@ -39,12 +40,13 @@ Replace the *tenantid*, *clientid*, and *clientSecret* values with the ones you [!code[CustomTIAPI](./code/example.ps1#L1-L14)] + ## Step 2: Create headers used for the requests with the API Use the following code to create the headers used for the requests with the API: [!code[CustomTIAPI](./code/example.ps1#L16-L19)] - + ## Step 3: Create calls to the custom threat intelligence API After creating the headers, you can now create calls to the API. The following example demonstrates how you can view all the alert definition entities: @@ -52,11 +54,13 @@ After creating the headers, you can now create calls to the API. The following e If this is the first time to use the API, the response is empty. + ## Step 4: Create a new alert definition The following example shows how to create a new alert definition. [!code[CustomTIAPI](./code/example.ps1#L26-L39)] + ## Create a new indicator of compromise You can now use the alert ID obtained from creating a new alert definition to create a new indicator of compromise. From 3df3711ed7baf61e49ea02f01c4d4d0aa16aa318 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Thu, 2 Mar 2017 20:42:05 -0800 Subject: [PATCH 18/54] added description per SEO advice and looked for broken image --- smb/{ => images}/cloud-mode-business-setup.md | 6 +++--- smb/index.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename smb/{ => images}/cloud-mode-business-setup.md (99%) diff --git a/smb/cloud-mode-business-setup.md b/smb/images/cloud-mode-business-setup.md similarity index 99% rename from smb/cloud-mode-business-setup.md rename to smb/images/cloud-mode-business-setup.md index f141dfe74e..1b4ad0385d 100644 --- a/smb/cloud-mode-business-setup.md +++ b/smb/images/cloud-mode-business-setup.md @@ -79,13 +79,13 @@ If this is the first time you're setting this up, and you'd like to see how it's **Figure 4** - Option to add or buy a domain - ![Add or buy a domain in O365 admin center](images/office365_buy_domain.png) + ![Add or buy a domain in Office 365 admin center](images/office365_buy_domain.png) 2. In the **Home > Domains** page, you will see the Microsoft-provided domain, such as *fabrikamdesign.onmicrosoft.com*. **Figure 5** - Microsoft-provided domain - ![Microsoft provided domain](images/office365_ms_provided_domain.png) + ![Microsoft-provided domain](images/office365_ms_provided_domain.png) - If you already have a domain, select **+ Add domain** to add your existing domain. If you select this option, you'll be required to verify that you own the domain. Follow the steps in the wizard to verify your domain. - If you don't already own a domain, select **+ Buy domain**. If you're using a trial plan, you'll be required to upgrade your trial plan in order to buy a domain. Choose the subscription plan to use for your business and provide the details to complete your order. @@ -94,7 +94,7 @@ If this is the first time you're setting this up, and you'd like to see how it's **Figure 6** - Domains - ![Verify your domains in O365 admin center](images/office365_additional_domain.png) + ![Verify your domains in Office 365 admin center](images/office365_additional_domain.png) ### 1.2 Add users and assign product licenses Once you've set up Office and added your domain, it's time to add users so they have access to Office 365. People in your organization need an account before they can sign in and access Office 365. The easiest way to add users is to add them one at a time in the Office 365 admin center. diff --git a/smb/index.md b/smb/index.md index 2d81f94e50..e110eb7d93 100644 --- a/smb/index.md +++ b/smb/index.md @@ -1,6 +1,6 @@ --- title: Windows 10 for small to midsize businesses -description: Learn how to use Windows 10 for your small to midsize business. +description: Microsoft products and devices to transform and grow your businessLearn how to use Windows 10 for your small to midsize business. keywords: Windows 10, SMB, small business, midsize business, business ms.prod: w10 ms.mktglfcycl: deploy From ede9d961e6323b846bfe1f08c11adfd095f23baa Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 20:47:34 -0800 Subject: [PATCH 19/54] add sample python code update python topic --- windows/keep-secure/code/exampe.py | 53 ++++++++++ ...ows-defender-advanced-threat-protection.md | 97 +++++-------------- 2 files changed, 78 insertions(+), 72 deletions(-) create mode 100644 windows/keep-secure/code/exampe.py diff --git a/windows/keep-secure/code/exampe.py b/windows/keep-secure/code/exampe.py new file mode 100644 index 0000000000..7bf906738c --- /dev/null +++ b/windows/keep-secure/code/exampe.py @@ -0,0 +1,53 @@ +import json +import requests +from pprint import pprint + +tenant_id="{your tenant ID}" +client_id="{your client ID}" +client_secret="{your client secret}" + +auth_url = "https://login.windows.net/{0}/oauth2/token".format(tenant_id) + +payload = {"resource": "https://graph.windows.net", + "client_id": client_id, + "client_secret": client_secret, + "grant_type": "client_credentials"} + +response = requests.post(auth_url, payload) +token = json.loads(response.text)["access_token"] + +with requests.Session() as session: + session.headers = { + 'Authorization': 'Bearer {}'.format(token), + 'Content-Type': 'application/json', + 'Accept': 'application/json'} + + response = session.get("https://ti.securitycenter.windows.com/V1.0/AlertDefinitions") + pprint(json.loads(response.text)) + + alert_definition = {"Name": "The alert's name", + "Severity": "Low", + "InternalDescription": "An internal description of the alert", + "Title": "The Title", + "UxDescription": "Description of the alerts", + "RecommendedAction": "The alert's recommended action", + "Category": "Trojan", + "Enabled": True} + + response = session.post( + "https://ti.securitycenter.windows.com/V1.0/AlertDefinitions", + json=alert_definition) + + alert_definition_id = json.loads(response.text)["Id"] + + ioc = {'Type': "Sha1", + 'Value': "dead1111eeaabbccddeeaabbccddee11ffffffff", + 'DetectionFunction': "Equals", + 'Enabled': True, + "AlertDefinition@odata.bind": "AlertDefinitions({0})".format(alert_definition_id)} + + response = session.post( + "https://ti.securitycenter.windows.com/V1.0/IndicatorsOfCompromise", + json=ioc) + + pprint(json.loads(response.text)) diff --git a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md index 4b482cc066..e3414a7cb8 100644 --- a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md @@ -27,95 +27,48 @@ localizationpriority: high You must [install](http://docs.python-requests.org/en/master/user/install/#install) the "[requests](http://docs.python-requests.org/en/master/)" python library. These code examples demonstrate the following tasks: -- [Obtain an Azure AD access token](#obtain-an-azure-ad-access-token) -- [Create request session object](#create-a-request's-session-object) -- [Create calls to the custom threat intelligence API](#create-calls-to-the-custom-threat-intelligence-api) -- [Create a new alert definition](#create-a-new-alert-definition) -- [Create a new indicator of compromise](#create-a-new-indicator-of-compromise) +- [Obtain an Azure AD access token](#token) +- [Create request session object](#session-object) +- [Create calls to the custom threat intelligence API](#calls) +- [Create a new alert definition](#alert-definition) +- [Create a new indicator of compromise](#ioc) -## Obtain an Azure AD access token + +## Step 1: Obtain an Azure AD access token The following example demonstrates how to obtain an Azure AD access token that you can use to call methods in the custom threat intelligence API. After you obtain a token, you have 60 minutes to use this token in calls to the custom threat intelligence API before the token expires. After the token expires, you can generate a new token. Replace the *tenant\_id*, *client_id*, and *client_secret* values with the ones you got from **Preferences settings** page in the portal: -``` - -import json -import requests -from pprint import pprint - -tenant_id="{your tenant ID}" -client_id="{your client ID" -client_secret="{your client secret}" - -full_auth_url = r"https://login.windows.net/{0}/oauth2/token".format(tenant_id) - -payload = {"resource": "https://graph.windows.net", - "client_id": client_id, - "client_secret": client_secret, - "grant_type": "client_credentials"} +[!code[CustomTIAPI](./code/example.py1#L1-L17)] -response = requests.post(full_auth_url, payload) -token = json.loads(response.text)["access_token"] -``` - -## Create request session object + +## Step 2: Create request session object Add HTTP headers to the session object, including the Authorization header with the token that was obtained. -``` -with requests.Session() as session: - session.headers = { - 'Authorization': 'Bearer {}'.format(token), - 'Content-Type': 'application/json', - 'Accept': 'application/json'} -``` +[!code[CustomTIAPI](./code/example.py1#L19-L23)] -## Create calls to the custom threat intelligence API -The following example shows how to view all of the alert definition entities by creating a call to the API. + +## Step 3: Create calls to the custom threat intelligence API +After adding HTTP headers to the session object, you can now create calls to the API. The following example demonstrates how you can view all the alert definition entities: ->[!NOTE] -> All code is still within the ```with``` statement with the same indention level. - -```json - -response = session.get("https://ti.securitycenter.windows.com/V1.0/AlertDefinitions") -pprint(json.loads(response.text)) -``` +[!code[CustomTIAPI](./code/example.py1#L25-L26)] If this is the first time to use the API, the response is empty. -## Create a new alert definition + +## Step 4: Create a new alert definition The following example shows how to create a new alert definition. -``` +[!code[CustomTIAPI](./code/example.py1#L28-L39)] -alert_definition = {"Name": "The Alert's Name", - "Severity": "Low", - "InternalDescription": "An internal description of the Alert", - "Title": "The Title", - "UxDescription": "Description of the alerts", - "RecommendedAction": "The alert's recommended action", - "Category": "Trojan", - "Enabled": True} + +## Step 5: Create a new indicator of compromise +You can now use the alert ID obtained from creating a new alert definition to create a new indicator of compromise. -response = session.post( - "https://ti.securitycenter.windows.com/V1.0/AlertDefinitions", - json=alert_definition) -``` +[!code[CustomTIAPI](./code/example.py1#L41-L51)] -## Create a new indicator of compromise -The following example shows how to use the alert ID obtained from creating a new alert definition to create a new indicator of compromise. +## Complete code +You can use the complete code to create calls to the API. -``` -alert_definition_id = json.loads(response.text)["Id"] - ioc = {'Type': "Sha1", - 'Value': "dead1111eeaabbccddeeaabbccddee11ffffffff", - 'DetectionFunction': "Equals", - 'Enabled': True, - "AlertDefinition@odata.bind": "AlertDefinitions({0})".format(alert_definition_id)} - - response = session.post( - "https://ti.securitycenter.windows.com/V1.0/IndicatorsOfCompromise", - json=ioc) -``` +[!code[CustomTIAPI](./code/example.py1#L1-L51)] From d06121c2af31dbb1d5cad01c9f9eddf2ec584f89 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Thu, 2 Mar 2017 20:53:31 -0800 Subject: [PATCH 20/54] md file accidentally moved to images, moving back out --- smb/{images => }/cloud-mode-business-setup.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename smb/{images => }/cloud-mode-business-setup.md (100%) diff --git a/smb/images/cloud-mode-business-setup.md b/smb/cloud-mode-business-setup.md similarity index 100% rename from smb/images/cloud-mode-business-setup.md rename to smb/cloud-mode-business-setup.md From fc94a872db0820804dee40ddef326331b3b5f4fc Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 20:56:03 -0800 Subject: [PATCH 21/54] update name of python code --- ...-windows-defender-advanced-threat-protection.md | 2 +- ...-windows-defender-advanced-threat-protection.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md index 76e7f4138e..9ec25133c4 100644 --- a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md @@ -56,7 +56,7 @@ If this is the first time to use the API, the response is empty. ## Step 4: Create a new alert definition -The following example shows how to create a new alert definition. +The following example demonstrates how you to create a new alert definition. [!code[CustomTIAPI](./code/example.ps1#L26-L39)] diff --git a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md index e3414a7cb8..f8eec68c61 100644 --- a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md @@ -39,36 +39,36 @@ The following example demonstrates how to obtain an Azure AD access token that y Replace the *tenant\_id*, *client_id*, and *client_secret* values with the ones you got from **Preferences settings** page in the portal: -[!code[CustomTIAPI](./code/example.py1#L1-L17)] +[!code[CustomTIAPIpython](./code/example.py1#L1-L17)] ## Step 2: Create request session object Add HTTP headers to the session object, including the Authorization header with the token that was obtained. -[!code[CustomTIAPI](./code/example.py1#L19-L23)] +[!code[CustomTIAPIpython](./code/example.py1#L19-L23)] ## Step 3: Create calls to the custom threat intelligence API After adding HTTP headers to the session object, you can now create calls to the API. The following example demonstrates how you can view all the alert definition entities: -[!code[CustomTIAPI](./code/example.py1#L25-L26)] +[!code[CustomTIAPIpython](./code/example.py1#L25-L26)] If this is the first time to use the API, the response is empty. ## Step 4: Create a new alert definition -The following example shows how to create a new alert definition. +The following example demonstrates how you to create a new alert definition. -[!code[CustomTIAPI](./code/example.py1#L28-L39)] +[!code[CustomTIAPIpython](./code/example.py1#L28-L39)] ## Step 5: Create a new indicator of compromise You can now use the alert ID obtained from creating a new alert definition to create a new indicator of compromise. -[!code[CustomTIAPI](./code/example.py1#L41-L51)] +[!code[CustomTIAPIpython](./code/example.py1#L41-L51)] ## Complete code You can use the complete code to create calls to the API. -[!code[CustomTIAPI](./code/example.py1#L1-L51)] +[!code[CustomTIAPIpython](./code/example.py1#L1-L51)] From 00b2a73647682ef58d2f683aa3141ab77303fb9e Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 20:57:30 -0800 Subject: [PATCH 22/54] update file name --- windows/keep-secure/code/{exampe.py => example.py} | 0 ...de-windows-defender-advanced-threat-protection.md | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) rename windows/keep-secure/code/{exampe.py => example.py} (100%) diff --git a/windows/keep-secure/code/exampe.py b/windows/keep-secure/code/example.py similarity index 100% rename from windows/keep-secure/code/exampe.py rename to windows/keep-secure/code/example.py diff --git a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md index f8eec68c61..6260405baf 100644 --- a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md @@ -39,20 +39,20 @@ The following example demonstrates how to obtain an Azure AD access token that y Replace the *tenant\_id*, *client_id*, and *client_secret* values with the ones you got from **Preferences settings** page in the portal: -[!code[CustomTIAPIpython](./code/example.py1#L1-L17)] +[!code[CustomTIAPI](./code/example.py#L1-L17)] ## Step 2: Create request session object Add HTTP headers to the session object, including the Authorization header with the token that was obtained. -[!code[CustomTIAPIpython](./code/example.py1#L19-L23)] +[!code[CustomTIAPI](./code/example.py#L19-L23)] ## Step 3: Create calls to the custom threat intelligence API After adding HTTP headers to the session object, you can now create calls to the API. The following example demonstrates how you can view all the alert definition entities: -[!code[CustomTIAPIpython](./code/example.py1#L25-L26)] +[!code[CustomTIAPI](./code/example.py#L25-L26)] If this is the first time to use the API, the response is empty. @@ -60,15 +60,15 @@ If this is the first time to use the API, the response is empty. ## Step 4: Create a new alert definition The following example demonstrates how you to create a new alert definition. -[!code[CustomTIAPIpython](./code/example.py1#L28-L39)] +[!code[CustomTIAPI](./code/example.py#L28-L39)] ## Step 5: Create a new indicator of compromise You can now use the alert ID obtained from creating a new alert definition to create a new indicator of compromise. -[!code[CustomTIAPIpython](./code/example.py1#L41-L51)] +[!code[CustomTIAPI](./code/example.py#L41-L51)] ## Complete code You can use the complete code to create calls to the API. -[!code[CustomTIAPIpython](./code/example.py1#L1-L51)] +[!code[CustomTIAPI](./code/example.py#L1-L51)] From 396063f29ec0ec56a67a8123b114e7c61cf11e31 Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 21:00:22 -0800 Subject: [PATCH 23/54] add step 5 --- ...-example-code-windows-defender-advanced-threat-protection.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md index 9ec25133c4..d8b9b38f4a 100644 --- a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md @@ -61,7 +61,7 @@ The following example demonstrates how you to create a new alert definition. [!code[CustomTIAPI](./code/example.ps1#L26-L39)] -## Create a new indicator of compromise +## Step 5: Create a new indicator of compromise You can now use the alert ID obtained from creating a new alert definition to create a new indicator of compromise. [!code[CustomTIAPI](./code/example.ps1#L43-L53)] From 86810b957839e525b24120ee8927a51508d68fe5 Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 21:04:26 -0800 Subject: [PATCH 24/54] minor edit --- ...-example-code-windows-defender-advanced-threat-protection.md | 2 +- ...-example-code-windows-defender-advanced-threat-protection.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md index d8b9b38f4a..c7e14c01db 100644 --- a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md @@ -52,7 +52,7 @@ After creating the headers, you can now create calls to the API. The following e [!code[CustomTIAPI](./code/example.ps1#L21-L24)] -If this is the first time to use the API, the response is empty. +The response is empty on initial use of the API. ## Step 4: Create a new alert definition diff --git a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md index 6260405baf..9bd1a6336b 100644 --- a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md @@ -54,7 +54,7 @@ After adding HTTP headers to the session object, you can now create calls to the [!code[CustomTIAPI](./code/example.py#L25-L26)] -If this is the first time to use the API, the response is empty. +The response is empty on initial use of the API. ## Step 4: Create a new alert definition From d1b8b8699ff39b5feb012729e464728d56a811c3 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Thu, 2 Mar 2017 21:09:19 -0800 Subject: [PATCH 25/54] some images are not showing up so added spaces to see if that fixes it --- smb/cloud-mode-business-setup.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/smb/cloud-mode-business-setup.md b/smb/cloud-mode-business-setup.md index 1b4ad0385d..be587b1251 100644 --- a/smb/cloud-mode-business-setup.md +++ b/smb/cloud-mode-business-setup.md @@ -46,6 +46,7 @@ See Get Started with Office 365 for business. If this is the first time you're setting this up, and you'd like to see how it's done, you can follow these steps to get started: + 1. Go to the Office 365 page in the Microsoft Business site. Select **Try now** to use the Office 365 Business Premium Trial or select **Buy now** to sign up for Office 365 Business Premium. In this walkthrough, we'll select **Try now**. **Figure 1** - Try or buy Office 365 @@ -54,7 +55,9 @@ If this is the first time you're setting this up, and you'd like to see how it's 2. Fill out the sign up form and provide information about you and your company. 3. Create a user ID and password to use to sign into your account. + This step creates an onmicrosoft.com email address. You can use this email address to sign in to the various admin centers. Save your sign-in info so you can use it to sign into https://portal.office.com (the admin portal). + 4. Select **Create my account** and then enter the phone number you used in step 2 to verify your identity. You'll be asked to enter your verification code. 5. Select **You're ready to go...** which will take you to the Office 365 portal. @@ -65,21 +68,24 @@ If this is the first time you're setting this up, and you'd like to see how it's ![Office 365 portal](images/office365_portal.png) + 6. Select the **Admin** tile to go to the Office 365 admin center. 7. In the admin center, click **Next** to see the highlights and welcome info for the admin center. When you're done, click **Go to setup** to complete the Office 365 setup. This may take up to a half hour to complete. - + **Figure 3** - Office 365 admin center ![Office 365 admin center](images/office365_admin_portal.png) + 8. Go back to the Office 365 admin center to add or buy a domain. 1. Select the **Domains** option. **Figure 4** - Option to add or buy a domain ![Add or buy a domain in Office 365 admin center](images/office365_buy_domain.png) + 2. In the **Home > Domains** page, you will see the Microsoft-provided domain, such as *fabrikamdesign.onmicrosoft.com*. From 7dcaffc42e27de15ded1ad26a8395eb96fb9d53e Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 21:24:50 -0800 Subject: [PATCH 26/54] remove line --- windows/keep-secure/code/example.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/windows/keep-secure/code/example.ps1 b/windows/keep-secure/code/example.ps1 index 3bba0ef005..877292e484 100644 --- a/windows/keep-secure/code/example.ps1 +++ b/windows/keep-secure/code/example.ps1 @@ -28,7 +28,6 @@ $alertDefinitionPayload = @{ "Severity"= "Low" "InternalDescription"= "An internal description of the Alert" "Title"= "The Title" - "UxDescription"= "Description of the alerts" "RecommendedAction"= "The alert's recommended action" "Category"= "Trojan" From 75a78e6ebd6e1cae63c381c5e011a6a60ec499a5 Mon Sep 17 00:00:00 2001 From: jcaparas Date: Thu, 2 Mar 2017 21:45:38 -0800 Subject: [PATCH 27/54] fix related topics --- ...-ti-api-windows-defender-advanced-threat-protection.md | 8 +++++--- ...stom-ti-windows-defender-advanced-threat-protection.md | 6 ++++-- ...le-code-windows-defender-advanced-threat-protection.md | 7 +++++++ ...le-code-windows-defender-advanced-threat-protection.md | 7 +++++++ ...oncepts-windows-defender-advanced-threat-protection.md | 6 ++++-- ...stom-ti-windows-defender-advanced-threat-protection.md | 8 ++++++++ 6 files changed, 35 insertions(+), 7 deletions(-) diff --git a/windows/keep-secure/custom-ti-api-windows-defender-advanced-threat-protection.md b/windows/keep-secure/custom-ti-api-windows-defender-advanced-threat-protection.md index 7c5f60b159..eecae9a27a 100644 --- a/windows/keep-secure/custom-ti-api-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/custom-ti-api-windows-defender-advanced-threat-protection.md @@ -347,11 +347,13 @@ These parameters are compatible with the [OData V4 query language](http://docs.o ## Code examples The following articles provide detailed code examples that demonstrate how to use the custom threat intelligence API in several programming languages: -- PowerShell code examples -- Python code examples +- [PowerShell code examples](powershell-example-code-windows-defender-advanced-threat-protection.md) +- [Python code examples](python-example-code-windows-defender-advanced-threat-protection.md) ## Related topics -- [Understand threat intelligence](threat-indicator-concepts-windows-defender-advanced-threat-protection.md) +- [Understand threat intelligence concepts](threat-indicator-concepts-windows-defender-advanced-threat-protection.md) - [Enable the custom threat intelligence application](enable-custom-ti-windows-defender-advanced-threat-protection.md) +- [PowerShell code examples](powershell-example-code-windows-defender-advanced-threat-protection.md) +- [Python code examples](python-example-code-windows-defender-advanced-threat-protection.md) - [Troubleshoot custom threat intelligence issues](troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md) diff --git a/windows/keep-secure/enable-custom-ti-windows-defender-advanced-threat-protection.md b/windows/keep-secure/enable-custom-ti-windows-defender-advanced-threat-protection.md index 38074271e9..e62a85a083 100644 --- a/windows/keep-secure/enable-custom-ti-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/enable-custom-ti-windows-defender-advanced-threat-protection.md @@ -40,6 +40,8 @@ Before you can create custom threat intelligence (TI) using REST API, you'll nee You’ll need to use the access token in the Authorization header when doing REST API calls. ## Related topics -- [Understand threat intelligence](threat-indicator-concepts-windows-defender-advanced-threat-protection.md) -- [Create custom threat intelligence](custom-ti-api-windows-defender-advanced-threat-protection.md) +- [Understand threat intelligence concepts](threat-indicator-concepts-windows-defender-advanced-threat-protection.md) +- [Create custom threat intelligence alerts](custom-ti-api-windows-defender-advanced-threat-protection.md) +- [PowerShell code examples](powershell-example-code-windows-defender-advanced-threat-protection.md) +- [Python code examples](python-example-code-windows-defender-advanced-threat-protection.md) - [Troubleshoot custom threat intelligence issues](troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md) diff --git a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md index c7e14c01db..5574319409 100644 --- a/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/powershell-example-code-windows-defender-advanced-threat-protection.md @@ -70,3 +70,10 @@ You can now use the alert ID obtained from creating a new alert definition to cr You can use the complete code to create calls to the API. [!code[CustomTIAPI](./code/example.ps1#L1-L53)] + +## Related topics +- [Understand threat intelligence concepts](threat-indicator-concepts-windows-defender-advanced-threat-protection.md) +- [Enable the custom threat intelligence application](enable-custom-ti-windows-defender-advanced-threat-protection.md) +- [Create custom threat intelligence alerts](custom-ti-api-windows-defender-advanced-threat-protection.md) +- [Python code examples](python-example-code-windows-defender-advanced-threat-protection.md) +- [Troubleshoot custom threat intelligence issues](troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md) diff --git a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md b/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md index 9bd1a6336b..36b0a25f3b 100644 --- a/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/python-example-code-windows-defender-advanced-threat-protection.md @@ -72,3 +72,10 @@ You can now use the alert ID obtained from creating a new alert definition to cr You can use the complete code to create calls to the API. [!code[CustomTIAPI](./code/example.py#L1-L51)] + +## Related topics +- [Understand threat intelligence](threat-indicator-concepts-windows-defender-advanced-threat-protection.md) +- [Create custom threat intelligence alerts](custom-ti-api-windows-defender-advanced-threat-protection.md) +- [Enable the custom threat intelligence application](enable-custom-ti-windows-defender-advanced-threat-protection.md) +- [PowerShell code examples](powershell-example-code-windows-defender-advanced-threat-protection.md) +- [Troubleshoot custom threat intelligence issues](troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md) diff --git a/windows/keep-secure/threat-indicator-concepts-windows-defender-advanced-threat-protection.md b/windows/keep-secure/threat-indicator-concepts-windows-defender-advanced-threat-protection.md index 32dc72d7fd..835ddbf45a 100644 --- a/windows/keep-secure/threat-indicator-concepts-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/threat-indicator-concepts-windows-defender-advanced-threat-protection.md @@ -11,7 +11,7 @@ author: mjcaparas localizationpriority: high --- -# Understand threat indicators +# Understand threat intelligence concepts **Applies to:** @@ -49,5 +49,7 @@ IOCs have a many-to-one relationship with alert definitions such that an alert d ## Related topic - [Enable the custom threat intelligence application](enable-custom-ti-windows-defender-advanced-threat-protection.md) -- [Create custom threat indicators using REST API](custom-ti-api-windows-defender-advanced-threat-protection.md) +- [Create custom threat intelligence alerts](custom-ti-api-windows-defender-advanced-threat-protection.md) +- [PowerShell code examples](powershell-example-code-windows-defender-advanced-threat-protection.md) +- [Python code examples](python-example-code-windows-defender-advanced-threat-protection.md) - [Troubleshoot custom threat intelligence issues](troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md) diff --git a/windows/keep-secure/troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md b/windows/keep-secure/troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md index 5448e0e2f5..d63bd1bf4c 100644 --- a/windows/keep-secure/troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md @@ -44,3 +44,11 @@ If your client secret expires or if you've misplaced the copy provided when you 6. Click **Save**. The key value is displayed. 7. Copy the value and save it in a safe place. + + +## Related topics +- [Understand threat intelligence](threat-indicator-concepts-windows-defender-advanced-threat-protection.md) +- [Enable the custom threat intelligence application](enable-custom-ti-windows-defender-advanced-threat-protection.md) +- [Create custom threat intelligence](custom-ti-api-windows-defender-advanced-threat-protection.md) +- [PowerShell code examples](powershell-example-code-windows-defender-advanced-threat-protection.md) +- [Python code examples](python-example-code-windows-defender-advanced-threat-protection.md) From 3fa36f50023ab83e1fd99a8e7270b2a0b7b5ac3f Mon Sep 17 00:00:00 2001 From: LizRoss Date: Fri, 3 Mar 2017 09:43:49 -0800 Subject: [PATCH 28/54] Adding content --- browsers/edge/available-policies.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browsers/edge/available-policies.md b/browsers/edge/available-policies.md index 12e1c2171d..110429fbf6 100644 --- a/browsers/edge/available-policies.md +++ b/browsers/edge/available-policies.md @@ -16,6 +16,9 @@ localizationpriority: high - Windows 10, Windows Insider Program - Windows 10 Mobile, Windows Insider Program +> [!IMPORTANT] +> Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here. + Microsoft Edge works with Group Policy and Microsoft Intune to help you manage your organization's computer settings. Group Policy objects (GPO's) can include registry-based Administrative Template policy settings, security settings, software deployment information, scripts, folder redirection, and preferences. By using Group Policy and Intune, you can set up a policy setting once, and then copy that setting onto many computers. For example, you can set up multiple security settings in a GPO that's linked to a domain, and then apply all of those settings to every computer in the domain. From 050f0773dbd70cf393e2bf80534321a683849bb3 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 12:26:27 -0800 Subject: [PATCH 29/54] draft done --- windows/deploy/mbr-to-gpt.md | 68 ++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index a5b06869f5..a538b7d0f1 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -17,18 +17,22 @@ localizationpriority: high ## Summary -**MBR2GPT.EXE** converts a disk from Master Boot Record (MBR) to GUID Partition Table (GPT) partition style without modifying or deleting data on the disk. The tool is designed to be run from a Windows PE command prompt, but can also be run from the full Windows 10 operating system (OS). +**MBR2GPT.EXE** converts a disk from Master Boot Record (MBR) to GUID Partition Table (GPT) partition style without modifying or deleting data on the disk. The tool is designed to be run from a Windows Preinstallation Environment (Windows PE) command prompt, but can also be run from the full Windows 10 operating system (OS). You can use MBR2GPT to perform the following: -- Within the WinPE environment: Convert any attached MBR-formatted disk to GPT, including the system disk. +- Within the Windows PE environment: Convert any attached MBR-formatted disk to GPT, including the system disk. - From within the currently running OS: Convert any attached MBR-formatted disk to GPT, including the system disk. >MBR2GPT is available in Windows 10 version 1703, also known as Windows 10 Creator's Update, and later versions. ->The tool is available in both the full OS environment and the Windows Preinstallation Environment (WinPE). +>The tool is available in both the full OS environment and Windows PE. You can use MBR2GPT to convert an MBR disk with BitLocker-encrypted volumes as long as protection has been suspended. To resume BitLocker after conversion, you will need to delete the existing protectors and recreate them. +The MBR2GPT tool can convert operating system disks that are running earlier versions of Windows, such as Windows 10 versions 1507, 1511, and 1607. However, you must run the tool while booted into Windows 10 version 1703 or later, and perform an offline conversion. + +After the disk has been converted to GPT partition style, the firmware must be reconfigured to boot in UEFI mode. Make sure that your device supports UEFI before attempting to convert the disk. + ## Syntax ``` @@ -43,13 +47,12 @@ MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map: |/convert| Instructs MBR2GPT.exe to perform the disk validation and to proceed with the conversion if all validation tests pass. | |/disk:\| Specifies the disk number of the disk to be converted to GPT. If not specified, the system disk is used. The mechanism used is the same as that used by the diskpart.exe tool **SELECT DISK SYSTEM** command.| |/logs:\| Specifies the directory where MBR2GPT.exe logs should be written. If not specified, **%windir%** is used. If specified, the directory must already exist, it will not be automatically created or overwritten.| -|/map:\=\| Specifies additional partition type mappings between MBR and GPT. The MBR partition number is specified in decimal notation, not hexidecimal. The GPT GUID can contain brackets, for example: **/map:42={af9b60a0-1431-4f62-bc68-3311714a69ad}**. | -|/allowFullOS| By default, MBR2GPT.exe is blocked unless it is run from WinPE. This option overrides this block and enables disk conversion while running in the full Windows environment.| -|/silent| Suppresses all warning messages so that the utility can be used in scripts.| +|/map:\=\| Specifies additional partition type mappings between MBR and GPT. The MBR partition number is specified in decimal notation, not hexidecimal. The GPT GUID can contain brackets, for example: **/map:42={af9b60a0-1431-4f62-bc68-3311714a69ad}**. Multiple /map options can be specified if multiple mappings are required. | +|/allowFullOS| By default, MBR2GPT.exe is blocked unless it is run from Windows PE. This option overrides this block and enables disk conversion while running in the full Windows environment.| ## Examples -### Validatiion example +### Validation example In the following example, disk 0 is validated for conversion. Errors and warnings are logged to the default location, **%windir%**. @@ -70,7 +73,7 @@ In the following example: 2. The MBR2GPT tool is used to convert disk 0. 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 [GPT partition type](https://msdn.microsoft.com/library/windows/desktop/aa365449.aspx) **ebd0a0a2-b9e5-4433-87c0-68b6b72699c7** corresponding to the **PARTITION_BASIC_DATA_GUID** type. +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) **ebd0a0a2-b9e5-4433-87c0-68b6b72699c7** corresponding to the **PARTITION_BASIC_DATA_GUID** type. >[!IMPORTANT] >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. @@ -198,18 +201,14 @@ The following steps illustrate high-level phases of the MBR-to-GPT conversion pr 2. The disk is repartitioned to create an EFI system partition (ESP) if one does not already exist. 3. UEFI boot files are installed to the ESP. 4. GPT metatdata and layout information is applied. -5. The BCD store is updated. +5. The boot configuration data (BCD) store is updated. 6. Drive letter assignments are restored. -These steps are summarized in the diagram below: - -![Workflow](images/mbr2gpt-workflow.PNG) - ### Disk validation Before any change to the disk is made, MBR2GPT validates the layout and geometry of the selected disk to ensure that: - The disk is currently using MBR -- There is enough space not occupied by partitions to meet GPT’s reserved space requirements: +- There is enough space not occupied by partitions to store the primary and secondary GPTs: - 16KB + 2 sectors at the front of the disk - 16KB + 1 sector at the end of the disk - There are at most 3 primary partitions in the MBR partition table @@ -225,13 +224,13 @@ If any of these checks fails, the conversion will not proceed and an error will For Windows to remain bootable after the conversion, an EFI system partition (ESP) must be in place. MBR2GPT creates the ESP using the following rules: 1. The existing MBR system partition is reused if it meets these requirements: - a. It is not also the OS or WinRE partition - b. It is at least 100MB (or 256MB for 4K-sector-size disks) in size + a. It is not also the OS or Windows Recovery Environment partition + b. It is at least 100MB (or 260MB for 4K sector size disks) in size c. It is less than or equal to 1GB in size. This is a safety precaution to ensure it is not a data partition. d. If the conversion is being performed from the full OS, the disk being converted is not the system disk. -2. If the existing MBR system partition cannot be reused, a new ESP is created by shrinking the OS partition. This new partition has a size of 100MB (or 256MB for 4K-sector-size disks) and is formatted FAT32. +2. If the existing MBR system partition cannot be reused, a new ESP is created by shrinking the OS partition. This new partition has a size of 100MB (or 260MB for 4K sector size disks) and is formatted FAT32. -If the existing MBR system partition is not reused for the ESP, it is no longer by the boot process after the conversion. Other partitions are not modified. +If the existing MBR system partition is not reused for the ESP, it is no longer used by the boot process after the conversion. Other partitions are not modified. ### Partition type mapping and partition attributes @@ -246,9 +245,14 @@ In addition to applying the correct partition types, partitions of type PARTITIO - GPT_ATTRIBUTE_PLATFORM_REQUIRED (0x0000000000000001) - GPT_BASIC_DATA_ATTRIBUTE_NO_DRIVE_LETTER (0x8000000000000000) +For more information about partition types, see: +- [GPT partition types](https://msdn.microsoft.com/library/windows/desktop/aa365449.aspx) +- [MBR partition types](https://msdn.microsoft.com/library/windows/desktop/aa363990.aspx) + + ### Persisting drive letter assignments -The conversion tool will attempt to remap all entries from **HKLM\SYSTEM\MountedDevices** that correspond to the volumes that are part of the converted disk. If an entry cannot be converted and it represents a drive letter assignment, an error will be issued at the console and in the log, giving the user the ability to manually perform the correct assignment of the drive letter. **Important**: this code runs after the layout conversion has taken place, so the operation cannot be undone at this stage. +The conversion tool will attempt to remap all drive letter assignment information contained in the registry that correspond to the volumes of the converted disk. If a drive letter assignment cannot be restored, an error will be displayed at the console and in the log, so that you can manually perform the correct assignment of the drive letter. **Important**: this code runs after the layout conversion has taken place, so the operation cannot be undone at this stage. The conversion tool will obtain volume unique ID before and after the layout conversion, organizing this information into a lookup table. It will then iterate through all the entries in **HKLM\SYSTEM\MountedDevices**, and for each entry do the following: @@ -304,18 +308,36 @@ Where: ``` +### Return codes + +The following return codes are displayed by MBR2GPT: + +| Return code | Description | +|----|-------------| +|0| Conversion completed successfully.| +|1| Conversion was canceled by the user.| +|2| Conversion failed due to an internal error.| +|3| Conversion failed due to an initialization error.| +|4| Conversion failed due to invalid command-line parameters. | +|5| Conversion failed due to error reading the geometry and layout of the selected disk.| +|6| Conversion failed because one or more volumes on the disk is encrypted.| +|7| Conversion failed because the geometry and layout of the selected disk do not meet requirements.| +|8| Conversion failed due to error while creating the EFI system partition.| +|9| Conversion failed due to error installing boot files.| +|10| Conversion failed due to error while applying GPT layout.| +|100| Conversion to GPT layout succeeded, but some boot configuration data entries could not be restored.| + ### Logs -Two log files are created by the MBR2GPT tool: +Four log files are created by the MBR2GPT tool: - diagerr.xml - diagwrn.xml - -These files contain errors and warnings, respectively, encountered during disk validation and conversion. These tool-specific logs can be helpful in diagnosing problems with the tool, however they are not meant to replace the default Windows Setup log files: - - setupact.log - setuperr.log +These files contain errors and warnings, respectively, encountered during disk validation and conversion. These logs can be helpful in diagnosing problems with the tool. The setupact.log and setuperr.log files will have the most detailed information about disk layouts and other information and processes that are encountered during validation and conversion. Note: The setupact*.log files are different than the Windows Setup files that are found in the %Windir%\Panther directory. + The default location for all these log files in Windows PE is **%windir%**. ### Determining the partition type From 5724c5c39bd455f15457a41738ae22db2dba7a18 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 12:40:34 -0800 Subject: [PATCH 30/54] draft done --- windows/deploy/mbr-to-gpt.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index a538b7d0f1..fe519db347 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -31,7 +31,8 @@ You can use MBR2GPT to convert an MBR disk with BitLocker-encrypted volumes as l The MBR2GPT tool can convert operating system disks that are running earlier versions of Windows, such as Windows 10 versions 1507, 1511, and 1607. However, you must run the tool while booted into Windows 10 version 1703 or later, and perform an offline conversion. -After the disk has been converted to GPT partition style, the firmware must be reconfigured to boot in UEFI mode. Make sure that your device supports UEFI before attempting to convert the disk. +>[!IMPORTANT] +>After the disk has been converted to GPT partition style, the firmware must be reconfigured to boot in UEFI mode. Make sure that your device supports UEFI before attempting to convert the disk. ## Syntax @@ -73,9 +74,8 @@ In the following example: 2. The MBR2GPT tool is used to convert disk 0. 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) **ebd0a0a2-b9e5-4433-87c0-68b6b72699c7** corresponding to the **PARTITION_BASIC_DATA_GUID** type. +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)   **ebd0a0a2-b9e5-4433-87c0-68b6b72699c7** corresponding to the **PARTITION_BASIC_DATA_GUID** type. ->[!IMPORTANT] >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. ``` From 8d627a6d4de37abd602947631ff4c4c7ca59d635 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 12:43:18 -0800 Subject: [PATCH 31/54] draft done --- windows/deploy/mbr-to-gpt.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index fe519db347..e3082d8322 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -36,10 +36,14 @@ The MBR2GPT tool can convert operating system disks that are running earlier ver ## Syntax +

+ ``` MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS] ``` +
+ ### Options | Option | Description | From dd9179e6b336ffe48b9c75792531e938c4fca617 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 12:45:27 -0800 Subject: [PATCH 32/54] draft done --- windows/deploy/mbr-to-gpt.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index e3082d8322..ec05ed70c7 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -78,7 +78,7 @@ In the following example: 2. The MBR2GPT tool is used to convert disk 0. 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)   **ebd0a0a2-b9e5-4433-87c0-68b6b72699c7** corresponding to the **PARTITION_BASIC_DATA_GUID** type. +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) **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. From b2219ef1dd7a8c7d4fdb54295473c98ab6389f0d Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 12:49:36 -0800 Subject: [PATCH 33/54] draft done --- windows/deploy/mbr-to-gpt.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index ec05ed70c7..84ee78ec10 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -29,10 +29,10 @@ You can use MBR2GPT to perform the following: You can use MBR2GPT to convert an MBR disk with BitLocker-encrypted volumes as long as protection has been suspended. To resume BitLocker after conversion, you will need to delete the existing protectors and recreate them. -The MBR2GPT tool can convert operating system disks that are running earlier versions of Windows, such as Windows 10 versions 1507, 1511, and 1607. However, you must run the tool while booted into Windows 10 version 1703 or later, and perform an offline conversion. +The MBR2GPT tool can convert operating system disks that have earlier versions of Windows installed, such as Windows 10 versions 1507, 1511, and 1607. However, you must run the tool while booted into Windows 10 version 1703 or later, and perform an offline conversion. >[!IMPORTANT] ->After the disk has been converted to GPT partition style, the firmware must be reconfigured to boot in UEFI mode. Make sure that your device supports UEFI before attempting to convert the disk. +>After the disk has been converted to GPT partition style, the firmware must be reconfigured to boot in UEFI mode.
Make sure that your device supports UEFI before attempting to convert the disk. ## Syntax From 7fb3521313f5e84b8cefcec004ad24f140a05c22 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 12:52:21 -0800 Subject: [PATCH 34/54] draft done --- windows/deploy/mbr-to-gpt.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 84ee78ec10..408698d4a4 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -36,7 +36,7 @@ The MBR2GPT tool can convert operating system disks that have earlier versions o ## Syntax -
+
``` MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS] @@ -44,6 +44,7 @@ MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map:
+ ### Options | Option | Description | From 178bb9524e1d9b13c304ff225b42a0103047daae Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 12:54:52 -0800 Subject: [PATCH 35/54] draft done --- windows/deploy/mbr-to-gpt.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 408698d4a4..aff993ba86 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -79,7 +79,7 @@ In the following example: 2. The MBR2GPT tool is used to convert disk 0. 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) **ebd0a0a2-b9e5-4433-87c0-68b6b72699c7** corresponding to the **PARTITION_BASIC_DATA_GUID** type. +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. From dcba64e7e9589afb1ed27b457457fd821c6a7b19 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 13:01:06 -0800 Subject: [PATCH 36/54] draft done --- windows/deploy/mbr-to-gpt.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index aff993ba86..6eef8da0ac 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -21,8 +21,8 @@ localizationpriority: high You can use MBR2GPT to perform the following: -- Within the Windows PE environment: Convert any attached MBR-formatted disk to GPT, including the system disk. -- From within the currently running OS: Convert any attached MBR-formatted disk to GPT, including the system disk. +- \[Within the Windows PE environment\]: Convert any attached MBR-formatted disk to GPT, including the system disk. +- \[From within the currently running OS\]: Convert any attached MBR-formatted disk to GPT, including the system disk. >MBR2GPT is available in Windows 10 version 1703, also known as Windows 10 Creator's Update, and later versions. >The tool is available in both the full OS environment and Windows PE. @@ -36,13 +36,7 @@ The MBR2GPT tool can convert operating system disks that have earlier versions o ## Syntax -
- -``` -MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS] -``` - -
+
MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]
### Options From 61e51a91ac5357e04cab3c421b48e36281887624 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 13:02:21 -0800 Subject: [PATCH 37/54] draft done --- windows/deploy/mbr-to-gpt.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 6eef8da0ac..d1bdccaba0 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -36,7 +36,7 @@ The MBR2GPT tool can convert operating system disks that have earlier versions o ## Syntax -
MBR2GPT.exe /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]
+
MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]
### Options From 41487852bc3bc17f03f0866b77e21cc457b5684e Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 13:08:37 -0800 Subject: [PATCH 38/54] draft done --- windows/deploy/mbr-to-gpt.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index d1bdccaba0..259dbf6521 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -36,7 +36,9 @@ The MBR2GPT tool can convert operating system disks that have earlier versions o ## Syntax -
MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]
+``` +MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS] +``` ### Options From 392e4e817647b116eb39587d4bd59a4944f8f8dd Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 13:36:00 -0800 Subject: [PATCH 39/54] draft done --- windows/deploy/mbr-to-gpt.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 259dbf6521..b1c03a1403 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -40,6 +40,17 @@ The MBR2GPT tool can convert operating system disks that have earlier versions o MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS] ``` + +
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] +
+ +`MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]` + +
MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]
+ +***MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]*** + +***MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]*** ### Options From b710a210a0aded1df4ef8be3ef8af7f34b79010c Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 13:44:21 -0800 Subject: [PATCH 40/54] draft done --- windows/deploy/mbr-to-gpt.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index b1c03a1403..8882ec0ece 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -52,6 +52,16 @@ MBR2GPT /validate|convert [/disk:] [/logs:] [/map:] [/logs:\] [/map:\=\] [/allowFullOS]*** +
+``` +MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS] +``` +
+ +
+`MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]` +
+ ### Options | Option | Description | From 536cca3ac70fcf5895083360edc45e624b391ab5 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 13:51:27 -0800 Subject: [PATCH 41/54] draft done --- windows/deploy/mbr-to-gpt.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 8882ec0ece..14f07feeb4 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -62,6 +62,14 @@ MBR2GPT /validate|convert [/disk:] [/logs:] [/map:] [/logs:] [/map:=] [/allowFullOS]`
+ +
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] +
+ + +
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] +
+ ### Options | Option | Description | From 7ef6574651390021fb2575cbe8f17df6071724fd Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 13:55:10 -0800 Subject: [PATCH 42/54] draft done --- windows/deploy/mbr-to-gpt.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 14f07feeb4..0f6ba54c9b 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -58,7 +58,7 @@ MBR2GPT /validate|convert [/disk:] [/logs:] [/map: -
+
`MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]`
@@ -340,7 +340,7 @@ Where: ### Return codes -The following return codes are displayed by MBR2GPT: +MBR2GPT has the following associated return codes: | Return code | Description | |----|-------------| From 631ea9fc4d1e6e0eb33031c647ea8180f1c546c4 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 14:01:21 -0800 Subject: [PATCH 43/54] draft done --- windows/deploy/mbr-to-gpt.md | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 0f6ba54c9b..17940ad043 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -44,32 +44,29 @@ MBR2GPT /validate|convert [/disk:] [/logs:] [/map:MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] -`MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]` -
MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]
- -***MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]*** - -***MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]*** - -
-``` +
 MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]
-```
-
+ + -
-`MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]` -
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
+ +
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] +
+
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
+ +
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] +
+ ### Options | Option | Description | From cd75bdcce8af76ecc181bb57a51cd490cab5c4e4 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 14:03:13 -0800 Subject: [PATCH 44/54] draft done --- windows/deploy/mbr-to-gpt.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 17940ad043..8de07198c5 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -49,7 +49,9 @@ MBR2GPT /validate|convert [/disk:] [/logs:] [/map:] [/logs:] [/map:=] [/allowFullOS] - +
+MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
+
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] From e8455192638b6d0bfd1072b9bb11a475e9ecb67d Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 14:07:01 -0800 Subject: [PATCH 45/54] trying to get syntax on one line --- windows/deploy/mbr-to-gpt.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 8de07198c5..2a3fc365c2 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -69,6 +69,13 @@ MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
+
+ +
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] +
+
+ + ### Options | Option | Description | From 0d63c3e7622419cad894395b5d9f6f851eadbc3c Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 14:10:35 -0800 Subject: [PATCH 46/54] trying to get syntax on one line --- windows/deploy/mbr-to-gpt.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 2a3fc365c2..6a4b5fdb66 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -58,7 +58,7 @@ MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map: -
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] +
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
From 16350475d79d38d79b0c6d577a4c9a256a2bbd53 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 14:14:30 -0800 Subject: [PATCH 47/54] trying to get syntax on one line --- windows/deploy/mbr-to-gpt.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 6a4b5fdb66..032a68f18a 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -44,15 +44,6 @@ MBR2GPT /validate|convert [/disk:] [/logs:] [/map:
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
- -
-MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS]
-
- -
-MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
-
-
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
From 0be2d9abd1ea45f5dd3eb1e634472b8f803635d3 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 14:17:22 -0800 Subject: [PATCH 48/54] I hate markdown --- windows/deploy/mbr-to-gpt.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 032a68f18a..0f86cfcab9 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -56,7 +56,7 @@ MBR2GPT /validate|convert [/disk:] [/logs:] [/map:MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] - +
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
From 2803a165f3fb62c09e8d803b6517774df3c4ca4f Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 14:26:37 -0800 Subject: [PATCH 49/54] I hate markdown --- windows/deploy/mbr-to-gpt.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 0f86cfcab9..eab1b71dec 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -37,19 +37,20 @@ The MBR2GPT tool can convert operating system disks that have earlier versions o ## Syntax ``` -MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] [/allowFullOS] +MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] +[/allowFullOS] ```
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
- -
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] + +
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
-
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] +
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
@@ -60,12 +61,14 @@ MBR2GPT /validate|convert [/disk:] [/logs:] [/map:
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
-
+
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
+- Last try + ### Options From c65dc0921e8db701a1406162b9478c7cf3a56d86 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 14:35:18 -0800 Subject: [PATCH 50/54] ended up using table style --- windows/deploy/mbr-to-gpt.md | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index eab1b71dec..5d8d8e9247 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -36,40 +36,10 @@ The MBR2GPT tool can convert operating system disks that have earlier versions o ## Syntax -``` -MBR2GPT /validate|convert [/disk:] [/logs:] [/map:=] -[/allowFullOS] -``` - - -
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] -
- - -
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] -
- - -
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] -
- - -
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] -
-
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS]
-
- -
MBR2GPT /validate|convert [/disk:\] [/logs:\] [/map:\=\] [/allowFullOS] -
-
- -- Last try - - ### Options | Option | Description | From 5c723e83dadd78b2a94e304171b4fe82f6855e1c Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 14:43:38 -0800 Subject: [PATCH 51/54] minor tweaks --- windows/deploy/mbr-to-gpt.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 5d8d8e9247..0d68c5dab1 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -262,7 +262,20 @@ The conversion tool will obtain volume unique ID before and after the layout con ## Troubleshooting -The tool will display status information in its output. Both validation and conversion are clear if any errors are encountered. For example, if one or more partitions do not translate properly, this is displayed and the conversion not performed. To view more detail about any errors that are encountered, see the associated log files. +The tool will display status information in its output. Both validation and conversion are clear if any errors are encountered. For example, if one or more partitions do not translate properly, this is displayed and the conversion not performed. To view more detail about any errors that are encountered, see the associated [log files](#logs). + +### Logs + +Four log files are created by the MBR2GPT tool: + +- diagerr.xml +- diagwrn.xml +- setupact.log +- setuperr.log + +These files contain errors and warnings encountered during disk validation and conversion. Information in these files can be helpful in diagnosing problems with the tool. The setupact.log and setuperr.log files will have the most detailed information about disk layouts, processes, and other information pertaining to disk validation and conversion. Note: The setupact*.log files are different than the Windows Setup files that are found in the %Windir%\Panther directory. + +The default location for all these log files in Windows PE is **%windir%**. ### Interactive help @@ -327,18 +340,6 @@ MBR2GPT has the following associated return codes: |10| Conversion failed due to error while applying GPT layout.| |100| Conversion to GPT layout succeeded, but some boot configuration data entries could not be restored.| -### Logs - -Four log files are created by the MBR2GPT tool: - -- diagerr.xml -- diagwrn.xml -- setupact.log -- setuperr.log - -These files contain errors and warnings, respectively, encountered during disk validation and conversion. These logs can be helpful in diagnosing problems with the tool. The setupact.log and setuperr.log files will have the most detailed information about disk layouts and other information and processes that are encountered during validation and conversion. Note: The setupact*.log files are different than the Windows Setup files that are found in the %Windir%\Panther directory. - -The default location for all these log files in Windows PE is **%windir%**. ### Determining the partition type From 1b2977c38b97fde87ab9c3c20dca7bdbcae30cc8 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 14:47:10 -0800 Subject: [PATCH 52/54] minor tweaks --- windows/deploy/mbr-to-gpt.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/mbr-to-gpt.md b/windows/deploy/mbr-to-gpt.md index 0d68c5dab1..5775e4b633 100644 --- a/windows/deploy/mbr-to-gpt.md +++ b/windows/deploy/mbr-to-gpt.md @@ -254,7 +254,7 @@ For more information about partition types, see: The conversion tool will attempt to remap all drive letter assignment information contained in the registry that correspond to the volumes of the converted disk. If a drive letter assignment cannot be restored, an error will be displayed at the console and in the log, so that you can manually perform the correct assignment of the drive letter. **Important**: this code runs after the layout conversion has taken place, so the operation cannot be undone at this stage. -The conversion tool will obtain volume unique ID before and after the layout conversion, organizing this information into a lookup table. It will then iterate through all the entries in **HKLM\SYSTEM\MountedDevices**, and for each entry do the following: +The conversion tool will obtain volume unique ID data before and after the layout conversion, organizing this information into a lookup table. It will then iterate through all the entries in **HKLM\SYSTEM\MountedDevices**, and for each entry do the following: 1. Check if the unique ID corresponds to any of the unique IDs for any of the volumes that are part of the converted disk. 2. If found, set the value to be the new unique ID, obtained after the layout conversion. From 5f1cc66633e04285101469db74078416bf7f1a1e Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 3 Mar 2017 15:44:13 -0800 Subject: [PATCH 53/54] done --- windows/deploy/change-history-for-deploy-windows-10.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/windows/deploy/change-history-for-deploy-windows-10.md b/windows/deploy/change-history-for-deploy-windows-10.md index a71d13e154..d2629f839f 100644 --- a/windows/deploy/change-history-for-deploy-windows-10.md +++ b/windows/deploy/change-history-for-deploy-windows-10.md @@ -11,6 +11,11 @@ author: greg-lindsay # Change history for Deploy Windows 10 This topic lists new and updated topics in the [Deploy Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md). +## March 2017 +| New or changed topic | Description | +|----------------------|-------------| +| [Convert MBR partition to GPT](mbr-to-gpt.md) | New | + ## February 2017 | New or changed topic | Description | |----------------------|-------------| From 75d41995de588b067686086f402de8632d1d8020 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Fri, 3 Mar 2017 17:33:16 -0800 Subject: [PATCH 54/54] added BI metadata --- smb/cloud-mode-business-setup.md | 5 +++++ smb/index.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/smb/cloud-mode-business-setup.md b/smb/cloud-mode-business-setup.md index be587b1251..e91ee664fb 100644 --- a/smb/cloud-mode-business-setup.md +++ b/smb/cloud-mode-business-setup.md @@ -3,8 +3,13 @@ title: Deploy and manage a full cloud IT solution for your business description: Learn how to set up a cloud infrastructure for your business, acquire devices and apps, and configure and deploy policies to your devices. keywords: smb, full cloud IT solution, small to medium business, deploy, setup, manage, Windows, Intune, Office 365 ms.prod: w10 +ms.technology: smb-windows +ms.topic: hero-article +ms.author: celested ms.mktglfcycl: deploy ms.sitesec: library +ms.lang: EN +ms.loc: US ms.pagetype: smb author: CelesteDG --- diff --git a/smb/index.md b/smb/index.md index e110eb7d93..66ce83c5e5 100644 --- a/smb/index.md +++ b/smb/index.md @@ -3,8 +3,13 @@ title: Windows 10 for small to midsize businesses description: Microsoft products and devices to transform and grow your businessLearn how to use Windows 10 for your small to midsize business. keywords: Windows 10, SMB, small business, midsize business, business ms.prod: w10 +ms.technology: smb-windows +ms.topic: article +ms.author: celested ms.mktglfcycl: deploy ms.sitesec: library +ms.lang: EN +ms.loc: US ms.pagetype: smb author: CelesteDG ---