Merge branch 'master' into fix-popos

Author: thomas-zimmerman

LICENSE.md

@@ -0,0 +1 @@
+This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit https://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.

content/fan-noise.md

@@ -28,7 +28,7 @@ Fan Speeds can be monitored with <u>psensor</u>, which can be installed from eit
 
 Our [Open Firmware laptops](/articles/open-firmware-systems) have fan controls to swap between max or automatic thermal control. Use Fn+1 to toggle between the modes. (Your model will show support on the key section of their [tech-docs](https://tech-docs.system76.com)).
 
-### Easy settings to effect fan noise
+### Easy settings to affect fan noise
 
 Fan speed is based on thermal output of the system. There are some settings that will indirectly limit how much heat is created during use:
 

content/flash-firmware-from-usb.md

@@ -62,7 +62,7 @@ Next, select the .img file use the `Choose Image` button.
 
 ![Popsicle Image](/images/pop-live-disk/popsicle-image-selection.png)
 
-Now select the USB Flash Drive that you are coping the file(s) to.
+Now select the USB Flash Drive that you are copying the file(s) to.
 
 ![Popsicle Drive](/images/pop-live-disk/popsicle-drive-selection.png)
 

content/live-disk.md

@@ -122,6 +122,8 @@ Once the flash is complete (should look like the screenshot above), it's time to
 
 Etcher is an open source app for Windows, macOS, and Linux that allows you to burn disk images to USB drives. You can download it at [balena.io/etcher/](https://www.balena.io/etcher/).
 
+> Note: Balena Etcher collects usage statistics by default. You can turn off this data collection in Settings.
+
 Once you have installed Etcher and downloaded the Pop!\_OS.iso image, open up the Etcher application. You should see something like this:
 
 ![Etcher Startup](/images/live-disk-new/etcher01-start.png)

content/luanti.md

@@ -0,0 +1,60 @@
+---
+title: Install and Play Luanti
+description: >
+  Luanti, formerly Minetest, an open source infinite-world block sandbox game with survival and crafting.
+keywords:
+  - Games
+  - luanti
+  - minetest
+
+facebookImage: /_social/article
+twitterImage: /_social/article
+
+hidden: false
+section: community
+tableOfContents: true
+
+redirect_from:
+  - /articles/minetest
+---
+
+Did you get sick of Minecraft? Microsoft controlling it and ripping apart our beloved game? Well fear no more! Luanti is similar to Minecraft, but it is a truly infinite voxel game engine, written in C++ for speed and easy cross-compatiblity with different platforms, all licensed under the LGPL. With powerful modding features, there are many custom games, mods, and texture packs available from its community!
+
+## Installation
+
+To install on Ubuntu/Pop\_OS!, first add the PPA to the system's software sources.
+
+```bash
+sudo add-apt-repository ppa:minetestdevs/stable
+```
+
+The Luanti package (named `minetest`) is now available to install.
+
+```bash
+sudo apt update
+sudo apt install minetest
+```
+
+Now you can play the game!
+
+## Adding Games, Mods, and Texture Packs
+
+When you open Luanti, you'll be prompted to install a game from [ContentDB](https://content.luanti.org/), the home of hundreds of different custom games, mods, and texture packs!
+
+Start with [Minetest Game](https://content.luanti.org/packages/Luanti/minetest_game/), the official base game. Explore the mods and texture packs created for it!
+
+## Connecting to Servers
+
+To connect to a server, choose one from the list, then choose a username and password on the right side of the screen. The server will then connect. The next time you use the server, simply put in the same username and password! Custom mods are automatically loaded, so no fuss is needed.
+
+## Resources
+
+Check out Luanti at [luanti.org](https://www.luanti.org/).
+
+Or on GitHub, [@luanti-org](https://github.com/luanti-org).
+
+Become a contributor! Change the future of gaming!
+
+---
+
+This article was contributed by [kylerschin](https://github.com/kylerschin).

content/minetest.md

@@ -53,7 +53,9 @@ The source code for our Open EC can be found [here](https://github.com/system76/
 | Gazelle (gaze16 and newer)   | Yes           | Yes     |
 | Lemur Pro (lemp8 and older)  | No            | No      |
 | Lemur Pro (lemp9 and newer)  | Yes           | Yes     |
+| Meerkat (meer8 and older)    | No            | N/A     |
 | Meerkat (meer9)              | Yes           | N/A     |
+| Meerkat (meer10)             | No            | N/A     |
 | Oryx Pro (oryp5 and older)   | No            | No      |
 | Oryx Pro (oryp6 and newer)   | Yes           | Yes     |
 

content/open-firmware-systems.md

@@ -44,7 +44,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 ..`. To return to your home directory from any location in the filesystem, 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)