diff --git a/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md
index be3f6af9764..cf663e28d33 100644
--- a/.github/ISSUE_TEMPLATE/missing_documentation.md
+++ b/.github/ISSUE_TEMPLATE/missing_documentation.md
@@ -23,7 +23,7 @@ assignees: ''
 - [ ] checked [open documentation issues and pull requests] for possible duplicates
 
 [latest Nix manual]: https://nixos.org/manual/nix/unstable/
-[source]: https://github.com/NixOS/nix/tree/master/doc/manual/src
+[source]: https://github.com/NixOS/nix/tree/master/doc/manual/source
 [open documentation issues and pull requests]: https://github.com/NixOS/nix/labels/documentation
 
 ## Priorities
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 0e6fd3e2677..9f7cb76c533 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -9,7 +9,7 @@
     - any-glob-to-any-file: "CONTRIBUTING.md"
     - any-glob-to-any-file: ".github/ISSUE_TEMPLATE/*"
     - any-glob-to-any-file: ".github/PULL_REQUEST_TEMPLATE.md"
-    - any-glob-to-any-file: "doc/manual/src/contributing/**"
+    - any-glob-to-any-file: "doc/manual/source/contributing/**"
 
 "documentation":
   - changed-files:
diff --git a/.gitignore b/.gitignore
index a17b627f44a..8d66939843c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,17 +23,17 @@ perl/Makefile.config
 /doc/manual/conf-file.json
 /doc/manual/language.json
 /doc/manual/xp-features.json
-/doc/manual/src/SUMMARY.md
-/doc/manual/src/SUMMARY-rl-next.md
-/doc/manual/src/store/types/*
-!/doc/manual/src/store/types/index.md.in
-/doc/manual/src/command-ref/new-cli
-/doc/manual/src/command-ref/conf-file.md
-/doc/manual/src/command-ref/experimental-features-shortlist.md
-/doc/manual/src/contributing/experimental-feature-descriptions.md
-/doc/manual/src/language/builtins.md
-/doc/manual/src/language/builtin-constants.md
-/doc/manual/src/release-notes/rl-next.md
+/doc/manual/source/SUMMARY.md
+/doc/manual/source/SUMMARY-rl-next.md
+/doc/manual/source/store/types/*
+!/doc/manual/source/store/types/index.md.in
+/doc/manual/source/command-ref/new-cli
+/doc/manual/source/command-ref/conf-file.md
+/doc/manual/source/command-ref/experimental-features-shortlist.md
+/doc/manual/source/contributing/experimental-feature-descriptions.md
+/doc/manual/source/language/builtins.md
+/doc/manual/source/language/builtin-constants.md
+/doc/manual/source/release-notes/rl-next.md
 
 # /scripts/
 /scripts/nix-profile.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 56508df342f..ad867896269 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -79,7 +79,7 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy).
      - Functional tests – [`tests/functional/**.sh`](./tests/functional)
      - Unit tests – [`src/*/tests`](./src/)
      - Integration tests – [`tests/nixos/*`](./tests/nixos)
-   - [ ] User documentation in the [manual](./doc/manual/src)
+   - [ ] User documentation in the [manual](./doc/manual/source)
    - [ ] API documentation in header files
    - [ ] Code and comments are self-explanatory
    - [ ] Commit message explains **why** the change was made
@@ -90,7 +90,7 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy).
 ## Making changes to the Nix manual
 
 The Nix reference manual is hosted on https://nixos.org/manual/nix.
-The underlying source files are located in [`doc/manual/src`](./doc/manual/src).
+The underlying source files are located in [`doc/manual/source`](./doc/manual/source).
 For small changes you can [use GitHub to edit these files](https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files)
 For larger changes see the [Nix reference manual](https://nix.dev/manual/nix/development/development/contributing.html).
 
diff --git a/HACKING.md b/HACKING.md
index d3576d60dcf..02971da3ea5 120000
--- a/HACKING.md
+++ b/HACKING.md
@@ -1 +1 @@
-doc/manual/src/development/building.md
\ No newline at end of file
+doc/manual/source/development/building.md
\ No newline at end of file
diff --git a/doc/manual/book.toml b/doc/manual/book.toml
index acae7aec7d9..213739174b9 100644
--- a/doc/manual/book.toml
+++ b/doc/manual/book.toml
@@ -1,5 +1,6 @@
 [book]
 title = "Nix Reference Manual"
+src = "source"
 
 [output.html]
 additional-css = ["custom.css"]
@@ -7,7 +8,7 @@ additional-js = ["redirects.js"]
 edit-url-template = "https://github.com/NixOS/nix/tree/master/doc/manual/{path}"
 git-repository-url = "https://github.com/NixOS/nix"
 
-# Handles replacing @docroot@ with a path to ./src relative to that markdown file,
+# Handles replacing @docroot@ with a path to ./source relative to that markdown file,
 # {{#include handlebars}}, and the @generated@ syntax used within these. it mostly
 # but not entirely replaces the links preprocessor (which we cannot simply use due
 # to @generated@ files living in a different directory to make meson happy). we do
diff --git a/doc/manual/generate-store-types.nix b/doc/manual/generate-store-types.nix
index 3b78a0e1bb6..46179abc5bf 100644
--- a/doc/manual/generate-store-types.nix
+++ b/doc/manual/generate-store-types.nix
@@ -21,7 +21,7 @@ let
 
   "index.md" = replaceStrings
     [ "@store-types@" ] [ index ]
-    (readFile ./src/store/types/index.md.in);
+    (readFile ./source/store/types/index.md.in);
 
   tableOfContents =
     let
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 3c777efc3f9..36cccc5066d 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -4,8 +4,8 @@
 doc_nix = $(nix_PATH)
 
 MANUAL_SRCS := \
-	$(call rwildcard, $(d)/src, *.md) \
-	$(call rwildcard, $(d)/src, */*.md)
+	$(call rwildcard, $(d)/source, *.md) \
+	$(call rwildcard, $(d)/source, */*.md)
 
 man-pages := $(foreach n, \
 	nix-env.1 nix-store.1 \
@@ -18,11 +18,11 @@ man-pages := $(foreach n, \
 , $(d)/$(n))
 
 # man pages for subcommands
-# convert from `$(d)/src/command-ref/nix-{1}/{2}.md` to `$(d)/nix-{1}-{2}.1`
+# convert from `$(d)/source/command-ref/nix-{1}/{2}.md` to `$(d)/nix-{1}-{2}.1`
 # FIXME: unify with how nix3-cli man pages are generated
 man-pages += $(foreach subcommand, \
-	$(filter-out %opt-common.md %env-common.md, $(wildcard $(d)/src/command-ref/nix-*/*.md)), \
-	$(d)/$(subst /,-,$(subst $(d)/src/command-ref/,,$(subst .md,.1,$(subcommand)))))
+	$(filter-out %opt-common.md %env-common.md, $(wildcard $(d)/source/command-ref/nix-*/*.md)), \
+	$(d)/$(subst /,-,$(subst $(d)/source/command-ref/,,$(subst .md,.1,$(subcommand)))))
 
 clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
 
@@ -49,11 +49,11 @@ define process-includes
 	done < <(grep '{{#include' $(1))
 endef
 
-$(d)/nix-env-%.1: $(d)/src/command-ref/nix-env/%.md
+$(d)/nix-env-%.1: $(d)/source/command-ref/nix-env/%.md
 	@printf "Title: %s\n\n" "$(subst nix-env-,nix-env --,$$(basename "$@" .1))" > $^.tmp
 	$(render-subcommand)
 
-$(d)/nix-store-%.1: $(d)/src/command-ref/nix-store/%.md
+$(d)/nix-store-%.1: $(d)/source/command-ref/nix-store/%.md
 	@printf -- 'Title: %s\n\n' "$(subst nix-store-,nix-store --,$$(basename "$@" .1))" > $^.tmp
 	$(render-subcommand)
 
@@ -69,50 +69,50 @@ define render-subcommand
 endef
 
 
-$(d)/%.1: $(d)/src/command-ref/%.md
+$(d)/%.1: $(d)/source/command-ref/%.md
 	@printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp
 	@cat $^ >> $^.tmp
 	@$(call process-includes,$^,$^.tmp)
 	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=1 $^.tmp -o $@
 	@rm $^.tmp
 
-$(d)/%.8: $(d)/src/command-ref/%.md
+$(d)/%.8: $(d)/source/command-ref/%.md
 	@printf "Title: %s\n\n" "$$(basename $@ .8)" > $^.tmp
 	@cat $^ >> $^.tmp
 	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=8 $^.tmp -o $@
 	@rm $^.tmp
 
-$(d)/nix.conf.5: $(d)/src/command-ref/conf-file.md
+$(d)/nix.conf.5: $(d)/source/command-ref/conf-file.md
 	@printf "Title: %s\n\n" "$$(basename $@ .5)" > $^.tmp
 	@cat $^ >> $^.tmp
 	@$(call process-includes,$^,$^.tmp)
 	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=5 $^.tmp -o $@
 	@rm $^.tmp
 
-$(d)/nix-profiles.5: $(d)/src/command-ref/files/profiles.md
+$(d)/nix-profiles.5: $(d)/source/command-ref/files/profiles.md
 	@printf "Title: %s\n\n" "$$(basename $@ .5)" > $^.tmp
 	@cat $^ >> $^.tmp
 	$(trace-gen) lowdown -sT man --nroff-nolinks -M section=5 $^.tmp -o $@
 	@rm $^.tmp
 
-$(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/SUMMARY-rl-next.md $(d)/src/store/types $(d)/src/command-ref/new-cli $(d)/src/development/experimental-feature-descriptions.md
+$(d)/source/SUMMARY.md: $(d)/source/SUMMARY.md.in $(d)/source/SUMMARY-rl-next.md $(d)/source/store/types $(d)/source/command-ref/new-cli $(d)/source/development/experimental-feature-descriptions.md
 	@cp $< $@
 	@$(call process-includes,$@,$@)
 
-$(d)/src/store/types: $(d)/nix.json $(d)/utils.nix $(d)/generate-store-info.nix  $(d)/generate-store-types.nix $(d)/src/store/types/index.md.in $(doc_nix)
+$(d)/source/store/types: $(d)/nix.json $(d)/utils.nix $(d)/generate-store-info.nix  $(d)/generate-store-types.nix $(d)/source/store/types/index.md.in $(doc_nix)
 	@# FIXME: build out of tree!
 	@rm -rf $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-store-types.nix (builtins.fromJSON (builtins.readFile $<)).stores'
 	@# do not destroy existing contents
 	@mv $@.tmp/* $@/
 
-$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(d)/generate-settings.nix $(d)/generate-store-info.nix $(doc_nix)
+$(d)/source/command-ref/new-cli: $(d)/nix.json $(d)/utils.nix $(d)/generate-manpage.nix $(d)/generate-settings.nix $(d)/generate-store-info.nix $(doc_nix)
 	@rm -rf $@ $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-manpage.nix true (builtins.readFile $<)'
 	@mv $@.tmp $@
 
-$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/utils.nix $(d)/generate-settings.nix $(d)/src/command-ref/conf-file-prefix.md $(d)/src/command-ref/experimental-features-shortlist.md $(doc_nix)
-	@cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp
+$(d)/source/command-ref/conf-file.md: $(d)/conf-file.json $(d)/utils.nix $(d)/generate-settings.nix $(d)/source/command-ref/conf-file-prefix.md $(d)/source/command-ref/experimental-features-shortlist.md $(doc_nix)
+	@cat doc/manual/source/command-ref/conf-file-prefix.md > $@.tmp
 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-settings.nix { prefix = "conf"; } (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp;
 	@mv $@.tmp $@
 
@@ -124,12 +124,12 @@ $(d)/conf-file.json: $(doc_nix)
 	$(trace-gen) $(dummy-env) $(doc_nix) config show --json --experimental-features nix-command > $@.tmp
 	@mv $@.tmp $@
 
-$(d)/src/development/experimental-feature-descriptions.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features.nix $(doc_nix)
+$(d)/source/development/experimental-feature-descriptions.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features.nix $(doc_nix)
 	@rm -rf $@ $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-xp-features.nix (builtins.fromJSON (builtins.readFile $<))'
 	@mv $@.tmp $@
 
-$(d)/src/command-ref/experimental-features-shortlist.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features-shortlist.nix $(doc_nix)
+$(d)/source/command-ref/experimental-features-shortlist.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features-shortlist.nix $(doc_nix)
 	@rm -rf $@ $@.tmp
 	$(trace-gen) $(nix-eval) --write-to $@.tmp --expr 'import doc/manual/generate-xp-features-shortlist.nix (builtins.fromJSON (builtins.readFile $<))'
 	@mv $@.tmp $@
@@ -138,10 +138,10 @@ $(d)/xp-features.json: $(doc_nix)
 	$(trace-gen) $(dummy-env) $(doc_nix) __dump-xp-features > $@.tmp
 	@mv $@.tmp $@
 
-$(d)/src/language/builtins.md: $(d)/language.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(doc_nix)
-	@cat doc/manual/src/language/builtins-prefix.md > $@.tmp
+$(d)/source/language/builtins.md: $(d)/language.json $(d)/generate-builtins.nix $(d)/source/language/builtins-prefix.md $(doc_nix)
+	@cat doc/manual/source/language/builtins-prefix.md > $@.tmp
 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp;
-	@cat doc/manual/src/language/builtins-suffix.md >> $@.tmp
+	@cat doc/manual/source/language/builtins-suffix.md >> $@.tmp
 	@mv $@.tmp $@
 
 $(d)/language.json: $(doc_nix)
@@ -149,7 +149,7 @@ $(d)/language.json: $(doc_nix)
 	@mv $@.tmp $@
 
 # Generate "Upcoming release" notes (or clear it and remove from menu)
-$(d)/src/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/*
+$(d)/source/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/*
 	@if type -p changelog-d > /dev/null; then \
 		echo "  GEN   " $@; \
 		changelog-d doc/manual/rl-next > $@; \
@@ -158,7 +158,7 @@ $(d)/src/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/*
 		true > $@; \
 	fi
 
-$(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md
+$(d)/source/SUMMARY-rl-next.md: $(d)/source/release-notes/rl-next.md
 	$(trace-gen) true
 	@if [ -s $< ]; then \
 		echo '  - [Upcoming release](release-notes/rl-next.md)' > $@; \
@@ -194,9 +194,9 @@ $(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-manpages
 	@mkdir -p $(DESTDIR)$$(dirname $@)
 	$(trace-install) install -m 0644 $$(dirname $<)/* $(DESTDIR)$$(dirname $@)
 
-doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
+doc/manual/generated/man1/nix3-manpages: $(d)/source/command-ref/new-cli
 	@mkdir -p $(DESTDIR)$$(dirname $@)
-	$(trace-gen) for i in doc/manual/src/command-ref/new-cli/*.md; do \
+	$(trace-gen) for i in doc/manual/source/command-ref/new-cli/*.md; do \
 		name=$$(basename $$i .md); \
 		tmpFile=$$(mktemp); \
 		if [[ $$name = SUMMARY ]]; then continue; fi; \
@@ -211,7 +211,7 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
 # `@docroot@` is to be preserved for documenting the mechanism
 # FIXME: maybe contributing guides should live right next to the code
 # instead of in the manual
-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/store/types $(d)/src/command-ref/new-cli $(d)/src/development/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md $(d)/src/release-notes/rl-next.md $(d)/src/figures $(d)/src/favicon.png $(d)/src/favicon.svg
+$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/source/SUMMARY.md $(d)/source/store/types $(d)/source/command-ref/new-cli $(d)/source/development/experimental-feature-descriptions.md $(d)/source/command-ref/conf-file.md $(d)/source/language/builtins.md $(d)/source/release-notes/rl-next.md $(d)/source/figures $(d)/source/favicon.png $(d)/source/favicon.svg
 	$(trace-gen) \
 		tmp="$$(mktemp -d)"; \
 		cp -r doc/manual "$$tmp"; \
@@ -219,14 +219,14 @@ $(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/
 			$(call process-includes,$$file,$$file); \
 		done; \
 		find "$$tmp" -name '*.md' ! -name 'documentation.md' | while read -r file; do \
-			docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/src)"; \
+			docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/source)"; \
 			sed -i "s,@docroot@,$$docroot,g" "$$file"; \
 		done; \
 		set -euo pipefail; \
 		( \
 		    cd "$$tmp/manual"; \
 		    RUST_LOG=warn \
-		        MDBOOK_SUBSTITUTE_SEARCH=$(d)/src \
+		        MDBOOK_SUBSTITUTE_SEARCH=$(d)/source \
 		        mdbook build -d $(DESTDIR)$(docdir)/manual.tmp 2>&1 \
 			    | { grep -Fv "because fragment resolution isn't implemented" || :; } \
 		); \
diff --git a/doc/manual/meson.build b/doc/manual/meson.build
index 31d1814d737..3630e2dc828 100644
--- a/doc/manual/meson.build
+++ b/doc/manual/meson.build
@@ -55,16 +55,16 @@ generate_manual_deps = files(
 )
 
 # Generates types
-subdir('src/store')
+subdir('source/store')
 # Generates builtins.md and builtin-constants.md.
-subdir('src/language')
+subdir('source/language')
 # Generates new-cli pages, experimental-features-shortlist.md, and conf-file.md.
-subdir('src/command-ref')
+subdir('source/command-ref')
 # Generates experimental-feature-descriptions.md.
-subdir('src/development')
+subdir('source/development')
 # Generates rl-next-generated.md.
-subdir('src/release-notes')
-subdir('src')
+subdir('source/release-notes')
+subdir('source')
 
 # Hacky way to figure out if `nix` is an `ExternalProgram` or
 # `Exectuable`. Only the latter can occur in custom target input lists.
@@ -82,7 +82,7 @@ manual = custom_target(
     '-c',
     '''
         @0@ @INPUT0@ @CURRENT_SOURCE_DIR@ > @DEPFILE@
-        @0@ @INPUT1@ summary @2@ < @CURRENT_SOURCE_DIR@/src/SUMMARY.md.in > @2@/src/SUMMARY.md
+        @0@ @INPUT1@ summary @2@ < @CURRENT_SOURCE_DIR@/source/SUMMARY.md.in > @2@/source/SUMMARY.md
         rsync -r --include='*.md' @CURRENT_SOURCE_DIR@/ @2@/
         (cd @2@; RUST_LOG=warn @1@ build -d @2@ 3>&2 2>&1 1>&3) | { grep -Fv "because fragment resolution isn't implemented" || :; } 3>&2 2>&1 1>&3
         rm -rf @2@/manual
@@ -117,7 +117,7 @@ manual = custom_target(
   depfile : 'manual.d',
   env : {
     'RUST_LOG': 'info',
-    'MDBOOK_SUBSTITUTE_SEARCH': meson.current_build_dir() / 'src',
+    'MDBOOK_SUBSTITUTE_SEARCH': meson.current_build_dir() / 'source',
   },
 )
 manual_html = manual[0]
diff --git a/doc/manual/redirects.js b/doc/manual/redirects.js
index cb8cd18fa14..dea141391df 100644
--- a/doc/manual/redirects.js
+++ b/doc/manual/redirects.js
@@ -1,7 +1,7 @@
 // redirect rules for URL fragments (client-side) to prevent link rot.
 // this must be done on the client side, as web servers do not see the fragment part of the URL.
 // it will only work with JavaScript enabled in the browser, but this is the best we can do here.
-// see src/_redirects for path redirects (server-side)
+// see source/_redirects for path redirects (server-side)
 
 // redirects are declared as follows:
 // each entry has as its key a path matching the requested URL path, relative to the mdBook document root.
diff --git a/doc/manual/src/SUMMARY.md.in b/doc/manual/source/SUMMARY.md.in
similarity index 100%
rename from doc/manual/src/SUMMARY.md.in
rename to doc/manual/source/SUMMARY.md.in
diff --git a/doc/manual/src/_redirects b/doc/manual/source/_redirects
similarity index 100%
rename from doc/manual/src/_redirects
rename to doc/manual/source/_redirects
diff --git a/doc/manual/src/advanced-topics/cores-vs-jobs.md b/doc/manual/source/advanced-topics/cores-vs-jobs.md
similarity index 100%
rename from doc/manual/src/advanced-topics/cores-vs-jobs.md
rename to doc/manual/source/advanced-topics/cores-vs-jobs.md
diff --git a/doc/manual/src/advanced-topics/diff-hook.md b/doc/manual/source/advanced-topics/diff-hook.md
similarity index 100%
rename from doc/manual/src/advanced-topics/diff-hook.md
rename to doc/manual/source/advanced-topics/diff-hook.md
diff --git a/doc/manual/src/advanced-topics/distributed-builds.md b/doc/manual/source/advanced-topics/distributed-builds.md
similarity index 100%
rename from doc/manual/src/advanced-topics/distributed-builds.md
rename to doc/manual/source/advanced-topics/distributed-builds.md
diff --git a/doc/manual/src/advanced-topics/index.md b/doc/manual/source/advanced-topics/index.md
similarity index 100%
rename from doc/manual/src/advanced-topics/index.md
rename to doc/manual/source/advanced-topics/index.md
diff --git a/doc/manual/src/advanced-topics/post-build-hook.md b/doc/manual/source/advanced-topics/post-build-hook.md
similarity index 100%
rename from doc/manual/src/advanced-topics/post-build-hook.md
rename to doc/manual/source/advanced-topics/post-build-hook.md
diff --git a/doc/manual/src/architecture/architecture.md b/doc/manual/source/architecture/architecture.md
similarity index 100%
rename from doc/manual/src/architecture/architecture.md
rename to doc/manual/source/architecture/architecture.md
diff --git a/doc/manual/src/c-api.md b/doc/manual/source/c-api.md
similarity index 100%
rename from doc/manual/src/c-api.md
rename to doc/manual/source/c-api.md
diff --git a/doc/manual/src/command-ref/conf-file-prefix.md b/doc/manual/source/command-ref/conf-file-prefix.md
similarity index 100%
rename from doc/manual/src/command-ref/conf-file-prefix.md
rename to doc/manual/source/command-ref/conf-file-prefix.md
diff --git a/doc/manual/src/command-ref/env-common.md b/doc/manual/source/command-ref/env-common.md
similarity index 100%
rename from doc/manual/src/command-ref/env-common.md
rename to doc/manual/source/command-ref/env-common.md
diff --git a/doc/manual/src/command-ref/experimental-commands.md b/doc/manual/source/command-ref/experimental-commands.md
similarity index 100%
rename from doc/manual/src/command-ref/experimental-commands.md
rename to doc/manual/source/command-ref/experimental-commands.md
diff --git a/doc/manual/src/command-ref/files.md b/doc/manual/source/command-ref/files.md
similarity index 100%
rename from doc/manual/src/command-ref/files.md
rename to doc/manual/source/command-ref/files.md
diff --git a/doc/manual/src/command-ref/files/channels.md b/doc/manual/source/command-ref/files/channels.md
similarity index 100%
rename from doc/manual/src/command-ref/files/channels.md
rename to doc/manual/source/command-ref/files/channels.md
diff --git a/doc/manual/src/command-ref/files/default-nix-expression.md b/doc/manual/source/command-ref/files/default-nix-expression.md
similarity index 100%
rename from doc/manual/src/command-ref/files/default-nix-expression.md
rename to doc/manual/source/command-ref/files/default-nix-expression.md
diff --git a/doc/manual/src/command-ref/files/manifest.json.md b/doc/manual/source/command-ref/files/manifest.json.md
similarity index 100%
rename from doc/manual/src/command-ref/files/manifest.json.md
rename to doc/manual/source/command-ref/files/manifest.json.md
diff --git a/doc/manual/src/command-ref/files/manifest.nix.md b/doc/manual/source/command-ref/files/manifest.nix.md
similarity index 100%
rename from doc/manual/src/command-ref/files/manifest.nix.md
rename to doc/manual/source/command-ref/files/manifest.nix.md
diff --git a/doc/manual/src/command-ref/files/profiles.md b/doc/manual/source/command-ref/files/profiles.md
similarity index 100%
rename from doc/manual/src/command-ref/files/profiles.md
rename to doc/manual/source/command-ref/files/profiles.md
diff --git a/doc/manual/src/command-ref/index.md b/doc/manual/source/command-ref/index.md
similarity index 100%
rename from doc/manual/src/command-ref/index.md
rename to doc/manual/source/command-ref/index.md
diff --git a/doc/manual/src/command-ref/main-commands.md b/doc/manual/source/command-ref/main-commands.md
similarity index 100%
rename from doc/manual/src/command-ref/main-commands.md
rename to doc/manual/source/command-ref/main-commands.md
diff --git a/doc/manual/src/command-ref/meson.build b/doc/manual/source/command-ref/meson.build
similarity index 100%
rename from doc/manual/src/command-ref/meson.build
rename to doc/manual/source/command-ref/meson.build
diff --git a/doc/manual/src/command-ref/nix-build.md b/doc/manual/source/command-ref/nix-build.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-build.md
rename to doc/manual/source/command-ref/nix-build.md
diff --git a/doc/manual/src/command-ref/nix-channel.md b/doc/manual/source/command-ref/nix-channel.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-channel.md
rename to doc/manual/source/command-ref/nix-channel.md
diff --git a/doc/manual/src/command-ref/nix-collect-garbage.md b/doc/manual/source/command-ref/nix-collect-garbage.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-collect-garbage.md
rename to doc/manual/source/command-ref/nix-collect-garbage.md
diff --git a/doc/manual/src/command-ref/nix-copy-closure.md b/doc/manual/source/command-ref/nix-copy-closure.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-copy-closure.md
rename to doc/manual/source/command-ref/nix-copy-closure.md
diff --git a/doc/manual/src/command-ref/nix-daemon.md b/doc/manual/source/command-ref/nix-daemon.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-daemon.md
rename to doc/manual/source/command-ref/nix-daemon.md
diff --git a/doc/manual/src/command-ref/nix-env.md b/doc/manual/source/command-ref/nix-env.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env.md
rename to doc/manual/source/command-ref/nix-env.md
diff --git a/doc/manual/src/command-ref/nix-env/delete-generations.md b/doc/manual/source/command-ref/nix-env/delete-generations.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/delete-generations.md
rename to doc/manual/source/command-ref/nix-env/delete-generations.md
diff --git a/doc/manual/src/command-ref/nix-env/env-common.md b/doc/manual/source/command-ref/nix-env/env-common.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/env-common.md
rename to doc/manual/source/command-ref/nix-env/env-common.md
diff --git a/doc/manual/src/command-ref/nix-env/install.md b/doc/manual/source/command-ref/nix-env/install.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/install.md
rename to doc/manual/source/command-ref/nix-env/install.md
diff --git a/doc/manual/src/command-ref/nix-env/list-generations.md b/doc/manual/source/command-ref/nix-env/list-generations.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/list-generations.md
rename to doc/manual/source/command-ref/nix-env/list-generations.md
diff --git a/doc/manual/src/command-ref/nix-env/opt-common.md b/doc/manual/source/command-ref/nix-env/opt-common.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/opt-common.md
rename to doc/manual/source/command-ref/nix-env/opt-common.md
diff --git a/doc/manual/src/command-ref/nix-env/query.md b/doc/manual/source/command-ref/nix-env/query.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/query.md
rename to doc/manual/source/command-ref/nix-env/query.md
diff --git a/doc/manual/src/command-ref/nix-env/rollback.md b/doc/manual/source/command-ref/nix-env/rollback.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/rollback.md
rename to doc/manual/source/command-ref/nix-env/rollback.md
diff --git a/doc/manual/src/command-ref/nix-env/set-flag.md b/doc/manual/source/command-ref/nix-env/set-flag.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/set-flag.md
rename to doc/manual/source/command-ref/nix-env/set-flag.md
diff --git a/doc/manual/src/command-ref/nix-env/set.md b/doc/manual/source/command-ref/nix-env/set.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/set.md
rename to doc/manual/source/command-ref/nix-env/set.md
diff --git a/doc/manual/src/command-ref/nix-env/switch-generation.md b/doc/manual/source/command-ref/nix-env/switch-generation.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/switch-generation.md
rename to doc/manual/source/command-ref/nix-env/switch-generation.md
diff --git a/doc/manual/src/command-ref/nix-env/switch-profile.md b/doc/manual/source/command-ref/nix-env/switch-profile.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/switch-profile.md
rename to doc/manual/source/command-ref/nix-env/switch-profile.md
diff --git a/doc/manual/src/command-ref/nix-env/uninstall.md b/doc/manual/source/command-ref/nix-env/uninstall.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/uninstall.md
rename to doc/manual/source/command-ref/nix-env/uninstall.md
diff --git a/doc/manual/src/command-ref/nix-env/upgrade.md b/doc/manual/source/command-ref/nix-env/upgrade.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-env/upgrade.md
rename to doc/manual/source/command-ref/nix-env/upgrade.md
diff --git a/doc/manual/src/command-ref/nix-hash.md b/doc/manual/source/command-ref/nix-hash.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-hash.md
rename to doc/manual/source/command-ref/nix-hash.md
diff --git a/doc/manual/src/command-ref/nix-instantiate.md b/doc/manual/source/command-ref/nix-instantiate.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-instantiate.md
rename to doc/manual/source/command-ref/nix-instantiate.md
diff --git a/doc/manual/src/command-ref/nix-prefetch-url.md b/doc/manual/source/command-ref/nix-prefetch-url.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-prefetch-url.md
rename to doc/manual/source/command-ref/nix-prefetch-url.md
diff --git a/doc/manual/src/command-ref/nix-shell.md b/doc/manual/source/command-ref/nix-shell.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-shell.md
rename to doc/manual/source/command-ref/nix-shell.md
diff --git a/doc/manual/src/command-ref/nix-store.md b/doc/manual/source/command-ref/nix-store.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store.md
rename to doc/manual/source/command-ref/nix-store.md
diff --git a/doc/manual/src/command-ref/nix-store/add-fixed.md b/doc/manual/source/command-ref/nix-store/add-fixed.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/add-fixed.md
rename to doc/manual/source/command-ref/nix-store/add-fixed.md
diff --git a/doc/manual/src/command-ref/nix-store/add.md b/doc/manual/source/command-ref/nix-store/add.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/add.md
rename to doc/manual/source/command-ref/nix-store/add.md
diff --git a/doc/manual/src/command-ref/nix-store/delete.md b/doc/manual/source/command-ref/nix-store/delete.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/delete.md
rename to doc/manual/source/command-ref/nix-store/delete.md
diff --git a/doc/manual/src/command-ref/nix-store/dump-db.md b/doc/manual/source/command-ref/nix-store/dump-db.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/dump-db.md
rename to doc/manual/source/command-ref/nix-store/dump-db.md
diff --git a/doc/manual/src/command-ref/nix-store/dump.md b/doc/manual/source/command-ref/nix-store/dump.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/dump.md
rename to doc/manual/source/command-ref/nix-store/dump.md
diff --git a/doc/manual/src/command-ref/nix-store/export.md b/doc/manual/source/command-ref/nix-store/export.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/export.md
rename to doc/manual/source/command-ref/nix-store/export.md
diff --git a/doc/manual/src/command-ref/nix-store/gc.md b/doc/manual/source/command-ref/nix-store/gc.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/gc.md
rename to doc/manual/source/command-ref/nix-store/gc.md
diff --git a/doc/manual/src/command-ref/nix-store/generate-binary-cache-key.md b/doc/manual/source/command-ref/nix-store/generate-binary-cache-key.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/generate-binary-cache-key.md
rename to doc/manual/source/command-ref/nix-store/generate-binary-cache-key.md
diff --git a/doc/manual/src/command-ref/nix-store/import.md b/doc/manual/source/command-ref/nix-store/import.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/import.md
rename to doc/manual/source/command-ref/nix-store/import.md
diff --git a/doc/manual/src/command-ref/nix-store/load-db.md b/doc/manual/source/command-ref/nix-store/load-db.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/load-db.md
rename to doc/manual/source/command-ref/nix-store/load-db.md
diff --git a/doc/manual/src/command-ref/nix-store/opt-common.md b/doc/manual/source/command-ref/nix-store/opt-common.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/opt-common.md
rename to doc/manual/source/command-ref/nix-store/opt-common.md
diff --git a/doc/manual/src/command-ref/nix-store/optimise.md b/doc/manual/source/command-ref/nix-store/optimise.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/optimise.md
rename to doc/manual/source/command-ref/nix-store/optimise.md
diff --git a/doc/manual/src/command-ref/nix-store/print-env.md b/doc/manual/source/command-ref/nix-store/print-env.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/print-env.md
rename to doc/manual/source/command-ref/nix-store/print-env.md
diff --git a/doc/manual/src/command-ref/nix-store/query.md b/doc/manual/source/command-ref/nix-store/query.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/query.md
rename to doc/manual/source/command-ref/nix-store/query.md
diff --git a/doc/manual/src/command-ref/nix-store/read-log.md b/doc/manual/source/command-ref/nix-store/read-log.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/read-log.md
rename to doc/manual/source/command-ref/nix-store/read-log.md
diff --git a/doc/manual/src/command-ref/nix-store/realise.md b/doc/manual/source/command-ref/nix-store/realise.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/realise.md
rename to doc/manual/source/command-ref/nix-store/realise.md
diff --git a/doc/manual/src/command-ref/nix-store/repair-path.md b/doc/manual/source/command-ref/nix-store/repair-path.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/repair-path.md
rename to doc/manual/source/command-ref/nix-store/repair-path.md
diff --git a/doc/manual/src/command-ref/nix-store/restore.md b/doc/manual/source/command-ref/nix-store/restore.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/restore.md
rename to doc/manual/source/command-ref/nix-store/restore.md
diff --git a/doc/manual/src/command-ref/nix-store/serve.md b/doc/manual/source/command-ref/nix-store/serve.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/serve.md
rename to doc/manual/source/command-ref/nix-store/serve.md
diff --git a/doc/manual/src/command-ref/nix-store/verify-path.md b/doc/manual/source/command-ref/nix-store/verify-path.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/verify-path.md
rename to doc/manual/source/command-ref/nix-store/verify-path.md
diff --git a/doc/manual/src/command-ref/nix-store/verify.md b/doc/manual/source/command-ref/nix-store/verify.md
similarity index 100%
rename from doc/manual/src/command-ref/nix-store/verify.md
rename to doc/manual/source/command-ref/nix-store/verify.md
diff --git a/doc/manual/src/command-ref/opt-common.md b/doc/manual/source/command-ref/opt-common.md
similarity index 100%
rename from doc/manual/src/command-ref/opt-common.md
rename to doc/manual/source/command-ref/opt-common.md
diff --git a/doc/manual/src/command-ref/status-build-failure.md b/doc/manual/source/command-ref/status-build-failure.md
similarity index 100%
rename from doc/manual/src/command-ref/status-build-failure.md
rename to doc/manual/source/command-ref/status-build-failure.md
diff --git a/doc/manual/src/command-ref/utilities.md b/doc/manual/source/command-ref/utilities.md
similarity index 100%
rename from doc/manual/src/command-ref/utilities.md
rename to doc/manual/source/command-ref/utilities.md
diff --git a/doc/manual/src/development/building.md b/doc/manual/source/development/building.md
similarity index 100%
rename from doc/manual/src/development/building.md
rename to doc/manual/source/development/building.md
diff --git a/doc/manual/src/development/cli-guideline.md b/doc/manual/source/development/cli-guideline.md
similarity index 100%
rename from doc/manual/src/development/cli-guideline.md
rename to doc/manual/source/development/cli-guideline.md
diff --git a/doc/manual/src/development/contributing.md b/doc/manual/source/development/contributing.md
similarity index 100%
rename from doc/manual/src/development/contributing.md
rename to doc/manual/source/development/contributing.md
diff --git a/doc/manual/src/development/cxx.md b/doc/manual/source/development/cxx.md
similarity index 100%
rename from doc/manual/src/development/cxx.md
rename to doc/manual/source/development/cxx.md
diff --git a/doc/manual/src/development/documentation.md b/doc/manual/source/development/documentation.md
similarity index 98%
rename from doc/manual/src/development/documentation.md
rename to doc/manual/source/development/documentation.md
index d5a95e0c1d0..d51373e7bcd 100644
--- a/doc/manual/src/development/documentation.md
+++ b/doc/manual/source/development/documentation.md
@@ -35,7 +35,7 @@ In order to reflect changes to the [Makefile for the manual], clear all generate
 [Makefile for the manual]: https://github.com/NixOS/nix/blob/master/doc/manual/local.mk
 
 ```console
-rm $(git ls-files doc/manual/ -o | grep -F '.md') && rmdir doc/manual/src/command-ref/new-cli && make manual-html -j $NIX_BUILD_CORES
+rm $(git ls-files doc/manual/ -o | grep -F '.md') && rmdir doc/manual/source/command-ref/new-cli && make manual-html -j $NIX_BUILD_CORES
 ```
 
 ## Style guide
@@ -182,7 +182,7 @@ Please observe these guidelines to ease reviews:
 
 `@docroot@` provides a base path for links that occur in reusable snippets or other documentation that doesn't have a base path of its own.
 
-If a broken link occurs in a snippet that was inserted into multiple generated files in different directories, use `@docroot@` to reference the `doc/manual/src` directory.
+If a broken link occurs in a snippet that was inserted into multiple generated files in different directories, use `@docroot@` to reference the `doc/manual/source` directory.
 
 If the `@docroot@` literal appears in an error message from the [`mdbook-linkcheck`] tool, the `@docroot@` replacement needs to be applied to the generated source file that mentions it.
 See existing `@docroot@` logic in the [Makefile for the manual].
diff --git a/doc/manual/src/development/experimental-features.md b/doc/manual/source/development/experimental-features.md
similarity index 100%
rename from doc/manual/src/development/experimental-features.md
rename to doc/manual/source/development/experimental-features.md
diff --git a/doc/manual/src/development/index.md b/doc/manual/source/development/index.md
similarity index 100%
rename from doc/manual/src/development/index.md
rename to doc/manual/source/development/index.md
diff --git a/doc/manual/src/development/json-guideline.md b/doc/manual/source/development/json-guideline.md
similarity index 100%
rename from doc/manual/src/development/json-guideline.md
rename to doc/manual/source/development/json-guideline.md
diff --git a/doc/manual/src/development/meson.build b/doc/manual/source/development/meson.build
similarity index 100%
rename from doc/manual/src/development/meson.build
rename to doc/manual/source/development/meson.build
diff --git a/doc/manual/src/development/testing.md b/doc/manual/source/development/testing.md
similarity index 100%
rename from doc/manual/src/development/testing.md
rename to doc/manual/source/development/testing.md
diff --git a/doc/manual/src/favicon.png b/doc/manual/source/favicon.png
similarity index 100%
rename from doc/manual/src/favicon.png
rename to doc/manual/source/favicon.png
diff --git a/doc/manual/src/favicon.svg b/doc/manual/source/favicon.svg
similarity index 100%
rename from doc/manual/src/favicon.svg
rename to doc/manual/source/favicon.svg
diff --git a/doc/manual/src/figures/user-environments.png b/doc/manual/source/figures/user-environments.png
similarity index 100%
rename from doc/manual/src/figures/user-environments.png
rename to doc/manual/source/figures/user-environments.png
diff --git a/doc/manual/src/figures/user-environments.sxd b/doc/manual/source/figures/user-environments.sxd
similarity index 100%
rename from doc/manual/src/figures/user-environments.sxd
rename to doc/manual/source/figures/user-environments.sxd
diff --git a/doc/manual/src/glossary.md b/doc/manual/source/glossary.md
similarity index 100%
rename from doc/manual/src/glossary.md
rename to doc/manual/source/glossary.md
diff --git a/doc/manual/src/installation/building-source.md b/doc/manual/source/installation/building-source.md
similarity index 100%
rename from doc/manual/src/installation/building-source.md
rename to doc/manual/source/installation/building-source.md
diff --git a/doc/manual/src/installation/env-variables.md b/doc/manual/source/installation/env-variables.md
similarity index 100%
rename from doc/manual/src/installation/env-variables.md
rename to doc/manual/source/installation/env-variables.md
diff --git a/doc/manual/src/installation/index.md b/doc/manual/source/installation/index.md
similarity index 100%
rename from doc/manual/src/installation/index.md
rename to doc/manual/source/installation/index.md
diff --git a/doc/manual/src/installation/installing-binary.md b/doc/manual/source/installation/installing-binary.md
similarity index 100%
rename from doc/manual/src/installation/installing-binary.md
rename to doc/manual/source/installation/installing-binary.md
diff --git a/doc/manual/src/installation/installing-docker.md b/doc/manual/source/installation/installing-docker.md
similarity index 100%
rename from doc/manual/src/installation/installing-docker.md
rename to doc/manual/source/installation/installing-docker.md
diff --git a/doc/manual/src/installation/installing-source.md b/doc/manual/source/installation/installing-source.md
similarity index 100%
rename from doc/manual/src/installation/installing-source.md
rename to doc/manual/source/installation/installing-source.md
diff --git a/doc/manual/src/installation/multi-user.md b/doc/manual/source/installation/multi-user.md
similarity index 100%
rename from doc/manual/src/installation/multi-user.md
rename to doc/manual/source/installation/multi-user.md
diff --git a/doc/manual/src/installation/nix-security.md b/doc/manual/source/installation/nix-security.md
similarity index 100%
rename from doc/manual/src/installation/nix-security.md
rename to doc/manual/source/installation/nix-security.md
diff --git a/doc/manual/src/installation/obtaining-source.md b/doc/manual/source/installation/obtaining-source.md
similarity index 100%
rename from doc/manual/src/installation/obtaining-source.md
rename to doc/manual/source/installation/obtaining-source.md
diff --git a/doc/manual/src/installation/prerequisites-source.md b/doc/manual/source/installation/prerequisites-source.md
similarity index 100%
rename from doc/manual/src/installation/prerequisites-source.md
rename to doc/manual/source/installation/prerequisites-source.md
diff --git a/doc/manual/src/installation/single-user.md b/doc/manual/source/installation/single-user.md
similarity index 100%
rename from doc/manual/src/installation/single-user.md
rename to doc/manual/source/installation/single-user.md
diff --git a/doc/manual/src/installation/supported-platforms.md b/doc/manual/source/installation/supported-platforms.md
similarity index 100%
rename from doc/manual/src/installation/supported-platforms.md
rename to doc/manual/source/installation/supported-platforms.md
diff --git a/doc/manual/src/installation/uninstall.md b/doc/manual/source/installation/uninstall.md
similarity index 100%
rename from doc/manual/src/installation/uninstall.md
rename to doc/manual/source/installation/uninstall.md
diff --git a/doc/manual/src/installation/upgrading.md b/doc/manual/source/installation/upgrading.md
similarity index 100%
rename from doc/manual/src/installation/upgrading.md
rename to doc/manual/source/installation/upgrading.md
diff --git a/doc/manual/src/introduction.md b/doc/manual/source/introduction.md
similarity index 100%
rename from doc/manual/src/introduction.md
rename to doc/manual/source/introduction.md
diff --git a/doc/manual/src/language/advanced-attributes.md b/doc/manual/source/language/advanced-attributes.md
similarity index 100%
rename from doc/manual/src/language/advanced-attributes.md
rename to doc/manual/source/language/advanced-attributes.md
diff --git a/doc/manual/src/language/builtins-prefix.md b/doc/manual/source/language/builtins-prefix.md
similarity index 100%
rename from doc/manual/src/language/builtins-prefix.md
rename to doc/manual/source/language/builtins-prefix.md
diff --git a/doc/manual/src/language/builtins-suffix.md b/doc/manual/source/language/builtins-suffix.md
similarity index 100%
rename from doc/manual/src/language/builtins-suffix.md
rename to doc/manual/source/language/builtins-suffix.md
diff --git a/doc/manual/src/language/constructs.md b/doc/manual/source/language/constructs.md
similarity index 100%
rename from doc/manual/src/language/constructs.md
rename to doc/manual/source/language/constructs.md
diff --git a/doc/manual/src/language/constructs/lookup-path.md b/doc/manual/source/language/constructs/lookup-path.md
similarity index 100%
rename from doc/manual/src/language/constructs/lookup-path.md
rename to doc/manual/source/language/constructs/lookup-path.md
diff --git a/doc/manual/src/language/derivations.md b/doc/manual/source/language/derivations.md
similarity index 100%
rename from doc/manual/src/language/derivations.md
rename to doc/manual/source/language/derivations.md
diff --git a/doc/manual/src/language/identifiers.md b/doc/manual/source/language/identifiers.md
similarity index 100%
rename from doc/manual/src/language/identifiers.md
rename to doc/manual/source/language/identifiers.md
diff --git a/doc/manual/src/language/import-from-derivation.md b/doc/manual/source/language/import-from-derivation.md
similarity index 100%
rename from doc/manual/src/language/import-from-derivation.md
rename to doc/manual/source/language/import-from-derivation.md
diff --git a/doc/manual/src/language/index.md b/doc/manual/source/language/index.md
similarity index 100%
rename from doc/manual/src/language/index.md
rename to doc/manual/source/language/index.md
diff --git a/doc/manual/src/language/meson.build b/doc/manual/source/language/meson.build
similarity index 100%
rename from doc/manual/src/language/meson.build
rename to doc/manual/source/language/meson.build
diff --git a/doc/manual/src/language/operators.md b/doc/manual/source/language/operators.md
similarity index 100%
rename from doc/manual/src/language/operators.md
rename to doc/manual/source/language/operators.md
diff --git a/doc/manual/src/language/scope.md b/doc/manual/source/language/scope.md
similarity index 100%
rename from doc/manual/src/language/scope.md
rename to doc/manual/source/language/scope.md
diff --git a/doc/manual/src/language/string-context.md b/doc/manual/source/language/string-context.md
similarity index 100%
rename from doc/manual/src/language/string-context.md
rename to doc/manual/source/language/string-context.md
diff --git a/doc/manual/src/language/string-interpolation.md b/doc/manual/source/language/string-interpolation.md
similarity index 100%
rename from doc/manual/src/language/string-interpolation.md
rename to doc/manual/source/language/string-interpolation.md
diff --git a/doc/manual/src/language/string-literals.md b/doc/manual/source/language/string-literals.md
similarity index 100%
rename from doc/manual/src/language/string-literals.md
rename to doc/manual/source/language/string-literals.md
diff --git a/doc/manual/src/language/syntax.md b/doc/manual/source/language/syntax.md
similarity index 100%
rename from doc/manual/src/language/syntax.md
rename to doc/manual/source/language/syntax.md
diff --git a/doc/manual/src/language/types.md b/doc/manual/source/language/types.md
similarity index 100%
rename from doc/manual/src/language/types.md
rename to doc/manual/source/language/types.md
diff --git a/doc/manual/src/language/values.md b/doc/manual/source/language/values.md
similarity index 100%
rename from doc/manual/src/language/values.md
rename to doc/manual/source/language/values.md
diff --git a/doc/manual/src/language/variables.md b/doc/manual/source/language/variables.md
similarity index 100%
rename from doc/manual/src/language/variables.md
rename to doc/manual/source/language/variables.md
diff --git a/doc/manual/src/meson.build b/doc/manual/source/meson.build
similarity index 100%
rename from doc/manual/src/meson.build
rename to doc/manual/source/meson.build
diff --git a/doc/manual/src/package-management/binary-cache-substituter.md b/doc/manual/source/package-management/binary-cache-substituter.md
similarity index 100%
rename from doc/manual/src/package-management/binary-cache-substituter.md
rename to doc/manual/source/package-management/binary-cache-substituter.md
diff --git a/doc/manual/src/package-management/garbage-collection.md b/doc/manual/source/package-management/garbage-collection.md
similarity index 100%
rename from doc/manual/src/package-management/garbage-collection.md
rename to doc/manual/source/package-management/garbage-collection.md
diff --git a/doc/manual/src/package-management/garbage-collector-roots.md b/doc/manual/source/package-management/garbage-collector-roots.md
similarity index 100%
rename from doc/manual/src/package-management/garbage-collector-roots.md
rename to doc/manual/source/package-management/garbage-collector-roots.md
diff --git a/doc/manual/src/package-management/index.md b/doc/manual/source/package-management/index.md
similarity index 100%
rename from doc/manual/src/package-management/index.md
rename to doc/manual/source/package-management/index.md
diff --git a/doc/manual/src/package-management/profiles.md b/doc/manual/source/package-management/profiles.md
similarity index 100%
rename from doc/manual/src/package-management/profiles.md
rename to doc/manual/source/package-management/profiles.md
diff --git a/doc/manual/src/package-management/sharing-packages.md b/doc/manual/source/package-management/sharing-packages.md
similarity index 100%
rename from doc/manual/src/package-management/sharing-packages.md
rename to doc/manual/source/package-management/sharing-packages.md
diff --git a/doc/manual/src/package-management/ssh-substituter.md b/doc/manual/source/package-management/ssh-substituter.md
similarity index 100%
rename from doc/manual/src/package-management/ssh-substituter.md
rename to doc/manual/source/package-management/ssh-substituter.md
diff --git a/doc/manual/src/protocols/derivation-aterm.md b/doc/manual/source/protocols/derivation-aterm.md
similarity index 100%
rename from doc/manual/src/protocols/derivation-aterm.md
rename to doc/manual/source/protocols/derivation-aterm.md
diff --git a/doc/manual/src/protocols/index.md b/doc/manual/source/protocols/index.md
similarity index 100%
rename from doc/manual/src/protocols/index.md
rename to doc/manual/source/protocols/index.md
diff --git a/doc/manual/src/protocols/json/derivation.md b/doc/manual/source/protocols/json/derivation.md
similarity index 100%
rename from doc/manual/src/protocols/json/derivation.md
rename to doc/manual/source/protocols/json/derivation.md
diff --git a/doc/manual/src/protocols/json/index.md b/doc/manual/source/protocols/json/index.md
similarity index 100%
rename from doc/manual/src/protocols/json/index.md
rename to doc/manual/source/protocols/json/index.md
diff --git a/doc/manual/src/protocols/json/store-object-info.md b/doc/manual/source/protocols/json/store-object-info.md
similarity index 100%
rename from doc/manual/src/protocols/json/store-object-info.md
rename to doc/manual/source/protocols/json/store-object-info.md
diff --git a/doc/manual/src/protocols/nix-archive.md b/doc/manual/source/protocols/nix-archive.md
similarity index 100%
rename from doc/manual/src/protocols/nix-archive.md
rename to doc/manual/source/protocols/nix-archive.md
diff --git a/doc/manual/src/protocols/store-path.md b/doc/manual/source/protocols/store-path.md
similarity index 100%
rename from doc/manual/src/protocols/store-path.md
rename to doc/manual/source/protocols/store-path.md
diff --git a/doc/manual/src/protocols/tarball-fetcher.md b/doc/manual/source/protocols/tarball-fetcher.md
similarity index 100%
rename from doc/manual/src/protocols/tarball-fetcher.md
rename to doc/manual/source/protocols/tarball-fetcher.md
diff --git a/doc/manual/src/quick-start.md b/doc/manual/source/quick-start.md
similarity index 100%
rename from doc/manual/src/quick-start.md
rename to doc/manual/source/quick-start.md
diff --git a/doc/manual/src/release-notes/index.md b/doc/manual/source/release-notes/index.md
similarity index 100%
rename from doc/manual/src/release-notes/index.md
rename to doc/manual/source/release-notes/index.md
diff --git a/doc/manual/src/release-notes/meson.build b/doc/manual/source/release-notes/meson.build
similarity index 100%
rename from doc/manual/src/release-notes/meson.build
rename to doc/manual/source/release-notes/meson.build
diff --git a/doc/manual/src/release-notes/rl-0.10.1.md b/doc/manual/source/release-notes/rl-0.10.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.10.1.md
rename to doc/manual/source/release-notes/rl-0.10.1.md
diff --git a/doc/manual/src/release-notes/rl-0.10.md b/doc/manual/source/release-notes/rl-0.10.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.10.md
rename to doc/manual/source/release-notes/rl-0.10.md
diff --git a/doc/manual/src/release-notes/rl-0.11.md b/doc/manual/source/release-notes/rl-0.11.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.11.md
rename to doc/manual/source/release-notes/rl-0.11.md
diff --git a/doc/manual/src/release-notes/rl-0.12.md b/doc/manual/source/release-notes/rl-0.12.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.12.md
rename to doc/manual/source/release-notes/rl-0.12.md
diff --git a/doc/manual/src/release-notes/rl-0.13.md b/doc/manual/source/release-notes/rl-0.13.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.13.md
rename to doc/manual/source/release-notes/rl-0.13.md
diff --git a/doc/manual/src/release-notes/rl-0.14.md b/doc/manual/source/release-notes/rl-0.14.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.14.md
rename to doc/manual/source/release-notes/rl-0.14.md
diff --git a/doc/manual/src/release-notes/rl-0.15.md b/doc/manual/source/release-notes/rl-0.15.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.15.md
rename to doc/manual/source/release-notes/rl-0.15.md
diff --git a/doc/manual/src/release-notes/rl-0.16.md b/doc/manual/source/release-notes/rl-0.16.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.16.md
rename to doc/manual/source/release-notes/rl-0.16.md
diff --git a/doc/manual/src/release-notes/rl-0.5.md b/doc/manual/source/release-notes/rl-0.5.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.5.md
rename to doc/manual/source/release-notes/rl-0.5.md
diff --git a/doc/manual/src/release-notes/rl-0.6.md b/doc/manual/source/release-notes/rl-0.6.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.6.md
rename to doc/manual/source/release-notes/rl-0.6.md
diff --git a/doc/manual/src/release-notes/rl-0.7.md b/doc/manual/source/release-notes/rl-0.7.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.7.md
rename to doc/manual/source/release-notes/rl-0.7.md
diff --git a/doc/manual/src/release-notes/rl-0.8.1.md b/doc/manual/source/release-notes/rl-0.8.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.8.1.md
rename to doc/manual/source/release-notes/rl-0.8.1.md
diff --git a/doc/manual/src/release-notes/rl-0.8.md b/doc/manual/source/release-notes/rl-0.8.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.8.md
rename to doc/manual/source/release-notes/rl-0.8.md
diff --git a/doc/manual/src/release-notes/rl-0.9.1.md b/doc/manual/source/release-notes/rl-0.9.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.9.1.md
rename to doc/manual/source/release-notes/rl-0.9.1.md
diff --git a/doc/manual/src/release-notes/rl-0.9.2.md b/doc/manual/source/release-notes/rl-0.9.2.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.9.2.md
rename to doc/manual/source/release-notes/rl-0.9.2.md
diff --git a/doc/manual/src/release-notes/rl-0.9.md b/doc/manual/source/release-notes/rl-0.9.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-0.9.md
rename to doc/manual/source/release-notes/rl-0.9.md
diff --git a/doc/manual/src/release-notes/rl-1.0.md b/doc/manual/source/release-notes/rl-1.0.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.0.md
rename to doc/manual/source/release-notes/rl-1.0.md
diff --git a/doc/manual/src/release-notes/rl-1.1.md b/doc/manual/source/release-notes/rl-1.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.1.md
rename to doc/manual/source/release-notes/rl-1.1.md
diff --git a/doc/manual/src/release-notes/rl-1.10.md b/doc/manual/source/release-notes/rl-1.10.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.10.md
rename to doc/manual/source/release-notes/rl-1.10.md
diff --git a/doc/manual/src/release-notes/rl-1.11.10.md b/doc/manual/source/release-notes/rl-1.11.10.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.11.10.md
rename to doc/manual/source/release-notes/rl-1.11.10.md
diff --git a/doc/manual/src/release-notes/rl-1.11.md b/doc/manual/source/release-notes/rl-1.11.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.11.md
rename to doc/manual/source/release-notes/rl-1.11.md
diff --git a/doc/manual/src/release-notes/rl-1.2.md b/doc/manual/source/release-notes/rl-1.2.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.2.md
rename to doc/manual/source/release-notes/rl-1.2.md
diff --git a/doc/manual/src/release-notes/rl-1.3.md b/doc/manual/source/release-notes/rl-1.3.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.3.md
rename to doc/manual/source/release-notes/rl-1.3.md
diff --git a/doc/manual/src/release-notes/rl-1.4.md b/doc/manual/source/release-notes/rl-1.4.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.4.md
rename to doc/manual/source/release-notes/rl-1.4.md
diff --git a/doc/manual/src/release-notes/rl-1.5.1.md b/doc/manual/source/release-notes/rl-1.5.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.5.1.md
rename to doc/manual/source/release-notes/rl-1.5.1.md
diff --git a/doc/manual/src/release-notes/rl-1.5.2.md b/doc/manual/source/release-notes/rl-1.5.2.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.5.2.md
rename to doc/manual/source/release-notes/rl-1.5.2.md
diff --git a/doc/manual/src/release-notes/rl-1.5.md b/doc/manual/source/release-notes/rl-1.5.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.5.md
rename to doc/manual/source/release-notes/rl-1.5.md
diff --git a/doc/manual/src/release-notes/rl-1.6.1.md b/doc/manual/source/release-notes/rl-1.6.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.6.1.md
rename to doc/manual/source/release-notes/rl-1.6.1.md
diff --git a/doc/manual/src/release-notes/rl-1.6.md b/doc/manual/source/release-notes/rl-1.6.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.6.md
rename to doc/manual/source/release-notes/rl-1.6.md
diff --git a/doc/manual/src/release-notes/rl-1.7.md b/doc/manual/source/release-notes/rl-1.7.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.7.md
rename to doc/manual/source/release-notes/rl-1.7.md
diff --git a/doc/manual/src/release-notes/rl-1.8.md b/doc/manual/source/release-notes/rl-1.8.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.8.md
rename to doc/manual/source/release-notes/rl-1.8.md
diff --git a/doc/manual/src/release-notes/rl-1.9.md b/doc/manual/source/release-notes/rl-1.9.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-1.9.md
rename to doc/manual/source/release-notes/rl-1.9.md
diff --git a/doc/manual/src/release-notes/rl-2.0.md b/doc/manual/source/release-notes/rl-2.0.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.0.md
rename to doc/manual/source/release-notes/rl-2.0.md
diff --git a/doc/manual/src/release-notes/rl-2.1.md b/doc/manual/source/release-notes/rl-2.1.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.1.md
rename to doc/manual/source/release-notes/rl-2.1.md
diff --git a/doc/manual/src/release-notes/rl-2.10.md b/doc/manual/source/release-notes/rl-2.10.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.10.md
rename to doc/manual/source/release-notes/rl-2.10.md
diff --git a/doc/manual/src/release-notes/rl-2.11.md b/doc/manual/source/release-notes/rl-2.11.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.11.md
rename to doc/manual/source/release-notes/rl-2.11.md
diff --git a/doc/manual/src/release-notes/rl-2.12.md b/doc/manual/source/release-notes/rl-2.12.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.12.md
rename to doc/manual/source/release-notes/rl-2.12.md
diff --git a/doc/manual/src/release-notes/rl-2.13.md b/doc/manual/source/release-notes/rl-2.13.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.13.md
rename to doc/manual/source/release-notes/rl-2.13.md
diff --git a/doc/manual/src/release-notes/rl-2.14.md b/doc/manual/source/release-notes/rl-2.14.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.14.md
rename to doc/manual/source/release-notes/rl-2.14.md
diff --git a/doc/manual/src/release-notes/rl-2.15.md b/doc/manual/source/release-notes/rl-2.15.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.15.md
rename to doc/manual/source/release-notes/rl-2.15.md
diff --git a/doc/manual/src/release-notes/rl-2.16.md b/doc/manual/source/release-notes/rl-2.16.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.16.md
rename to doc/manual/source/release-notes/rl-2.16.md
diff --git a/doc/manual/src/release-notes/rl-2.17.md b/doc/manual/source/release-notes/rl-2.17.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.17.md
rename to doc/manual/source/release-notes/rl-2.17.md
diff --git a/doc/manual/src/release-notes/rl-2.18.md b/doc/manual/source/release-notes/rl-2.18.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.18.md
rename to doc/manual/source/release-notes/rl-2.18.md
diff --git a/doc/manual/src/release-notes/rl-2.19.md b/doc/manual/source/release-notes/rl-2.19.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.19.md
rename to doc/manual/source/release-notes/rl-2.19.md
diff --git a/doc/manual/src/release-notes/rl-2.2.md b/doc/manual/source/release-notes/rl-2.2.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.2.md
rename to doc/manual/source/release-notes/rl-2.2.md
diff --git a/doc/manual/src/release-notes/rl-2.20.md b/doc/manual/source/release-notes/rl-2.20.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.20.md
rename to doc/manual/source/release-notes/rl-2.20.md
diff --git a/doc/manual/src/release-notes/rl-2.21.md b/doc/manual/source/release-notes/rl-2.21.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.21.md
rename to doc/manual/source/release-notes/rl-2.21.md
diff --git a/doc/manual/src/release-notes/rl-2.22.md b/doc/manual/source/release-notes/rl-2.22.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.22.md
rename to doc/manual/source/release-notes/rl-2.22.md
diff --git a/doc/manual/src/release-notes/rl-2.23.md b/doc/manual/source/release-notes/rl-2.23.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.23.md
rename to doc/manual/source/release-notes/rl-2.23.md
diff --git a/doc/manual/src/release-notes/rl-2.24.md b/doc/manual/source/release-notes/rl-2.24.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.24.md
rename to doc/manual/source/release-notes/rl-2.24.md
diff --git a/doc/manual/src/release-notes/rl-2.3.md b/doc/manual/source/release-notes/rl-2.3.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.3.md
rename to doc/manual/source/release-notes/rl-2.3.md
diff --git a/doc/manual/src/release-notes/rl-2.4.md b/doc/manual/source/release-notes/rl-2.4.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.4.md
rename to doc/manual/source/release-notes/rl-2.4.md
diff --git a/doc/manual/src/release-notes/rl-2.5.md b/doc/manual/source/release-notes/rl-2.5.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.5.md
rename to doc/manual/source/release-notes/rl-2.5.md
diff --git a/doc/manual/src/release-notes/rl-2.6.md b/doc/manual/source/release-notes/rl-2.6.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.6.md
rename to doc/manual/source/release-notes/rl-2.6.md
diff --git a/doc/manual/src/release-notes/rl-2.7.md b/doc/manual/source/release-notes/rl-2.7.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.7.md
rename to doc/manual/source/release-notes/rl-2.7.md
diff --git a/doc/manual/src/release-notes/rl-2.8.md b/doc/manual/source/release-notes/rl-2.8.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.8.md
rename to doc/manual/source/release-notes/rl-2.8.md
diff --git a/doc/manual/src/release-notes/rl-2.9.md b/doc/manual/source/release-notes/rl-2.9.md
similarity index 100%
rename from doc/manual/src/release-notes/rl-2.9.md
rename to doc/manual/source/release-notes/rl-2.9.md
diff --git a/doc/manual/src/store/file-system-object.md b/doc/manual/source/store/file-system-object.md
similarity index 100%
rename from doc/manual/src/store/file-system-object.md
rename to doc/manual/source/store/file-system-object.md
diff --git a/doc/manual/src/store/file-system-object/content-address.md b/doc/manual/source/store/file-system-object/content-address.md
similarity index 100%
rename from doc/manual/src/store/file-system-object/content-address.md
rename to doc/manual/source/store/file-system-object/content-address.md
diff --git a/doc/manual/src/store/index.md b/doc/manual/source/store/index.md
similarity index 100%
rename from doc/manual/src/store/index.md
rename to doc/manual/source/store/index.md
diff --git a/doc/manual/src/store/meson.build b/doc/manual/source/store/meson.build
similarity index 100%
rename from doc/manual/src/store/meson.build
rename to doc/manual/source/store/meson.build
diff --git a/doc/manual/src/store/store-object.md b/doc/manual/source/store/store-object.md
similarity index 100%
rename from doc/manual/src/store/store-object.md
rename to doc/manual/source/store/store-object.md
diff --git a/doc/manual/src/store/store-object/content-address.md b/doc/manual/source/store/store-object/content-address.md
similarity index 100%
rename from doc/manual/src/store/store-object/content-address.md
rename to doc/manual/source/store/store-object/content-address.md
diff --git a/doc/manual/src/store/store-path.md b/doc/manual/source/store/store-path.md
similarity index 100%
rename from doc/manual/src/store/store-path.md
rename to doc/manual/source/store/store-path.md
diff --git a/doc/manual/src/store/types/index.md.in b/doc/manual/source/store/types/index.md.in
similarity index 100%
rename from doc/manual/src/store/types/index.md.in
rename to doc/manual/source/store/types/index.md.in
diff --git a/doc/manual/substitute.py b/doc/manual/substitute.py
index 52cef4fa0a1..a8b11d93250 100644
--- a/doc/manual/substitute.py
+++ b/doc/manual/substitute.py
@@ -80,7 +80,7 @@ def main() -> None:
     if len(sys.argv) > 1 and sys.argv[1] == 'summary':
         print(do_include(
                         sys.stdin.read(),
-                        Path('src/SUMMARY.md'),
+                        Path('source/SUMMARY.md'),
                         Path(sys.argv[2]).resolve(),
                         search_path))
         return
@@ -92,7 +92,7 @@ def main() -> None:
 
     context, book = json.load(sys.stdin)
 
-    # book_root is the directory where book contents leave (ie, src/)
+    # book_root is the directory where book contents leave (ie, source/)
     book_root = Path(context['root']) / context['config']['book']['src']
 
     # Find @var@ in all parts of our recursive book structure.
diff --git a/maintainers/release-notes b/maintainers/release-notes
index c0c4ee734de..0cdcd517bda 100755
--- a/maintainers/release-notes
+++ b/maintainers/release-notes
@@ -78,7 +78,7 @@ if ! git diff --quiet --cached; then
   die "repo has staged changes, please commit or stash them"
 fi
 
-if ! grep "$SUMMARY_MARKER_LINE" doc/manual/src/SUMMARY.md.in >/dev/null; then
+if ! grep "$SUMMARY_MARKER_LINE" doc/manual/source/SUMMARY.md.in >/dev/null; then
   # would have been nice to catch this early, but won't be worth the extra infra
   die "SUMMARY.md.in is missing the marker line '$SUMMARY_MARKER_LINE', which would be used for inserting a new release notes page. Please fix the script."
 fi
@@ -117,7 +117,7 @@ log "version_full=$version_full"
 log "IS_PATCH=$IS_PATCH"
 
 basename=rl-${version_major_minor}.md
-file=doc/manual/src/release-notes/$basename
+file=doc/manual/source/release-notes/$basename
 
 if ! $IS_PATCH; then
   if [[ -e $file ]]; then
@@ -169,7 +169,7 @@ if ! $IS_PATCH; then
   # find the marker line, insert new link after it
   escaped_marker="$(echo "$SUMMARY_MARKER_LINE" | sed -e 's/\//\\\//g' -e 's/ /\\ /g')"
   escaped_line="$(echo "$NEW_SUMMARY_LINE" | sed -e 's/\//\\\//g' -e 's/ /\\ /g')"
-  logcmd sed -i -e "/$escaped_marker/a $escaped_line" doc/manual/src/SUMMARY.md.in
+  logcmd sed -i -e "/$escaped_marker/a $escaped_line" doc/manual/source/SUMMARY.md.in
 fi
 
 for f in doc/manual/rl-next/*.md; do
@@ -178,7 +178,7 @@ for f in doc/manual/rl-next/*.md; do
   fi
 done
 
-logcmd git add $file doc/manual/src/SUMMARY.md.in
+logcmd git add $file doc/manual/source/SUMMARY.md.in
 logcmd git status
 logcmd git commit -m "release notes: $version_full"
 
diff --git a/meson.build b/meson.build
index 636d38b08b4..97704d170ce 100644
--- a/meson.build
+++ b/meson.build
@@ -3,6 +3,7 @@
 
 project('nix-dev-shell', 'cpp',
   version : files('.version'),
+  subproject_dir : 'src',
   default_options : [
     'localstatedir=/nix/var',
   ]
diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
index e3e3a4c9bd4..ec7a771a200 100644
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@@ -3068,7 +3068,7 @@ bool LocalDerivationGoal::isReadDesc(int fd)
 StorePath LocalDerivationGoal::makeFallbackPath(OutputNameView outputName)
 {
     // This is a bogus path type, constructed this way to ensure that it doesn't collide with any other store path
-    // See doc/manual/src/protocols/store-path.md for details
+    // See doc/manual/source/protocols/store-path.md for details
     // TODO: We may want to separate the responsibilities of constructing the path fingerprint and of actually doing the hashing
     auto pathType = "rewrite:" + std::string(drvPath.to_string()) + ":name:" + std::string(outputName);
     return worker.store.makeStorePath(
@@ -3081,7 +3081,7 @@ StorePath LocalDerivationGoal::makeFallbackPath(OutputNameView outputName)
 StorePath LocalDerivationGoal::makeFallbackPath(const StorePath & path)
 {
     // This is a bogus path type, constructed this way to ensure that it doesn't collide with any other store path
-    // See doc/manual/src/protocols/store-path.md for details
+    // See doc/manual/source/protocols/store-path.md for details
     auto pathType = "rewrite:" + std::string(drvPath.to_string()) + ":" + std::string(path.to_string());
     return worker.store.makeStorePath(
         pathType,
diff --git a/src/nix/help-stores.md b/src/nix/help-stores.md
index 5c5624f5ecf..ff9d39c505b 120000
--- a/src/nix/help-stores.md
+++ b/src/nix/help-stores.md
@@ -1 +1 @@
-../../doc/manual/src/store/types/index.md.in
\ No newline at end of file
+../../doc/manual/source/store/types/index.md.in
\ No newline at end of file
diff --git a/src/nix/package.nix b/src/nix/package.nix
index 3e19c6dca87..ee640ab5421 100644
--- a/src/nix/package.nix
+++ b/src/nix/package.nix
@@ -66,9 +66,9 @@ mkMesonDerivation (finalAttrs: {
     ../nix-env/buildenv.nix
     ./get-env.sh
     ./help-stores.md
-    ../../doc/manual/src/store/types/index.md.in
+    ../../doc/manual/source/store/types/index.md.in
     ./profiles.md
-    ../../doc/manual/src/command-ref/files/profiles.md
+    ../../doc/manual/source/command-ref/files/profiles.md
 
     # Files
   ] ++ lib.concatMap
diff --git a/src/nix/profiles.md b/src/nix/profiles.md
index c67a86194c0..f65e7106594 120000
--- a/src/nix/profiles.md
+++ b/src/nix/profiles.md
@@ -1 +1 @@
-../../doc/manual/src/command-ref/files/profiles.md
\ No newline at end of file
+../../doc/manual/source/command-ref/files/profiles.md
\ No newline at end of file
diff --git a/subprojects b/subprojects
deleted file mode 120000
index e8310385c56..00000000000
--- a/subprojects
+++ /dev/null
@@ -1 +0,0 @@
-src
\ No newline at end of file
diff --git a/tests/functional/check.sh b/tests/functional/check.sh
index 9b15dccb626..23e3d2ff08b 100755
--- a/tests/functional/check.sh
+++ b/tests/functional/check.sh
@@ -23,7 +23,7 @@ nix-build dependencies.nix --no-out-link
 nix-build dependencies.nix --no-out-link --check
 
 # Build failure exit codes (100, 104, etc.) are from
-# doc/manual/src/command-ref/status-build-failure.md
+# doc/manual/source/command-ref/status-build-failure.md
 
 # check for dangling temporary build directories
 # only retain if build fails and --keep-failed is specified, or...
diff --git a/tests/functional/common/functions.sh b/tests/functional/common/functions.sh
index d05fac4e7f8..7195149cbfc 100644
--- a/tests/functional/common/functions.sh
+++ b/tests/functional/common/functions.sh
@@ -28,7 +28,7 @@ clearProfiles() {
 
 # Clear the store, but do not fail if we're in an environment where we can't.
 # This allows the test to run in a NixOS test environment, where we use the system store.
-# See doc/manual/src/contributing/testing.md / Running functional tests on NixOS.
+# See doc/manual/source/contributing/testing.md / Running functional tests on NixOS.
 clearStoreIfPossible() {
     if isTestOnNixOS; then
         echo "clearStoreIfPossible: Not clearing store, because we're on NixOS. Moving on."
diff --git a/tests/functional/linux-sandbox.sh b/tests/functional/linux-sandbox.sh
index 653a3873ffa..1fc89f8ae60 100755
--- a/tests/functional/linux-sandbox.sh
+++ b/tests/functional/linux-sandbox.sh
@@ -40,13 +40,13 @@ nix-sandbox-build dependencies.nix --check
 # Test that sandboxed builds with --check and -K can move .check directory to store
 nix-sandbox-build check.nix -A nondeterministic
 
-# `100 + 4` means non-determinstic, see doc/manual/src/command-ref/status-build-failure.md
+# `100 + 4` means non-determinstic, see doc/manual/source/command-ref/status-build-failure.md
 expectStderr 104 nix-sandbox-build check.nix -A nondeterministic --check -K > $TEST_ROOT/log
 grepQuietInverse 'error: renaming' $TEST_ROOT/log
 grepQuiet 'may not be deterministic' $TEST_ROOT/log
 
 # Test that sandboxed builds cannot write to /etc easily
-# `100` means build failure without extra info, see doc/manual/src/command-ref/status-build-failure.md
+# `100` means build failure without extra info, see doc/manual/source/command-ref/status-build-failure.md
 expectStderr 100 nix-sandbox-build -E 'with import ./config.nix; mkDerivation { name = "etc-write"; buildCommand = "echo > /etc/test"; }' |
     grepQuiet "/etc/test: Permission denied"
 
@@ -56,7 +56,7 @@ testCert () {
     expectation=$1 # "missing" | "present"
     mode=$2        # "normal" | "fixed-output"
     certFile=$3    # a string that can be the path to a cert file
-    # `100` means build failure without extra info, see doc/manual/src/command-ref/status-build-failure.md
+    # `100` means build failure without extra info, see doc/manual/source/command-ref/status-build-failure.md
     [ "$mode" == fixed-output ] && ret=1 || ret=100
     expectStderr $ret nix-sandbox-build linux-sandbox-cert-test.nix --argstr mode "$mode" --option ssl-cert-file "$certFile" |
         grepQuiet "CERT_${expectation}_IN_SANDBOX"