Merge branch 'LnL7:master' into masterHEADmaster

7 files changed, 57 insertions, 5 deletions

diff --git a/doc/known-files/24797ac05542ff8b52910efc77870faa5f9e3275097227ea4e50c430a5f72916 b/doc/known-files/24797ac05542ff8b52910efc77870faa5f9e3275097227ea4e50c430a5f72916
new file mode 100644
index 0000000..26c5f90
--- /dev/null
+++ b/doc/known-files/24797ac05542ff8b52910efc77870faa5f9e3275097227ea4e50c430a5f72916
@@ -0,0 +1,10 @@
+# Generated by https://install.lix.systems/.
+# See `/nix/nix-installer --version` for the version details.
+
+build-users-group = nixbld
+experimental-features = nix-command flakes
+bash-prompt-prefix = (nix:$name)\040
+max-jobs = auto
+substituters = https://cache.nixos.org https://cache.lix.systems
+trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=
+extra-nix-path = nixpkgs=flake:nixpkgs
diff --git a/doc/known-files/966d22ef5bb9b56d481e8e0d5f7ca2deaf4d24c0f0fc969b2eeaa7ae0aa42907 b/doc/known-files/966d22ef5bb9b56d481e8e0d5f7ca2deaf4d24c0f0fc969b2eeaa7ae0aa42907
new file mode 100644
index 0000000..6e56b5a
--- /dev/null
+++ b/doc/known-files/966d22ef5bb9b56d481e8e0d5f7ca2deaf4d24c0f0fc969b2eeaa7ae0aa42907
@@ -0,0 +1,12 @@
+# Generated by https://github.com/DeterminateSystems/nix-installer.
+# See `/nix/nix-installer --version` for the version details.
+
+build-users-group = nixbld
+experimental-features = nix-command flakes
+always-allow-substitutes = true
+extra-trusted-substituters = https://cache.flakehub.com
+extra-trusted-public-keys = cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM= cache.flakehub.com-4:Asi8qIv291s0aYLyH6IOnr5Kf6+OF14WVjkE6t3xMio= cache.flakehub.com-5:zB96CRlL7tiPtzA9/WKyPkp3A2vqxqgdgyTVNGShPDU= cache.flakehub.com-6:W4EGFwAGgBj3he7c5fNh9NkOXw0PUVaxygCVKeuvaqU= cache.flakehub.com-7:mvxJ2DZVHn/kRxlIaxYNMuDG1OvMckZu32um1TadOR8= cache.flakehub.com-8:moO+OVS0mnTjBTcOUh2kYLQEd59ExzyoW1QgQ8XAARQ= cache.flakehub.com-9:wChaSeTI6TeCuV/Sg2513ZIM9i0qJaYsF+lZCXg0J6o= cache.flakehub.com-10:2GqeNlIp6AKp4EF2MVbE1kBOp9iBSyo0UPR9KoR0o1Y=
+bash-prompt-prefix = (nix:$name)\040
+max-jobs = auto
+extra-nix-path = nixpkgs=flake:nixpkgs
+upgrade-nix-store-path-url = https://install.determinate.systems/nix-upgrade/stable/universal
diff --git a/doc/known-files/b027b5cad320b5b8123d9d0db9f815c3f3921596c26dc3c471457098e4d3cc40 b/doc/known-files/b027b5cad320b5b8123d9d0db9f815c3f3921596c26dc3c471457098e4d3cc40
new file mode 100644
index 0000000..10039ff
--- /dev/null
+++ b/doc/known-files/b027b5cad320b5b8123d9d0db9f815c3f3921596c26dc3c471457098e4d3cc40
@@ -0,0 +1,9 @@
+# Generated by https://install.lix.systems/.
+# See `/nix/nix-installer --version` for the version details.
+
+build-users-group = nixbld
+experimental-features = nix-command
+bash-prompt-prefix = (nix:$name)\040
+max-jobs = auto
+substituters = https://cache.nixos.org https://cache.lix.systems
+trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=
diff --git a/doc/known-files/e4974acb79c56148cb8e92137fa4f2de9b7356e897b332fc4e6769e8c0b83e18 b/doc/known-files/e4974acb79c56148cb8e92137fa4f2de9b7356e897b332fc4e6769e8c0b83e18
new file mode 100644
index 0000000..236c1db
--- /dev/null
+++ b/doc/known-files/e4974acb79c56148cb8e92137fa4f2de9b7356e897b332fc4e6769e8c0b83e18
@@ -0,0 +1,10 @@
+# Generated by https://github.com/DeterminateSystems/nix-installer.
+# See `/nix/nix-installer --version` for the version details.
+
+build-users-group = nixbld
+experimental-features = nix-command flakes
+always-allow-substitutes = true
+bash-prompt-prefix = (nix:$name)\040
+max-jobs = auto
+extra-nix-path = nixpkgs=flake:nixpkgs
+upgrade-nix-store-path-url = https://install.determinate.systems/nix-upgrade/stable/universal
diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index abe126b..d8e12f2 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -79,11 +79,17 @@ in rec {
           '@DARWIN_OPTIONS_JSON@' \
           ${optionsJSON}/share/doc/darwin/options.json
 
+      # Pass --redirects option if nixos-render-docs supports it
+      if nixos-render-docs manual html --help | grep --silent -E '^\s+--redirects\s'; then
+        redirects_opt="--redirects ${./redirects.json}"
+      fi
+
       # TODO: --manpage-urls?
       nixos-render-docs -j $NIX_BUILD_CORES manual html \
         --manpage-urls ${pkgs.writeText "manpage-urls.json" "{}"} \
         --revision ${lib.escapeShellArg revision} \
         --generator "nixos-render-docs ${lib.version}" \
+        $redirects_opt \
         --stylesheet style.css \
         --stylesheet highlightjs/mono-blue.css \
         --script ./highlightjs/highlight.pack.js \
@@ -118,18 +124,18 @@ in rec {
 
       # TODO: get these parameterized in upstream nixos-render-docs
       sed -i -e '
-        /^\.TH / s|NixOS|Darwin|g
+        /^\.TH / s|NixOS|nix-darwin|g
 
         /^\.SH "NAME"$/ {
           N
-          s|NixOS|Darwin|g
+          s|NixOS|nix-darwin|g
         }
 
         /^\.SH "DESCRIPTION"$/ {
           N; N
           s|/etc/nixos/configuration|configuration|g
-          s|NixOS|Darwin|g
-          s|nixos|darwin|g
+          s|NixOS|nix-darwin|g
+          s|nixos|nix-darwin|g
         }
 
         /\.SH "AUTHORS"$/ {
diff --git a/doc/manual/manual.md b/doc/manual/manual.md
index 131df7d..bacba03 100644
--- a/doc/manual/manual.md
+++ b/doc/manual/manual.md
@@ -1,4 +1,4 @@
-# Darwin Configuration Options {#book-darwin-manual}
+# nix-darwin Configuration Options {#book-darwin-manual}
 ## Version @DARWIN_VERSION@
 
 ```{=include=} options
diff --git a/doc/manual/redirects.json b/doc/manual/redirects.json
new file mode 100644
index 0000000..46e6796
--- /dev/null
+++ b/doc/manual/redirects.json
@@ -0,0 +1,5 @@
+{
+  "book-darwin-manual": [
+    "index.html#book-darwin-manual"
+  ]
+}