Merge branch 'main' into jm_action_tags_and_permissions

github · Oct 11, 2024 · c375151 · c375151
2 parents 34dfdf7 + 3145804
commit c375151
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/collections/virtual-machines/index.md b/collections/virtual-machines/index.md
@@ -0,0 +1,7 @@
+---
+items:
+ - utmapp/UTM
+display_name: Virtual Machines
+created_by: jobearrr
+---
+A virtual machine (or VM) is a digitized version of a physical computer. Virtual machines can run programs and operating systems, store data, connect to networks, and do other computing functions. However, a VM uses entirely virtual resources instead of physical components.
diff --git a/topics/linux-learning/index.md b/topics/linux-learning/index.md
@@ -0,0 +1,9 @@
+---
+aliases: linux-education, learn-linux
+display_name: Linux learning
+short_description: Projects designed to make learning Linux easier.
+topic: linux-learning
+wikipedia_url: https://en.wikipedia.org/wiki/Linux
+logo: linux-learning.png
+---
+Projects trying to make learning linux easier.
diff --git a/topics/linux-learning/linux-learning.png b/topics/linux-learning/linux-learning.png