Merge branch 'pop-21-04'

storyaddict · storyaddict · commit b8171b024896 · 2021-06-23T16:55:05.000-06:00
diff --git a/archived/Pop!_OS-Release-Notes.md b/archived/Pop!_OS-Release-Notes.md
@@ -1,22 +1,30 @@
 ---
-title: Pop!_OS 20.04 LTS Release Notes
+layout: article
+title: Pop!_OS Release Notes
 description: >
-  Discover what's new in Pop!\_OS 20.04 LTS
+  Discover what's new in these Pop!_OS Releases
 keywords:
   - Pop
   - 20.04
+  - 21.04
   - LTS
   - Updates
   - New Features
 
 facebookImage: /_social/article
 twitterImage: /_social/article
 
-hidden: false
+hidden: true
 section: pop
 ---
 
-Pop!\_OS 20.04 was released April 30, 2020.
+Pop!\_OS 21.04 was released on TBA.
+
+## Pop!\_OS 21.04 Release Notes
+
+
+
+Pop!\_OS 20.04 was released on April 30, 2020.
 
 ## Pop!\_OS 20.04 Release Notes
 
diff --git a/content/disaster-recovery.md b/content/disaster-recovery.md
@@ -1,7 +1,7 @@
 ---
 title: Disaster Data Recovery
 description: >
-  How to backup your files if your OS doesn't boot
+ How to back up your files if your OS doesn't boot
 keywords:
   - files
   - backup
diff --git a/content/dual-booting.md b/content/dual-booting.md
@@ -1,6 +1,6 @@
 ---
 title: Dual Boot Windows 10 Alongside Pop!_OS
-description: Learn how to install Windows alongside Pop!\_OS.
+description: Learn how to install Windows alongside Pop!_OS.
 keywords:
   - System76
   - dual boot
diff --git a/content/pop-incomplete-upgrade.md b/content/pop-incomplete-upgrade.md
@@ -1,8 +1,10 @@
 ---
-title: Pop!_OS 20.10 Incomplete Upgrade
+layout: article
+title: Pop!_OS Incomplete Upgrade
 description: >
-  What to do if you get an FStab error or if your upgrade is incomplete.
+  What to do if your upgrade is incomplete or not working correctly
 keywords:
+  - Pop!_OS 21.04
   - Pop!_OS 20.10
   - Pop!_OS 20.04
   - LTS
@@ -20,11 +22,16 @@ hidden: false
 section: software-troubleshooting
 ---
 
-# Pop!_OS 20.10 Incomplete Upgrade
+# Pop!_OS Incomplete Upgrade
 
 ### Backup Your Files
+
 The upgrade process will leave your files intact, but it's always a good idea to play it safe and create a backup of any important files. Please read our article on [how to backup your files](/articles/backup-files/) for helpful instructions.
 
+### If you can't boot the OS
+
+Refer to the [disaster recovery article](/articles/disaster-recovery) to boot from an live disk or the Pop Recovery to backup your files before working on either repairing or reinstalling the OS.
+
 ### FStab Error Message
 
 This can be caused by the `pop-upgrade` command checking for an `/etc/fstab` file and finding an entry that it does not understand. If you have manually added drives to your fstab, adding a '#' to comment out the drive while the upgrade is ongoing should work.  You would then remove the comment after the upgrade is complete to have access to those drive paths again. To edit this file, run the following command in a terminal:
@@ -61,7 +68,7 @@ After you have made the edit, save the file and start the upgrade again.
 
 ### Repair Package Manager after Failed/Incomplete Upgrade
 
-1. If you’re able to log in and have a graphical interface, let’s try running a set of commands in a terminal (click your activities menu and type ‘t’ for ‘terminal’) to clean up the installed packages:
+1. If you’re able to log in and have a graphical interface, let’s try running a set of commands in a terminal (click your Activities menu and type ‘t’ for ‘terminal’) to clean up the installed packages:
 
 **If this is your first time running commands, just a heads up- after each command, press the enter key. When the system prompts you for your password, type it in the terminal and press the enter key. The password will not show in the terminal, but it is taking the password)**
 
@@ -74,7 +81,9 @@ sudo apt dist-upgrade
 sudo apt autoremove --purge
 ```
 
-If you are not able to get to the desktop to run those commands, try to get to a TTY (Ctrl+Alt+F5). Enter the username and password as requested and proceed with the commands above.
+If you are not able to get to the desktop to run those commands, try to get to a TTY (Ctrl+Alt+F5). Enter the username and password as requested and proceed with the commands above. 
+
+**NOTE:** your username would be your first and last name combined though all lower case unless it was changed during the initial setup.
 
 If you cannot access the desktop or TTY, we can run the package repair commands in Pop Recovery instead. To do this,
 
@@ -96,22 +105,14 @@ sudo parted -ls
 
 Look for the name of your main hard drive. It could be `/dev/sda` or `/dev/nvme0n1`, depending on if you have a standard SATA drive, or an NVMe drive, respectively. Input the following commands based on your drive type:
 
-**If disk is encrypted, start with these first 3 commands using the correct drive name in the /dev filepath**:
-
-**For SATA Drives**:
-
-```bash
-sudo mount /dev/sda3 /mnt
-```
-
-**For NVMe Drives**:
-
-```bash
-sudo mount /dev/nvme0n1p3 /mnt
-```
+| **SATA Drives**           | **NVMe Drives**                |
+|:-------------------------:|:------------------------------:|
+| sudo mount /dev/sda3 /mnt | sudo mount /dev/nvme0n1p3 /mnt |
 
 If the command fails and says `mount: /mnt: unknown filesystem type 'crypto_LUKS'`, then the hard drive has been encrypted, and additional commands are needed to unlock it.
 
+**If disk is encrypted, start with these first 3 commands using the correct drive name in the /dev filepath**:
+
 **For SATA Drives**:
 
 ```bash
@@ -174,3 +175,13 @@ sudo apt autoremove --purge
 exit
 reboot
 ```
+
+# If you are still not able to upgrade
+
+If the system is still not able to upgrade and you have a System76 system please open a support ticket and include this file:
+
+```bash
+journal -u pop-upgrade > ~/pop-upgrade.log
+```
+
+If it is not a System76 system go to our Pop!\_OS Mattermost chat for community support [here](chat.pop-os.org).
diff --git a/content/pop-keyboard-shortcuts.md b/content/pop-keyboard-shortcuts.md
@@ -22,6 +22,7 @@ The Super key is the OS key on your keyboard.
 
 - On recent System76 products, it's the Pop key (<kbd><font-awesome-icon :icon="['fab', 'pop-os']"></font-awesome-icon></kbd>).
 - On older System76 products, it's the Ubuntu key (<kbd><font-awesome-icon :icon="['fab', 'ubuntu']"></font-awesome-icon></kbd>).
+- On the Launch keyboard it is the <kbd>SUPER</kbd> key.
 - On generic third-party products, it may be labeled with a Windows logo.
 - On Mac accessories, it may be labeled `command`.
 
@@ -78,7 +79,8 @@ The launcher allows searching through open windows and installed applications, a
 
 | Shortcut/command                                           | Action                          |
 | ---------------------------------------------------------- | ------------------------------- |
-| <kbd><font-awesome-icon :icon="['fab', 'pop-os']"></font-awesome-icon></kbd> + <kbd>/</kbd> | Activate the launcher           |
+| <kbd><font-awesome-icon :icon="['fab', 'pop-os']"></font-awesome-icon></kbd>                 | Activate the launcher on Pop 21.04+ |
+| <kbd><font-awesome-icon :icon="['fab', 'pop-os']"></font-awesome-icon></kbd> + <kbd>/</kbd>  | Activate the launcher on Pop 20.10 and below |
 | `d:`                                                       | Browse and search recent files  |
 | `/` or `~`                                                 | Browse the filesystem           |
 | `t:`                                                       | Execute a command in a terminal |
diff --git a/content/switch-from-macos-to-popos.md b/content/switch-from-macos-to-popos.md
@@ -1,7 +1,7 @@
 ---
 title: Switching from macOS to Pop!_OS
 description: >
-  If you are coming from Apple's operating system using Pop!\_OS for the first time, we can help make the transition smoother.
+  If you are coming from Apple's operating system using Pop!_OS for the first time, we can help make the transition smoother.
 keywords:
   - System76
   - Apple
@@ -27,7 +27,7 @@ tableOfContents: true
 
 Pop!\_OS offers corresponding workflows and applications to those available in macOS. Users will find UI elements where they expect them to be as well as some additional features.
 
-# Navigation
+[Navigation](#navigation)
 
 ## Finding Programs and Files
 
@@ -46,7 +46,9 @@ In Pop!\_OS, clicking on the "Activities" menu in the upper left-hand corner of
 
 The Activities Overview screen can also be launched by pressing the SUPER key. Once Overview is launched, users can begin typing to search their computer.
 
-## Application Shortcuts
+[Return to Table of Contents](#return-to-table-of-contents)
+
+## [Application Shortcuts](#application-shortcuts)
 
 **macOS**
   - Dock
diff --git a/content/terminal-basics.md b/content/terminal-basics.md
@@ -45,7 +45,7 @@ Cursor | A visual indicator of the user's current position in the <u>Terminal</u
 
 As you change folders and move throughout your computer, the prompt will change in response. In many cases, you won't need to move around to run a command.
 
-To list all files and folders in the current directory, type `ls`. To change directories (folders), type `cd [directory name]`. To go back up a directory type `cd ..`. At any time, you can press the Tab key to have the <u>Terminal</u> guess the completion for your entry, or twice to show all possibilities.
+To list all files and folders in the current directory, type `ls` To change directories (folders), type `cd [directory name]`. To go back up a directory type `cd ..`. At any time, you can press the Tab key to have the <u>Terminal</u> guess the completion for your entry, or twice to show all possibilities.
 
 ![Moving around](/images/terminal/moving-around.png)
 
diff --git a/content/upgrade-pop.md b/content/upgrade-pop.md
@@ -10,6 +10,7 @@ keywords:
   - Pop!_OS 19.10
   - Pop!_OS 20.04
   - Pop!_OS 20.10
+  - Pop!_OS 21.04
   - LTS
   - Non-LTS
   - Upgrade
@@ -25,33 +26,36 @@ hidden: false
 section: software
 ---
 
-# Before You Upgrade
+## When Should I Upgrade?
 
-Every release of Pop!\_OS is thoroughly tested and undergoes an extensive quality assurance (QA) process, including the upgrade system itself. In almost all cases, the upgrade from an existing release of Pop!\_OS to a newer release is a smooth transition that takes only an hour or so to complete (depending on download speeds and the speed of the components in the system you are upgrading).
+Before upgrading, it can be helpful to ask yourself the following environment questions: 
 
-That being said, from time to time, unexpected complications can arise. The liklihood of complications during the upgrade process increases on systems that are:
+1. **Do I have a backup of my data (see next section).**
+  - YES? - Proceed.
+  - NO? - Make a Backup.
+2. **Is this a mission critical machine?**
+  - YES? - Wait until upgrading will not stop work.
+  - NO? - Proceed.
+3. **Do I have a backup/alternate machine if this one goes down temporarily?**
+  - YES? - Proceed.
+  - NO? - Make a backup, assess your comfort level, proceed if comfortable.
+4. **How recently was this upgrade issued? Have any stability issues been reported?**
+  - YES? - Wait a week (or two), check again, then upgrade.
+  - NO? - Proceed. 
 
-* upgrading more than one release at a time
-* running older releases that have already reached the end-of-life period
-* using a large number of third-party software repositories (PPAs)
+# Backing Up Your Data
 
-Our goal is to make the upgrade process as consistent and reliable as possible, and make sure you are prepared for anything that may occur during the upgrade should something not go according to plan.
-
-### Backing Up Your Data
-
-The upgrade process will leave your files in place, but no matter which system version you are running, we always recommend first creating a good backup of your files, just to be on the safe side should anything unexpected happen during the upgrade.
+<alert> **IMPORTANT NOTE:** The upgrade process will leave your files in place, but no matter which system version you are running, we **always** recommend first creating a good backup of your files, just to be on the safe side should anything unexpected happen during the upgrade.</alert>
 
 Please read our article on [how to backup your files](/articles/backup-files/) for helpful instructions.
 
-### Create Installation USB (Optional)
-
-Some users may prefer to have Pop!\_OS installation media handy before starting any upgrades in case they need to reinstall or repair the operating system. Instructions on creating a USB disk with Pop!\_OS are located in our [live disk](/articles/live-disk/) article.
 
 # Upgrade Pop!_OS
 
 Pop!\_OS 20.10 was released October 23, 2020.
 
-# Upgrading Pop!\_OS to 20.10 from 20.04
+# Upgrading Pop!\_OS to 21.04 from 20.10 
+
 ### (For all other operating system versions, scroll down to the instructions for upgrading from an earlier release)
 
 First, make sure you have applied all updates to your system. You can do this through the Pop!\_Shop, or through the terminal:
@@ -63,15 +67,15 @@ sudo apt full-upgrade
 
 Once the updates are applied, a notification should appear at the top of your screen saying that an upgrade is available. Click on this notification, or go to Settings -> OS Upgrade.
 
-On the system's "OS Upgrade" page, you will notice a new feature has been added. The System76 upgrade package will display a message that Pop!\_OS 20.10 is available with a "Download" button.
+The System76 upgrade package will display a message that Pop!\_OS 21.04 is available with a "Download" button.
 
 Click the "Download" button and the download will begin.
 
 Once the download is complete, you will receive a second notification saying the upgrade is ready.
 
 Click on the notification and your computer will restart to the upgrade screen.
 
-After the upgrade is finished, you will be taken back to the login page, and voila! Your system is now running Pop!\_OS 20.10!
+After the upgrade is finished, you will be taken back to the login page, and voila! Your system is now running Pop!\_OS 21.04!
 
 ### Advanced Install (Terminal)
 
@@ -112,7 +116,7 @@ Once restarted, the computer will be on the newly upgraded system! If you run in
 
 # Upgrading older releases
 
-Upgrading Pop!\_OS 17.10 (artful) 18.10 (cosmic), 19.04 (disco) or 19.10 (eoan) will require upgrading to Pop!\_OS 20.04 (focal) LTS before upgrading to the current Pop!\_OS 20.10 (groovy).
+Upgrading Pop!\_OS 17.10 (artful) 18.10 (cosmic), 19.04 (disco) or 19.10 (eoan) will require upgrading to Pop!\_OS 20.04 (focal) LTS before upgrading to the current Pop!\_OS 21.04 (hirsute).
 
 These older Pop!\_OS releases are now unsupported and no new updates are available. After unsupported versions have been removed from the archive and mirror network, you will need to change where your system checks for un-applied updates to be able to upgrade. Open a terminal and follow the next set of instructions to upgrade from Pop!\_OS 18.10, 19.04, or 19.10.
 
@@ -153,7 +157,7 @@ You will want to take a look at the files that end in "list" in "/etc/apt/backup
 
 ### 5. After the 20.04 Pop upgrade is complete, **reboot**.
 
-### 6. Run the command to upgrade to Pop 20.10
+### 6. Run the command to upgrade to Pop 21.04
 
 ```bash
 pop-upgrade release upgrade
diff --git a/static/images/add-a-printer-pop/printer-settings-add-dialog.png b/static/images/add-a-printer-pop/printer-settings-add-dialog.png
diff --git a/static/images/add-a-printer-pop/printer-settings.png b/static/images/add-a-printer-pop/printer-settings.png
