aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mkdocs.yml35
1 files changed, 35 insertions, 0 deletions
diff --git a/mkdocs.yml b/mkdocs.yml
index 616d177..db1b064 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -112,6 +112,41 @@ nav:
- getting-started/input-method.md
- getting-started/common-command.md
- getting-started/network.md
+<<<<<<< HEAD
+=======
+ - 概念:
+ - Linux基础:
+ - concepts/linux/free_software.md
+ - concepts/linux/distro.md
+ - concepts/linux/mirrors.md
+ - concepts/linux/shell.md
+ - concepts/linux/rolling_update.md
+ - 操作系统:
+ - concepts/operating_system/bios.md
+ - concepts/operating_system/secure_boot.md
+ - concepts/operating_system/boot_loader.md
+ - concepts/operating_system/disk_partition_table.md
+ - concepts/operating_system/partition.md
+ - concepts/operating_system/file_system.md
+ - concepts/operating_system/mounting.md
+ - 包管理:
+ - concepts/package_managers/apt.md
+ - concepts/package_managers/dnf.md
+ - concepts/package_managers/pacman.md
+ - concepts/package_managers/flatpak.md
+ - concepts/package_managers/appimage.md
+ - 文件系统:
+ - concepts/file_system/lvm.md
+ - Btrfs:
+ - concepts/file_system/btrfs/btrfs.md
+ - concepts/file_system/btrfs/linux_on_btrfs.md
+ - 桌面:
+ - concepts/desktop/de.md
+ - concepts/desktop/tiling_desktop.md
+ - concepts/desktop/wm.md
+ - concepts/desktop/desktop_shell.md
+ - concepts/desktop/dotfiles.md
+>>>>>>> a57e0ab (updated mkdocs.yml)
- 发行版:
- distros/distro.md
- Debian系: