Skip to content

Commit df9a163

Browse files
authored
Merge branch 'master' into upgrading-upgrade-pop2404
2 parents 1921afc + 9a64945 commit df9a163

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

content/pop-basics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Pop!\_OS 24.04 includes the [COSMIC desktop environment](https://system76.com/co
2525

2626
## The Launcher
2727

28-
The <u>Launcher</u> is a search-based utility for accessing and opening applications and files. This video demonstrates the powerful funcationality of the COSMIC Launcher:
28+
The <u>Launcher</u> is a search-based utility for accessing and opening applications and files. This video demonstrates the powerful functionality of the COSMIC Launcher:
2929

3030
<div class='embed-container'><iframe src='https://www.youtube.com/embed/zHuXKCPbX9E' frameborder='0' allowfullscreen></iframe></div>
3131

@@ -141,6 +141,6 @@ To update currently installed software, click `Updates` in the left menu of the
141141

142142
## Keyboard Shortcuts
143143

144-
For a more detailed overview of Pop!\_OS keyboard shortcuts, refer to [the Keyboard Shortcuts article](/articles/pop-keyboard-shortcuts).
144+
For a more detailed overview of Pop!\_OS keyboard shortcuts, refer to [the Keyboard Shortcuts article](/articles/pop-cosmic-keyboard-shortcuts).
145145

146146
You can read more about Pop!\_OS features on the [Pop!_OS homepage](https://system76.com/pop/), or view the source code in [the Pop!_OS GitHub organization](https://github.com/pop-os/).

content/pop-recovery.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ tableOfContents: true
2121

2222
The Recovery Partition is a full copy of the Pop!\_OS installation disk. It can be used exactly the same as if a live disk copy of Pop!\_OS was booted from a USB drive. The existing operating system can be repaired or reinstalled from the recovery mode. You can perform a refresh install, which allows you to reinstall without losing any user data or data in your home directory. Recovery can also perform a clean install, which resets all OS data.
2323

24-
To boot into recovery mode, bring up the <u>systemd-boot</u> menu by holding down <kbd>SPACE</kbd> while the system is booting, or by holding/tapping any function keys **NOT** used to [Access the BIOS/Boot Menu](/articles/boot-menu) (On non-System76 hardware, try the keys <kbd>F1</kbd> through <kbd>F12</kbd>).
24+
To boot into recovery mode, bring up the <u>systemd-boot</u> menu by holding/repeatedly tapping <kbd>SPACE</kbd> while the system is booting, or by holding/tapping any function keys **NOT** used to [Access the BIOS/Boot Menu](/articles/boot-menu) (On non-System76 hardware, try the keys <kbd>F1</kbd> through <kbd>F12</kbd>).
2525

2626
>**Note:** These instructions assume Pop!\_OS is the only OS running on your system. If you are booting more than one operating system you may need to change your boot order first, or manually select the Pop!\_OS Disk from your BIOS/Boot menu.
2727

content/yubikey-login.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ You should receive a unique *challenge-serial* in your output.
5050
Now, to finish up:
5151

5252
sudo mv ~/.yubico/challenge-123456 /var/yubico/aaronh-serial
53-
sudo chown root.root /var/yubico/aaronh-serial
53+
sudo chown root:root /var/yubico/aaronh-serial
5454
sudo chmod 600 /var/yubico/aaronh-serial
5555

5656
Pay close attention when copying/pasting the commands above. The *challenge-123456* and *aaronh-serial* needs to match the both the output from the `ykpamcfg` command and the final file needs to match the name of your user name and serial.**

0 commit comments

Comments
 (0)