diff options
| -rw-r--r-- | docs/advanced/btrfs/btrfs.md | 8 | ||||
| -rw-r--r-- | mkdocs.yml | 36 |
2 files changed, 2 insertions, 42 deletions
diff --git a/docs/advanced/btrfs/btrfs.md b/docs/advanced/btrfs/btrfs.md index fdb4e1a..6153206 100644 --- a/docs/advanced/btrfs/btrfs.md +++ b/docs/advanced/btrfs/btrfs.md @@ -1,6 +1,6 @@ # Btrfs -{width=300} +{width=300} 英文:B-tree filesystem(btrfs) @@ -11,11 +11,7 @@ Btrfs即B-tree文件系统,通常念成Butter FS,Better FS或B-tree FS,一 ???+ note "写时复制 (CoW)" 写时复制指将修改的数据块单独存储到CoW分区,以实现备份的作用。具体原理可参考下图。 -<<<<<<<< HEAD:docs/advanced/btrfs.md -  -======== -  ->>>>>>>> 2899bb7 (added guide on installing linux with btrfs subvol linux_on_btrfs.md):docs/concepts/file_system/btrfs/btrfs.md +  Btrfs有以下常见功能: @@ -112,42 +112,6 @@ 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/file_system/btrfs/migrating_to_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系: |
