Merge branch 'master' into update-ubuntu-articles

content/boot-menu.md

@@ -23,7 +23,7 @@ The BIOS or boot menu can be accessed by holding specific keys down during boot.
 | Laptops:<br/>All Open Firmware models<br/>Pangolin (pang12) | ESC      | ESC:<br/>Select `One Time Boot` (Open Firmware)<br/>or `Save & Exit` → `Boot Override`. |
 | Laptops:<br/>Most proprietary firmware models               | F2       | F7                                |
 | Older laptops                                               | Depends on the system | F1                   |
-| Thelio desktops                                             | Del      | F8 or F12                         |
+| Thelio desktops                                             | Del      | F8/F11/F12                         |
 | Meerkat (mini) desktops                                     | F2       | F10                               |
 
 ## Open Firmware Screenshots

content/customize-dock.md

@@ -0,0 +1,49 @@
+---
+title: Dock (Move or Customize)
+description: >
+  How to move the Dock to different areas of the screen and customize other settings.
+keywords:
+  - Launcher
+  - Bottom
+  - Left
+  - Moving
+  - Dock
+  - Dash to Dock
+  - COSMIC Dock
+  - Ubuntu Dock
+
+facebookImage: /_social/article
+twitterImage: /_social/article
+
+hidden: false
+section: software
+tableOfContents: true
+
+redirect_from:
+  - /movelauncher
+  - /articles/move-launcher
+---
+
+Pop!\_OS and Ubuntu both contain an application dock on the screen. The location of the dock, as well as other dock settings, can be adjusted in <u>Settings</u>.
+
+## Default Dock on Pop!\_OS
+
+Pop!\_OS's dock is positioned along the bottom edge of the screen by default.
+
+![Stock Pop Dock](/images/customize-dock/pop-dock.png)
+
+## Default Dock on Ubuntu
+
+Ubuntu's dock is positioned along the left edge of the screen by default.
+
+![Stock Ubuntu Dock](/images/customize-dock/ubuntu-dock.png)
+
+## dconf Editor
+
+Since both Ubuntu Dock and COSMIC Dock are based on Dash to Dock they have the same settings which can be changed using <u>dconf editor</u>. This can be installed either though the <u>Pop!\_Shop</u> (if you are on Pop!\_OS), <u>Ubuntu Software</u> (if you are on Ubuntu) or with this command on either OS:
+
+```bash
+sudo apt install dconf-editor
+```
+
+![Dash to Dock in dconf](/images/customize-dock/dash-to-dock.png)

content/install-minecraft-server.md

@@ -78,7 +78,7 @@ The server will crash on the first run, so first change the eula.txt text from `
 Then, Re-start by stopping the server and restarting.  
 We can also configure the world and other settings in `server.properties`  
 
-For more info, see the [Minecraft Wiki](https://minecraft.gamepedia.com/Tutorials/Setting_up_a_server) on this issue.
+For more info, see the [Minecraft Wiki](https://minecraft.wiki/w/Tutorials/Setting_up_a_server) on this issue.
 
 ---
 

content/login-from-live-disk.md

@@ -1,5 +1,5 @@
 ---
-title: Login from Live Disk (Chroot)
+title: Log in from Live Disk (Chroot)
 description: >
     Access an installed OS from a Live Disk/Recovery.
 keywords:
@@ -19,7 +19,7 @@ section: software-troubleshooting
 tableOfContents: true
 ---
 
-## Login from Live Disk (Chroot)
+## Log in from Live Disk (Chroot)
 
 It is possible to mount an OS drive and log into the installed OS with root access. This is called gaining "chroot" (change to root) access. This process is useful when [rescuing files](/articles/disaster-recovery), [fixing package manager issues](/articles/package-manager-pop), or [resetting forgotten user passwords](/articles/password).
 
@@ -56,18 +56,23 @@ To access an encrypted disk, run these additional commands to unlock the encrypt
 |:--------------------------------------------------:|:-------------------------------------------------:|
 | ```sudo cryptsetup luksOpen /dev/sda3 cryptdata```       | ```sudo cryptsetup luksOpen /dev/nvme0n1p3 cryptdata``` |
 
+>**Note:** You will see "Enter passphrase for /dev/nvme0n1p3 (or the name of your exact drive):" - Enter your encryption password here. You will "enter this blind," i.e. you won't see the characters typed out. Then press Enter.
+
 ```bash
+# scan for logical volumes
 sudo lvscan
+# scan and setup volume groups
 sudo vgchange -ay
 ```
 
 >**Note:** Pay attention to what the `cryptdata` group is called. If it is named something other than `data-root`, substitute the correct info into this next command.  Make sure that `-root` is on the end:
 
 ```bash
+# setup access to the encrypted file system on '/mnt'
 sudo mount /dev/mapper/data-root /mnt
 ```
 
-Now the existing hard drive can be accessed by going to the `/mnt` folder.  To use the <u>Files</u> program, go to `+ Other Locations` -> `Computer` and then click on the `/mnt` folder.
+**Note:** If you want to backup your files, you can do so at this point in the process if you don't already have a [backup of your data](/articles/backup-files/)
 
 ## Chroot
 
@@ -80,6 +85,7 @@ The EFI partition is the next partition to be mounted. To help identify it, this
 | ```sudo mount /dev/sda1 /mnt/boot/efi```    | ```sudo mount /dev/nvme0n1p1 /mnt/boot/efi```  |
 
 ```bash
+# mount several "kernel" virtual file systems from the live system to '/mnt/'
 for i in /dev /dev/pts /proc /sys /run; do sudo mount -B $i /mnt$i; done
 sudo chroot /mnt
 ```

content/login-loop-pop.md

@@ -1,5 +1,5 @@
 ---
-title: Black Screen or Login Issues (Pop!_OS)
+title: Black Screen or Login Issues (Pop!_OS 22.04 LTS)
 description: >
   Are you getting stuck in a login loop, even though your password is correct? Do you see a black screen after you log in?
 keywords:
@@ -120,18 +120,11 @@ After reinstalling those packages and rebooting, try logging in again.
 
 ### Reinstall NVIDIA Driver
 
-If your system is equipped with NVIDIA graphics, a recent update might be causing the login issues. (Usually, NVIDIA driver issues will prevent the login screen from loading at all; however, it's still worth reinstalling if you are unable to log in after the above steps.) Refer to the table below to determine if your system contains NVIDIA graphics:
-
-| Always        | Maybe          | Never       |
-|:------------- |:-------------- |:----------- |
-| Oryx Pro      | Wild Dog Pro   | Lemur (Pro) |
-| Adder WS      | Ratel          | Kudu        |
-| Serval WS     | Galago Pro 5   | Meerkat     |
-| Bonobo WS     | Gazelle        | Galago Pro (4 or older)  |
-| Leopard WS    | Thelio         | Darter Pro  |
-| Silverback WS | Thelio Mira    | Pangolin    |
-| Thelio Mega   | Thelio Major   |             |
-|               | Thelio Massive |             |
+If your system is equipped with NVIDIA graphics, a recent update might be causing the login issues. (Usually, NVIDIA driver issues will prevent the login screen from loading at all; however, it's still worth reinstalling if you are unable to log in after the above steps.) Run these commands to determine if your system has NVIDIA graphics:
+
+```bash
+lspci -v | grep VGA
+```
 
 To remove the NVIDIA driver, run the following:
 

content/login-loop-ubuntu.md

@@ -1,5 +1,5 @@
 ---
-title: Black Screen Or Login Issues (Ubuntu)
+title: Black Screen Or Login Issues (Ubuntu 22.04)
 description: >
   Are you getting stuck in a login loop, even though your password is correct? Do you see a black screen after you log in?
 keywords:
@@ -98,18 +98,11 @@ After reinstalling those packages and rebooting, try logging in again.
 
 ## Reinstall NVIDIA Driver
 
-If your system is equipped with NVIDIA graphics, a recent update might be causing the login issues. (Usually, NVIDIA driver issues will prevent the login screen from loading at all; however, it's still worth reinstalling if you are unable to log in after the above steps.) Refer to the table below to determine if your system contains NVIDIA graphics:
-
-| Always        | Maybe          | Never       |
-|:------------- |:-------------- |:----------- |
-| Oryx Pro      | Wild Dog Pro   | Lemur (Pro) |
-| Adder WS      | Ratel          | Kudu        |
-| Serval WS     | Galago Pro 5   | Meerkat     |
-| Bonobo WS     | Gazelle        | Galago Pro (4 or older)  |
-| Leopard WS    | Thelio         | Darter Pro  |
-| Silverback WS | Thelio Mira    | Pangolin    |
-| Thelio Mega   | Thelio Major   |             |
-|               | Thelio Massive |             |
+If your system is equipped with NVIDIA graphics, a recent update might be causing the login issues. (Usually, NVIDIA driver issues will prevent the login screen from loading at all; however, it's still worth reinstalling if you are unable to log in after the above steps.) Run these commands to determine if your system has NVIDIA graphics:
+
+```bash
+lspci -v | grep VGA
+```
 
 To remove the NVIDIA driver, run the following:
 

content/switch-from-macos-to-popos.md

@@ -60,7 +60,7 @@ The Dock can be moved in both OSes. macOS has this feature in System Preferences
 
 For more information on GNOME extensions, refer to the following support articles:
 [Customize Pop!\_OS](/articles/customize-gnome)
-[Dock Customization](/articles/dash-to-dock)
+[Dock Customization](/articles/customize-dock)
 
 ### View Installed applications
 

content/system-firmware.md

@@ -24,9 +24,7 @@ These instructions are for System76 owners who have been prompted for a firmware
 * **Disconnect external devices**, including any displays or USB devices.
 * **Take a picture of these instructions** or pull up [s76.co/sfu](https://s76.co/sfu) on a phone or other device for reference.
 * During the firmware updating process, **the system will restart several times**. Prompts will occasionally ask for user involvement.
-
-* **Take a picture of these instructions** or pull up [s76.co/sfu](https://s76.co/sfu) on a phone or other device for reference.
-
+
 ### Starting the Update (GUI)
 
 In Pop!\_OS, you can check for firmware updates using **Settings -> Firmware**.

layouts/default.vue

@@ -6,7 +6,7 @@
           href="https://system76.com/specials"
           target="_blank"
         >
-          Gear Up and SAVE up to $150!
+          Specials
         </a>
       </template>
 
@@ -15,7 +15,7 @@
           href="https://system76.com/desktops"
           target="_blank"
         >
-          New Thelio Accent Panels! Learn More!
+          Computers Engineered to Unleash Your Potential
         </a>
       </template>