diff --git a/docs/distributions/fedora/faq.md b/docs/distributions/fedora/faq.md index dc43f087..6003c2dc 100644 --- a/docs/distributions/fedora/faq.md +++ b/docs/distributions/fedora/faq.md @@ -8,7 +8,7 @@ This may be due to differences between USB-C to USB-A adapters. Try a different # My touchbar is blank -Follow the instructions in the [post-install guide](https://wiki.t2linux.org/guides/postinstall/#setting-up-the-touch-bar). If it still is not working, try updating your macOS instalation. +Follow the instructions in the [post-install guide](https://wiki.t2linux.org/guides/postinstall/#setting-up-the-touch-bar). If it still is not working, try updating your macOS installation. # I get an error about the bootloader when installing diff --git a/docs/distributions/fedora/installation.md b/docs/distributions/fedora/installation.md index 342f8b1d..7d5f3be1 100644 --- a/docs/distributions/fedora/installation.md +++ b/docs/distributions/fedora/installation.md @@ -18,7 +18,7 @@ Many thanks to [Mike](https://github.com/mikeeq/) for building. You can download ## Installing unsupported spins -1. Follow the installation instructions above, but use your custom (vanilla) ISO. You need an external keyboard and mouse. If you do not have a wired internet connection, you need to follow the [Wi-Fi guide](https://wiki.t2linux.org/guides/wifi-bluetooth/) on the live ISO before proceding. +1. Follow the installation instructions above, but use your custom (vanilla) ISO. You need an external keyboard and mouse. If you do not have a wired internet connection, you need to follow the [Wi-Fi guide](https://wiki.t2linux.org/guides/wifi-bluetooth/) on the live ISO before proceeding. 2. Add our DNF repo: `sudo dnf copr enable sharpenedblade/t2linux` 3. Install the kernel: `sudo dnf swap --from-repo="copr:copr.fedorainfracloud.org:sharpenedblade:t2linux" kernel kernel` 4. Install other packages: diff --git a/docs/distributions/ubuntu/faq.md b/docs/distributions/ubuntu/faq.md index 18649135..c6c294d1 100644 --- a/docs/distributions/ubuntu/faq.md +++ b/docs/distributions/ubuntu/faq.md @@ -6,13 +6,13 @@ There is a way to stop this. Boot into the installation media with an External U Scroll to the bottom with the arrow keys, and type in ``efi=noruntime``. With the External keyboard, then press CTRL+X or F10 to boot into the Live Media. The installation should work fine now. -This issue has occured for anyone on the 16,1 and maybe the 16,4. +This issue has occurred for anyone on the 16,1 and maybe the 16,4. # Making the GRUB Menu appear The GRUB bootloader by default turns off the GRUB Menu. This means you can't boot into Bootcamp Windows if it's installed. This can be easily fixed after Ubuntu is fully installed. -In a Terminal in Ubuntu, edit file ``/etc/default/grub`` with any preferred editior (nano/vim) and with root permissions. Change line ``GRUB_TIMEOUT_STYLE`` to ``GRUB_TIMEOUT_STYLE=MENU``. Save the file once you're done. +In a Terminal in Ubuntu, edit file ``/etc/default/grub`` with any preferred editor (nano/vim) and with root permissions. Change line ``GRUB_TIMEOUT_STYLE`` to ``GRUB_TIMEOUT_STYLE=MENU``. Save the file once you're done. We've now changed the GRUB Bootloader settings, but we now need to update GRUB to apply these changes. Type in ``sudo update-grub`` and hit enter. After the command is done, you're finished. diff --git a/docs/distributions/ubuntu/installation.md b/docs/distributions/ubuntu/installation.md index 9d4c5457..5f99100b 100644 --- a/docs/distributions/ubuntu/installation.md +++ b/docs/distributions/ubuntu/installation.md @@ -24,11 +24,11 @@ We currently support the following flavours of Ubuntu: ## Install Procedure 1. Follow the [Pre-installation](https://wiki.t2linux.org/guides/preinstall) steps to prepare your Mac for Ubuntu. -2. Boot into the Live ISO. You should now be in the GRUB boot menu. Select the option which is relevent to you. +2. Boot into the Live ISO. You should now be in the GRUB boot menu. Select the option which is relevant to you. 3. Start the installer and install it like normal until you get to the partition option. MAKE SURE YOU CHOOSE MANUAL PARTITIONING (USUALLY DISPLAYED AS "Something else" OPTION IN UBUNTU). 4. Find the partition you made for Linux when you were following the Pre-installation steps. MAKE SURE TO SELECT THE RIGHT PARTITION OR ELSE YOUR DATA WILL BE LOST. Delete it to make free space. You'll need to make these partitions: - 1. If you want, you can make seperate partitions for **swap**, `/home`, `/boot` etc as you do in a normal PC. + 1. If you want, you can make separate partitions for **swap**, `/home`, `/boot` etc as you do in a normal PC. 2. The only partition to be made compulsorily is the one mounted at `/` and formatted to **ext4** or **btrfs**. diff --git a/docs/guides/hybrid-graphics.md b/docs/guides/hybrid-graphics.md index 707af9c4..25eeb17e 100644 --- a/docs/guides/hybrid-graphics.md +++ b/docs/guides/hybrid-graphics.md @@ -26,7 +26,7 @@ If you experience system freezes, then the laptop's fans becoming loud, before t ## Enabling the iGPU -1. Configue apple-gmux to switch to the iGPU at boot +1. Configure apple-gmux to switch to the iGPU at boot 1. Create `/etc/modprobe.d/apple-gmux.conf` with the following contents: diff --git a/docs/guides/postinstall.md b/docs/guides/postinstall.md index 37f6a80f..1e291290 100644 --- a/docs/guides/postinstall.md +++ b/docs/guides/postinstall.md @@ -4,7 +4,7 @@ This page explains how to perform a basic set up after installing Linux on a T2 ## Do you need to do this? -This guide is mainly relevent in the following cases : +This guide is mainly relevant in the following cases : 1. If you have installed Linux using an official ISO, instead of a T2 ISO. 2. The [Make modules load on early boot](#make-modules-load-on-early-boot) section is relevant for those who wish to encrypt their disk drives using LUKS or some other similar software. @@ -33,7 +33,7 @@ Many distro maintainers provide compiled kernels which can be installed on your If compiled kernels for your distro are not available, then you shall have to compile a kernel on your own. You can follow the [Kernel](https://wiki.t2linux.org/guides/kernel/) guide for help. -## Add necessary kernel paramaters +## Add necessary kernel parameters Using your bootloader, add the `intel_iommu=on iommu=pt pcie_ports=compat` kernel parameters. For example in GRUB: diff --git a/docs/guides/startup-manager.md b/docs/guides/startup-manager.md index 0321320e..9f1a87df 100644 --- a/docs/guides/startup-manager.md +++ b/docs/guides/startup-manager.md @@ -28,19 +28,19 @@ More details about this can be found in the [triple boot guide](https://wiki.t2l In this case the Windows startup disk is used to boot both Windows and Linux. Thus, it is not recommended to set special labels for Linux as it may cause errors with the Windows startup disk. -## Setting label in case you are using a seperate EFI partition for Linux +## Setting label in case you are using a separate EFI partition for Linux More details about this can be found in the [triple boot guide](https://wiki.t2linux.org/guides/windows/#using-seperate-efi-partitions). In this case, boot into macOS, open a terminal window and run: ```bash -IDENTIFIER=$(diskutil info | grep "Device Identifier" | cut -d: -f2 | xargs) +IDENTIFIER=$(diskutil info | grep "Device Identifier" | cut -d: -f2 | xargs) sudo diskutil mount $IDENTIFIER -bless --folder /Volumes//EFI/BOOT --label "" +bless --folder /Volumes//EFI/BOOT --label "" ``` -Replace `` with the label you set using in the above triple boot guide and `` with your distro's name. E.g.: If you are using Ubuntu and you set the label to `EFI2`, run: +Replace `` with the label you set using in the above triple boot guide and `` with your distro's name. E.g.: If you are using Ubuntu and you set the label to `EFI2`, run: ```bash IDENTIFIER=$(diskutil info EFI2 | grep "Device Identifier" | cut -d: -f2 | xargs) @@ -63,8 +63,8 @@ In other cases, put an `icns` image file with your desired icon in the top direc In this case you will have to set the Windows startup disk as the default startup disk. It is recommended to follow [Apple's documentation](https://support.apple.com/en-in/guide/mac-help/mchlp1034/mac) where you have to follow the **Change your startup disk for every startup** section. -If this method is not working for you, then follow the instructions given in [Case of seperate EFI partition for Linux as well as case of using the EFI partition available by default in Mac and are on a dual boot system](https://wiki.t2linux.org/guides/startup-manager/#case-of-seperate-efi-partition-for-linux-as-well-as-case-of-using-the-efi-partition-available-by-default-in-mac-and-are-on-a-dual-boot-system) section, where you have to consider the Windows startup disk as the Linux startup disk. +If this method is not working for you, then follow the instructions given in [Case of separate EFI partition for Linux as well as case of using the EFI partition available by default in Mac and are on a dual boot system](https://wiki.t2linux.org/guides/startup-manager/#case-of-separate-efi-partition-for-linux-as-well-as-case-of-using-the-efi-partition-available-by-default-in-mac-and-are-on-a-dual-boot-system) section, where you have to consider the Windows startup disk as the Linux startup disk. -## Case of seperate EFI partition for Linux as well as case of using the EFI partition available by default in Mac and are on a dual boot system +## Case of separate EFI partition for Linux as well as case of using the EFI partition available by default in Mac and are on a dual boot system In these cases, start your Mac and press and hold down the Option key. When the startup manager gets displayed, release the option key. Now press and hold the Control key and without releasing the Control key, boot into the Linux startup disk as you usually do. This will make it the default startup disk. diff --git a/docs/guides/uninstall.md b/docs/guides/uninstall.md index f326d698..38e69981 100644 --- a/docs/guides/uninstall.md +++ b/docs/guides/uninstall.md @@ -18,7 +18,7 @@ You may want to do this from macOS Recovery as you will be resizing (expanding) ## If using a separate EFI partition -Follow the same steps to remove the seperate EFI partition as you followed to remove the Linux partition. +Follow the same steps to remove the separate EFI partition as you followed to remove the Linux partition. ## If using the EFI partition already available in your Mac. diff --git a/docs/guides/windows.md b/docs/guides/windows.md index cd131861..cac90e0e 100644 --- a/docs/guides/windows.md +++ b/docs/guides/windows.md @@ -1,8 +1,8 @@ # Introduction -This page is a guide on getting Windows and Linux both installed. Secure Boot Must be disabled from macOS recovery. If you want to be able to choose from macOS, Windows, or Linux in the Startup Manager (the menu you get by holding ⌥ key), goto 'Using seperate EFI partitions'. If you just want to select between Linux and Windows in the GRUB bootloader, goto 'Using the same EFI partition'. +This page is a guide on getting Windows and Linux both installed. Secure Boot Must be disabled from macOS recovery. If you want to be able to choose from macOS, Windows, or Linux in the Startup Manager (the menu you get by holding ⌥ key), goto 'Using separate EFI partitions'. If you just want to select between Linux and Windows in the GRUB bootloader, goto 'Using the same EFI partition'. -The simplist way to triple boot is to install Windows first, and install Linux on the same EFI partition, so that the Windows option in Startup Manager will let you pick Linux or Windows. To do that, follow the first set of instructions here. +The simplest way to triple boot is to install Windows first, and install Linux on the same EFI partition, so that the Windows option in Startup Manager will let you pick Linux or Windows. To do that, follow the first set of instructions here. # Using the same EFI partition @@ -24,7 +24,7 @@ The simplist way to triple boot is to install Windows first, and install Linux o 3. Enable the GRUB menu so that you'll have time to pick Windows: 1. Boot into your Linux install by selecting the Windows option in startup manager. - 2. Edit `/etc/default/grub` with any preferred editior (nano/vim/) and with `sudo`. Change line `GRUB_TIMEOUT_STYLE` to `GRUB_TIMEOUT_STYLE=MENU`. If you are using `nano`, save the file by doing CTRL+X, Y, then enter. + 2. Edit `/etc/default/grub` with any preferred editor (nano/vim/) and with `sudo`. Change line `GRUB_TIMEOUT_STYLE` to `GRUB_TIMEOUT_STYLE=MENU`. If you are using `nano`, save the file by doing CTRL+X, Y, then enter. 3. We've now changed the GRUB Bootloader settings, but we now need to update GRUB to apply these changes. Type in `sudo update-grub` (For Ubuntu) or `sudo grub-mkconfig -o /boot/grub/grub.cfg` (For Arch based distros) and hit enter. After the command is done, you're finished. !!! note "Using bootloaders other than GRUB" @@ -34,8 +34,8 @@ The simplist way to triple boot is to install Windows first, and install Linux o ## If Linux is installed first -1. Make sure that your Linux partitions are not labled as `Microsoft Basic Data`, if they are, Bootcamp Assistant will think Windows is already installed. To fix this, go to Linux and do `sudo cfdisk /dev/nvme0n1` and change the type of your Linux partitions to `Linux Filesystem`. -2. Install Windows normaly with Bootcamp. Windows will replace your Linux boot option. +1. Make sure that your Linux partitions are not labeled as `Microsoft Basic Data`, if they are, Bootcamp Assistant will think Windows is already installed. To fix this, go to Linux and do `sudo cfdisk /dev/nvme0n1` and change the type of your Linux partitions to `Linux Filesystem`. +2. Install Windows normally with Bootcamp. Windows will replace your Linux boot option. 3. Boot into macOS. 4. `sudo diskutil mount disk0s1` 5. Go to `/Volumes/EFI/efi` @@ -52,14 +52,14 @@ The simplist way to triple boot is to install Windows first, and install Linux o 9. Enable the GRUB menu so that you'll have time to pick Windows 1. Boot into your Linux install by selecting the Windows option in startup manager. - 2. Edit ``/etc/default/grub`` with any preferred editior (nano/vim/) and with sudo. Change line ``GRUB_TIMEOUT_STYLE`` to ``GRUB_TIMEOUT_STYLE=MENU``. If you are using `nano`, save the file by doing CTRL+X, Y, then enter. + 2. Edit ``/etc/default/grub`` with any preferred editor (nano/vim/) and with sudo. Change line ``GRUB_TIMEOUT_STYLE`` to ``GRUB_TIMEOUT_STYLE=MENU``. If you are using `nano`, save the file by doing CTRL+X, Y, then enter. 3. We've now changed the GRUB Bootloader settings, but we now need to update GRUB to apply these changes. Type in ``sudo update-grub`` and hit enter. After the command is done, you're finished. 10. You should now be able to boot either Windows or Linux from the GRUB bootloader. It may be possible to skip steps 5-8 by doing the following command in macOS: `sudo sh -c "bless --mount /Volumes/EFI --setBoot --file /Volumes/EFI/efi/$(ls /Volumes/EFI/efi|grep -i -e microsoft -e boot -e apple -v)/grubx64.efi --shortform"` This might not prevent step 8 from being needed. -# Using seperate EFI partitions +# Using separate EFI partitions ## Installing Linux (With or without Windows already installed) @@ -77,7 +77,7 @@ If you are using an interactive installer: 1. Set the `EFI2` partition to be mounted at `/boot/efi` and set it as "ESP"/"Boot"/"EFI System Partition". Don't use the partition labeled `EFI` located at `/dev/nvme0n1p1`, to avoid breaking the Windows bootloader stored there. Ensure that `/dev/nvme0n1p1` wasn't set by default to be used as the "EFI System Partition". !!! info "Ubuntu" - On Ubuntu since the installer doesn't support seperate EFI partitions, install normally to the Windows EFI partition and follow [this section](https://wiki.t2linux.org/guides/windows/#seperate-the-efi-partition-after-linux-is-installed) to seperate out the partition. + On Ubuntu since the installer doesn't support separate EFI partitions, install normally to the Windows EFI partition and follow [this section](https://wiki.t2linux.org/guides/windows/#separate-the-efi-partition-after-linux-is-installed) to separate out the partition. 2. Your main partition that were formatted as macOS Extended/HFS+ can be mounted at `/`. @@ -103,10 +103,10 @@ If you are doing it manually: 2. If your second EFI partition is labeled as `EFI System`, you'll need to use `cfdisk` again to make it not that, as the Windows installer fails if there are two. 3. Bootcamp should install Windows normally. If you put your Linux bootloader on `/dev/nvme0n1p1`, Windows will replace it, and that's why a second EFI partition is ideal. -## Seperate the EFI partition after Linux is installed +## Separate the EFI partition after Linux is installed -In case you have installed Linux to the same EFI partition as used by Windows, and now want to seperate it out, then: +In case you have installed Linux to the same EFI partition as used by Windows, and now want to separate it out, then: 1. Using disk utility, make a 500Mb FAT32 partition, call it something like `EFI2`. Make sure you do not use `EFI` as the label. 2. Download [this script](https://wiki.t2linux.org/tools/efi.sh). -3. Run this script using `bash /path/to/script ` in Linux. E.g.: If your seperate partition has the name `EFI2`, and script is in your Downloads folder, run `bash $HOME/Downloads/efi.sh EFI2`. +3. Run this script using `bash /path/to/script ` in Linux. E.g.: If your separate partition has the name `EFI2`, and script is in your Downloads folder, run `bash $HOME/Downloads/efi.sh EFI2`. diff --git a/docs/state.md b/docs/state.md index c46557a9..5fa5cbf0 100644 --- a/docs/state.md +++ b/docs/state.md @@ -26,4 +26,4 @@ While Linux is usable on all T2 models, some features are limited due to the lac - Linux using APFS filesystems: Linux cannot read the internal SSD's macOS APFS parition's Data and System volume (for other APFS volumes, [linux-apfs-rw](https://github.com/linux-apfs/linux-apfs-rw) can be used for reading data, but attempting to write is risky). -- macOS using Linux filesystems: There are FUSE implementations of some Linux Filesystems that can be used on macOS (but again, most only have experemental write support). +- macOS using Linux filesystems: There are FUSE implementations of some Linux Filesystems that can be used on macOS (but again, most only have experimental write support). diff --git a/docs/tools/efi.sh b/docs/tools/efi.sh index ed9572d0..3146e46f 100755 --- a/docs/tools/efi.sh +++ b/docs/tools/efi.sh @@ -16,7 +16,7 @@ fi if [ $USER != root ] then -echo "This script is intented to be run as root. You will be asked for your password." +echo "This script is intended to be run as root. You will be asked for your password." sudo chmod 755 $0 sudo $0 "$1" exit 0 diff --git a/docs/tools/firmware.sh b/docs/tools/firmware.sh index ea3648ea..7f4073de 100755 --- a/docs/tools/firmware.sh +++ b/docs/tools/firmware.sh @@ -93,7 +93,7 @@ class BluetoothFWCollection(object): return None chip, stepping = match.groups() - # board type is either preceeded by PCIE_macOS or by PCIE + # board type is either preceded by PCIE_macOS or by PCIE try: pcie_offset = fname.index("PCIE") except: