about summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-03-01 00:02:47 +0000
committerGitHub <noreply@github.com>2024-03-01 00:02:47 +0000
commit18e39b9167efcfe5f10f5eb1031aab46008f95c4 (patch)
tree7cec3ad026590bd39b33b730279853dc2c95caa4 /nixos/doc/manual
parentbf641bb943be70474a95fca2789c796c4e7dae70 (diff)
parent937fd8cdd9f8fe300fe77639a095f829b422d776 (diff)
downloadnixlib-18e39b9167efcfe5f10f5eb1031aab46008f95c4.tar
nixlib-18e39b9167efcfe5f10f5eb1031aab46008f95c4.tar.gz
nixlib-18e39b9167efcfe5f10f5eb1031aab46008f95c4.tar.bz2
nixlib-18e39b9167efcfe5f10f5eb1031aab46008f95c4.tar.lz
nixlib-18e39b9167efcfe5f10f5eb1031aab46008f95c4.tar.xz
nixlib-18e39b9167efcfe5f10f5eb1031aab46008f95c4.tar.zst
nixlib-18e39b9167efcfe5f10f5eb1031aab46008f95c4.zip
Merge staging-next into staging
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/release-notes/rl-2405.section.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md
index 8fc7308f32e1..8b89143a199b 100644
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@@ -93,6 +93,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
 
 - [Clevis](https://github.com/latchset/clevis), a pluggable framework for automated decryption, used to unlock encrypted devices in initrd. Available as [boot.initrd.clevis.enable](#opt-boot.initrd.clevis.enable).
 
+- [armagetronad](https://wiki.armagetronad.org), a mid-2000s 3D lightcycle game widely played at iD Tech Camps. You can define multiple servers using `services.armagetronad.<server>.enable`.
+
 - [TuxClocker](https://github.com/Lurkki14/tuxclocker), a hardware control and monitoring program. Available as [programs.tuxclocker](#opt-programs.tuxclocker.enable).
 
 - [ALVR](https://github.com/alvr-org/alvr), a VR desktop streamer. Available as [programs.alvr](#opt-programs.alvr.enable)