aboutsummaryrefslogtreecommitdiff
path: root/doc/manual
diff options
context:
space:
mode:
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/local.mk4
-rw-r--r--doc/manual/rl-next/config2
-rw-r--r--doc/manual/rl-next/dup-attr-errors.md2
-rw-r--r--doc/manual/rl-next/nixversion-fake.md2
-rw-r--r--doc/manual/rl-next/short-expr-flag.md2
-rw-r--r--doc/manual/rl-next/upstart-removal.md2
-rw-r--r--doc/manual/src/contributing/hacking.md3
7 files changed, 6 insertions, 11 deletions
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index b9e7b8398..b33a4f777 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -151,9 +151,9 @@ $(d)/language.json: $(doc_nix)
# Generate "Upcoming release" notes (or clear it and remove from menu)
$(d)/src/release-notes/rl-next.md: $(d)/rl-next $(d)/rl-next/*
- @if type -p changelog-d > /dev/null; then \
+ @if type -p build-release-notes > /dev/null; then \
echo " GEN " $@; \
- changelog-d doc/manual/rl-next > $@; \
+ build-release-notes doc/manual/rl-next > $@; \
else \
echo " NULL " $@; \
true > $@; \
diff --git a/doc/manual/rl-next/config b/doc/manual/rl-next/config
deleted file mode 100644
index b3c2e868f..000000000
--- a/doc/manual/rl-next/config
+++ /dev/null
@@ -1,2 +0,0 @@
-organization: NixOS
-repository: nix
diff --git a/doc/manual/rl-next/dup-attr-errors.md b/doc/manual/rl-next/dup-attr-errors.md
index 127c8ceb1..cce3d9f30 100644
--- a/doc/manual/rl-next/dup-attr-errors.md
+++ b/doc/manual/rl-next/dup-attr-errors.md
@@ -1,6 +1,6 @@
---
synopsis: Duplicate attribute reports are more accurate
-# prs: cl 557
+cls: 557
---
Duplicate attribute errors are now more accurate, showing the path at which an error was detected rather than the full, possibly longer, path that caused the error.
diff --git a/doc/manual/rl-next/nixversion-fake.md b/doc/manual/rl-next/nixversion-fake.md
index 1a97e412c..6e42b2bd2 100644
--- a/doc/manual/rl-next/nixversion-fake.md
+++ b/doc/manual/rl-next/nixversion-fake.md
@@ -1,6 +1,6 @@
---
synopsis: "`builtins.nixVersion` now returns a fixed value \"2.18.3-lix\""
-# prs: cl 558
+cls: 558
---
`builtins.nixVersion` now returns a fixed value `"2.18.3-lix"`. This prevents
diff --git a/doc/manual/rl-next/short-expr-flag.md b/doc/manual/rl-next/short-expr-flag.md
index a02c944bd..5fddd3a25 100644
--- a/doc/manual/rl-next/short-expr-flag.md
+++ b/doc/manual/rl-next/short-expr-flag.md
@@ -1,6 +1,6 @@
---
synopsis: reintroduce shortened `-E` form for `--expr` to new CLI
-# prs: cl 605
+cls: 605
---
In the past, it was possible to supply a shorter `-E` flag instead of fully
diff --git a/doc/manual/rl-next/upstart-removal.md b/doc/manual/rl-next/upstart-removal.md
index faec2264a..b1b7ad176 100644
--- a/doc/manual/rl-next/upstart-removal.md
+++ b/doc/manual/rl-next/upstart-removal.md
@@ -1,6 +1,6 @@
---
synopsis: Upstart scripts removed
-# prs: cl 574
+cls: 574
---
Upstart scripts have been removed from Lix, since Upstart is obsolete and has
diff --git a/doc/manual/src/contributing/hacking.md b/doc/manual/src/contributing/hacking.md
index 3693361bb..133a61b5c 100644
--- a/doc/manual/src/contributing/hacking.md
+++ b/doc/manual/src/contributing/hacking.md
@@ -340,9 +340,6 @@ Significant changes should add the following header, which moves them to the top
significance: significant
```
-<!-- Keep an eye on https://codeberg.org/fgaz/changelog-d/issues/1 -->
-See also the [format documentation](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#changelog).
-
### Build process
Releases have a precomputed `rl-MAJOR.MINOR.md`, and no `rl-next.md`.