Creating troubleshooting and Windows installation sections + Update dependencies

.gitignore

@@ -1,7 +1,6 @@
-_book/
 .vuepress/dist
 node_modules/
 .vscode/
 .DS_Store
 package-lock.json
-yarn.lock
+yarn*

.vuepress/config.js

@@ -102,16 +102,15 @@ module.exports = {
             children: [
                 ['/Intro/Def', 'What is it?'],
 				['/Intro/Booting-part', 'UEFI? Legacy? CSM? What?'],
-				['/Intro/disc', 'Disclaimer'],
             ]
 
         },
 		{
-            title: 'Multibooting Situations',
+            title: 'UEFI Multibooting',
             collapsable: false,
             sidebarDepth: 1,
             children: [
-                ['/empty/', 'Multibooting Situations'],
+                ['/empty/', 'Empty Disk(s)'],
 				{
             	collapsable: false,
             	sidebarDepth: 1,
@@ -120,7 +119,7 @@ module.exports = {
 					['/empty/diffdisk', 'Multiple disks - multiple OSes'],
 	            ]
 				},
-				['/exist/', 'Existing Filled Disk'],
+				['/exist/', 'Existing Filled Disk(s)'],
 				{
             	collapsable: false,
             	sidebarDepth: 1,
@@ -131,19 +130,36 @@ module.exports = {
 				},
             ]
 
+        },
+        {
+            title: 'Troubleshooting',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+                ['troubleshooting', 'Troubleshooting'],
+            ]
+
         },
 		{
             title: 'OpenCore configuration',
             collapsable: false,
             sidebarDepth: 1,
             children: [
-                ['/oc/win', 'For Windows booting'],
 				['/oc/linux', 'For Linux booting'],
 				['/oc/duet', 'Installing OpenCore on a legacy system'],
 				['https://dortania.github.io/OpenCore-Post-Install/multiboot/bootstrap.html', 'Using LauncherOption'],
 				['https://dortania.github.io/OpenCore-Post-Install/multiboot/bootcamp.html', 'BootCamp installation'],
             ]
 
+        },
+		{
+            title: 'Windows 10 manual and automatic Installation',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				['Win', 'Windows 10 manual and automatic Installation'],
+            ]
+
         },
     	],
     },

Intro/Booting-part.md

@@ -8,7 +8,7 @@ Usually, 2012+ computers that came with Windows 8 would have a UEFI firmware (so
 - Loads its integrated drivers and services
 - Reads the boot menu entries and start loading the first boot entry
   - If failed starts the next one
-- Loads the bootloader 
+- Loads the bootloader
   - OS is loaded after that.
 
 Usually, the said "bootloader" is contained somewhere in the disk, and that somewhere is called a **EFI Partition**. You can find this named different things like ESP (EFI System Partition), SYSTEM, EFI, BOOT and so on. This partition is **FAT32** formatted and flagged as **EF00** in MBR or **C12A7328-F81F-11D2-BA4B-00A0C93EC93B** GUID in GPT. This partition contains usually the EFI applications (like an OS bootloader) in it that are loaded at boot by the UEFI firmware (remember this as it is important for later for recovery).
@@ -19,12 +19,12 @@ Contrary to UEFI, Legacy systems are older and much more mature (dating back to
 
 These systems rely on another method of loading the bootloader. This piece of software is usually written in the first sectors of the disk (formatted as MBR) called **boot sector**, this sector is usually 512 or 4096 bytes big, the BIOS would then read the code, copy it to memory and then execute it, at that point an OS or Bootloader menu (like GRUB2) will show up:
 
-* BIOS Starts up
-* Reads the **boot sector**
-* Loads the program into memory
-* Executes the program
-* Bootloader appears
-  * The OS will boot now.
+- BIOS Starts up
+- Reads the **boot sector**
+- Loads the program into memory
+- Executes the program
+- Bootloader appears
+  - The OS will boot now.
 
 # Major differences between the systems
 
@@ -68,7 +68,7 @@ Check **BIOS Mode**, it will either say **UEFI** or **Legacy**. Note that this i
 
 ### Method 1
 
-On most Linux distributions, you can run 
+On most Linux distributions, you can run
 
 ```ls /sys/firmware/efi```
 

Intro/Def.md

@@ -19,5 +19,4 @@ Now that you made the difference, there are thing you need to know about dualboo
 
 But before starting any of this
 
-# PLEASE BACKUP YOUR DATA.
-
+# PLEASE BACKUP YOUR DATA

QUICK.md

@@ -33,13 +33,6 @@ Ok, if you're quite experienced with how partitioning and booting multiple OSes
   - If you're using linux it's the same steps as earlier (just 200MB EFI partition and somewhere to put macOS on)
 - Make sure the disk doesn't have any S.M.A.R.T errors
 - DO NOT have multiple EFIs on the same disk, you **MUST** only have **ONE** EFI partition per disk
-- The OS Install order **does not matter at all**
-  - however windows can be a bit of a bitch, so installing it after macOS can be challenging, linux doesn't pose such problems
-  - If you happen to stumble on the sad windows crap you can:
-    - Boot windows installer
-    - Erase the partition where you want windows to be installed on to NTFS (as expected)
-    - Follow the rest from this [guide over at TenForums](https://www.tenforums.com/tutorials/84331-apply-windows-image-using-dism-instead-clean-install.html#Part2)
-      - You do NOT need MSR and Recovery, and you cannot create them when there are things already installed on the disk (blame windows installer)
-        - TODO: some way of creating a separate windows Recovery, I cannot find any guide on how to do that so that Windows would recognize it natively, if you know of a guide or know how to do it, open [a PR](https://github.com/dortania/OpenCore-Multiboot/) or [an issue](https://github.com/dortania/bugtracker) with your ideas. 
+- The OS Install order **does not matter at all**, however windows can be a bit of a bitch, so installing it after macOS can be challenging, linux doesn't pose such problems. [If you happen to stumble on the sad windows crap](./troubleshooting.md#Windows)
 
-Now that you have all these information, good luck with the rest. However if you're not sure, follow then the long way that has more explanations and details on how to properly do it.
+Now that you have all these information, good luck with the rest. However if you're not sure, follow then the long way that has more explanations and details on how to properly do it.

README.md

@@ -1,6 +1,6 @@
 # Multiboot with OpenCore
 
-Hello there! Looks like you're trying to get macOS and `$(OtherOS)` installed on your system, but you also do not want to mess `$(OtherOS)` or macOS in the process. You will be guided here through a multitude of steps to achieve just that while keeping the OS setups as unaffected as possible.
+Hello there! Looks like you're trying to get macOS and `[OtherOS]` installed on your system, but you also do not want to mess `[OtherOS]` or macOS in the process. You will be guided here through a multitude of steps to achieve just that while keeping the OS setups as unaffected as possible.
 
 ## Firmware Types
 
@@ -11,19 +11,24 @@ Multibooting is greatly affected by the type of firmware you're running. This gu
 
 The differences are minimal once you're using OpenCore but also it might be a bit difficult for the latter. Other than that, this guide will cover these elements:
 
-1. What is multibooting and how does it work?
-2. Partitioning vs Disk separating
+1. Introduction to multi-booting
+   1. What is it?
+   2. UEFI? Legacy? CSM? What?
 2. UEFI
-   1. One disk for all OSes
-   2. Different disks for different OSes
-3. Legacy
-   1. One disk for all OSes
-   2. Different disks for different OSes
-5. Troubleshooting
-6. Tips and Tricks
-
-### Disclaimer
-
-We are not responsible for bricked devices, dead hard drives, thermonuclear war, or you getting fired because you got a kernel panic and didn't save your work. You are responsible for reading everything carefully before you do anything. Do your research and ask for support if you have any questions or issues before trying random things on the internet because "it's the internet". If you do, YOU are choosing to follow random things on the internet, and if YOU point the finger at us for messing up your device, WE will laugh at you. 
-
-Now that we got that out of our way let's get going, and good luck.
+   1. Multibooting on empty drives
+      1. One disk for all OSes
+      2. Different disks for different OSes
+   2. Multibooting on filled drives
+      1. One disk for all OSes
+      2. Different disks for different OSes
+3. Opencore Configuration
+   1. For Linux booting
+   2. For Legacy/CSM/BIOS booting
+4. Troubleshooting
+5. Windows installation
+
+## Disclaimer
+
+We are not responsible for bricked devices, dead hard drives, thermonuclear war, or you getting fired because you got a kernel panic and didn't save your work. You are responsible for reading everything carefully before you do anything. Do your research and ask for support if you have any questions or issues before trying random things on the internet because "it's the internet". If you do, YOU are choosing to follow random things on the internet, and if YOU point the finger at us for messing up your device, WE will laugh at you.
+
+So please backup your data and have a plan B in case things break (unlikely, but it happens more than you know).

Win.md

@@ -0,0 +1,120 @@
+# Installation of Windows 10
+
+**Work in Progess**, you can help contibute via [PRs](https://github.com/dortania/OpenCore-Multiboot/pulls). This guide referes to Windows 10, however it's still valid for Windows 8/8.1. (for Windows 7 or older, follow the legacy section (duetpkg configurations only))
+
+## Downloading and flashing Windows 10
+
+You can download Windows in different ways. In this guide we talk about Windows 10. So:
+
+- [Downloading from MacOS/Linux](#MacOS/Linux)
+- [Downloading from Windows](#Windows)
+
+### Macos
+
+Requirement:
+
+- [Windows 10 ISO file](https://www.microsoft.com/software-download/windows10)
+- An USB device
+
+Download the appropriate ISO for your Country
+
+Open Boot Camp Assistant and click on "Create a windows 10 device"
+
+Wait until it finishes flashing, then boot on the USB.
+
+### Linux
+
+Requirement:
+
+- [Windows 10 ISO file](https://www.microsoft.com/software-download/windows10)
+- An USB device
+At the moment use <https://github.com/WoeUSB/WoeUSB/tree/master> or dd
+
+### Windows
+
+Requirement:
+
+- [MediaCreationTool](https://www.microsoft.com/software-download/windows10)
+  ![Media Creation Tool Download page](./images/win-md/dlMediaCreationTool.png)
+- [Rufus](https://rufus.ie)
+- An USB device
+
+Open MediaCreationTool and download the ISO file for your system (32 or 64 bits).
+
+Open rufus, connect the usb and setup rufus with the appropriate settings for your system. Wait until it finishes of flashing, then boot on the USB.
+
+![UEFI](/images/win-md/rufus.png)
+
+## Installing Windows 10
+
+![The usb booted up](/images/win-md/esd-iso.png)
+
+When the usb booted, you can chose what to do:
+
+- [Install Windows 10 automatically](#Automatically)
+- [Install Windows 10 manually](#Manually) (only when there are problems or when you want to control the procedure)
+
+### Automatically
+
+Follow the procedure printed on screen!
+
+![Installation image](/images/win-md/installation.png)
+
+### Manually
+
+This guide it's planned for a full installation. If you want to do a dualboot you can create the partition as you want. To open a terminal window use the key combo SHIFT-F10
+
+Find and remember your path to install.esd/install.wim file. I suppose that `<path>` it will be its path.
+
+#### Creating partitions
+
+You have to choose:
+
+- Create the partitions [automatically](#Automatically-partitions)
+- Create the partition [manually](#Manually-partitions)
+
+##### Automatically partitions
+
+NOTE: This process can be followed only on blank disks.
+
+Follow the procedure since appears this section:
+
+![Custom installation](/images/win-md/custom.png)
+
+Select "Custom", remove all partitions and finally click on "Create". Windows will ask you a confirm, then you did it!
+
+##### Manually partitions
+
+![Windows UEFI partitions](/images/win-md/part.png)
+
+You can customize the commands (SHIFT+F10 to open Command Prompt) to your disk layout. If you felt more confortful, you could create all your partition (specify the size) on the diskmanagement screen (see [automatically](#Automatically-partitions)) and then installing manually (only blank disks).
+
+Type `diskpart`
+
+Type `list disk` and remember the disk number where you want to install Windows
+
+Type `sel disk 0` where 0 is the number of your disk
+
+Type `clean` to format the whole disk (optional)
+
+Type `convert gpt` to convert the disk to GPT (it would give an error if it was already converted, no problem) (risk of lose your data!!!)
+
+Type `create part efi size 200` to create the EFI partition (default size 200 MB), then type `format quick fs fat32` to format it and `assign letter q` to assign correctly our EFI partition.
+
+Type `create part msr size 128` to create the MSR partition (default size 128 MB, shouldn't be changed; used by some strange Windows things).
+
+Type `create part primary size 128000` to create the main partition (default size = [total space] - 450MB of WinRE - 128MB of MSR - 200MB of EFI. I remember that the size value must be in MB) --> default size = [total space] - 778MB, then type `format quick` to format it and `assign letter c` to assign correctly our drive.
+
+After that we set up the recovery enviroment: type `create part primary` (default size 450, the remaining part of the disk), `set id de94bba4-06d1-4d40-a16a-bfd50179d6ac` to change the type of partition (primary-->WINRE, more infos [here](https://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs)),`gpt attributes 0x8000000000000001` to hide it,`format quick` to format it in NTFS.
+
+Type `exit` to quit diskpart.
+
+#### Install Windows
+
+Type `dism /get-wiminfo /wimfile:<path>` to get the number of your edition.
+
+Type `dism /apply-image /imagefile:<path> /index:4 /applydir:c:\` to flash the WIM/ESD image to your disk where 4 is changed as you edition number.
+
+Type `bcdboot c:\windows /s q:\` to create the boot files on the EFI disk (Caution! if OpenCore was present, Windows cannot inject your EFI).
+
+Reboot and hope everything work.

empty/README.md

@@ -2,4 +2,4 @@
 
 This section will show you the tips and tricks of installing different OSes on empty drive(s) like on a newly built desktop or a FreeDOS laptop. It will contain information on the install order and technicalities of dualbooting. This is not limited to macOS only, it can be also helpful for multibooting other OSes with each other.
 
-Let's get started...
+Let's get started...

empty/diffdisk.md

@@ -3,15 +3,12 @@
 I will not get too long in this part as it's the EASIEST one:
 
 * Install macOS on one of the disks
-* Install $(SECONDOS) on the other disk
+* Install `[OtherOS]` on the other disk
 * Install/copy OpenCore on the macOS disk EFI
 * You're good to go
 
 Things to keep in mind:
 
-- Windows can be a bitch when it comes to multidisk setups (it freaks out when it sees a lot of EFI partitions on a lot of disks)
-- If the above happens, disable/disconnect all the other disks and install windows as you would normally do
-  - For laptops this can be a pain, you can install windows manually by following [this guide from TenForums](https://www.tenforums.com/tutorials/84331-apply-windows-image-using-dism-instead-clean-install.html)
-  - Make sure you choose the proper disk
-- You can still refer to other situations if you want to dualboot more than one OS on one of the disks.
-- Make sure that OpenCore is on the same disk of macOS for easier troubleshooting and cleaner setup
+* If you have issues, please see the [troubleshooting section](../troubleshooting.md)
+* You can still refer to other situations if you want to dualboot more than one OS on one of the disks.
+* Make sure that OpenCore is on the same disk of macOS for easier troubleshooting and cleaner setup

empty/samedisk.md

@@ -6,7 +6,7 @@ Basically, you only have one empty disk and you want to install multiple OSes to
 
 - BACKUP YOUR DATA
 - If possible, disconnect or disable any other disk/drive in your system, as it may interfere with the install procedure (especially windows')
-- The drive isn't corrupted or have bad sectors 
+- The drive isn't corrupted or have bad sectors
 - Stable power input
 
 ## Situation this applies for
@@ -36,21 +36,19 @@ Here is how it goes:
 2. Once done, select "Partition", press "**+**" and choose the size of the other partition(s), "Format" MUST be `Mac OS Extended` or `APFS` (otherwise, macOS will convert the drive to hMBR which will break Windows installation).
    ![You can add as many partitions as you like, **Remember their sizes**](../images/disku2.png)
 3. Hit Apply and let it do its thing:
-   * NOTE: on some macOS releases/setups, the disk utility may suddenly crash and send you back to the main menu, DO NOT PANIC (~~that sure helps~~), just wait for a minute or two then open disk utility back and check if the formatting is done.
+   - NOTE: on some macOS releases/setups, the disk utility may suddenly crash and send you back to the main menu, DO NOT PANIC (~~that sure helps~~), just wait for a minute or two then open disk utility back and check if the formatting is done.
 4. Once done, you can install macOS on the partition of your choosing and continue along.
 
 #### Note
 
-* You can still do the above if you have macOS already installed, do NOT use bootcamp assistant.
-  * BootCamp assistant will add extra drivers to the Windows installer that we do not need.
+- You can still do the above if you have macOS already installed, do NOT use bootcamp assistant.
+  - BootCamp assistant will add extra drivers to the Windows installer that we do not need.
 
 ### For the others
 
 #### Windows
 
-Windows can be a bit of a bitch when it comes to installing it as a second OS (like some kind of insult or just Microsoft doesn't realize that there are other OSes than Windows /s). Create your windows installer (on another computer with the windows creation disk utility or [Rufus](https://rufus.ie))
-
-In case Windows has any issues while installing, boot back to the installer, remove the MSR/Recovery/Windows partitions that the installer made (there may be more, make sure you do not delete macOS or other OSes partitions), and follow [this guide over at TenForums](https://www.tenforums.com/tutorials/84331-apply-windows-image-using-dism-instead-clean-install.html) on how to install windows manually using the `dism` tool. 
+Create your windows installer (on another computer with the windows creation disk utility or [Rufus](https://rufus.ie)). If you have issues, please see the [troubleshooting section](../troubleshooting.md)
 
 #### Linux
 

exist/README.md

@@ -4,4 +4,4 @@ This section will explain how to deal with disks with data already in use in the
 
 This section is meant for those who have disks with an OS installed on it already, or just a secondary disk with partitions other than OSes. To be honest, either way, they both follow the same idea and procedures, but just to help with some special cases, it has been decided to split them into two different categories.
 
-Let's get started...
+Let's get started...