summary refs log tree commit diff
path: root/nixos/doc/manual/release-notes/rl-2311.section.md
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-11-10 00:02:22 +0000
committerGitHub <noreply@github.com>2023-11-10 00:02:22 +0000
commit3f616fad02c82853a8e6e3cf8fd3aea95945f70e (patch)
tree13ae002b9f9ee17c56db234f89ae5585b505b16c /nixos/doc/manual/release-notes/rl-2311.section.md
parente112f9b8bbb5af9de4426046a7cb4490e2c12eb0 (diff)
parent2251d8ffde6ad42897b7c97c51e117a2c6ec7f23 (diff)
downloadnixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar
nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.gz
nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.bz2
nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.lz
nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.xz
nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.zst
nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual/release-notes/rl-2311.section.md')
-rw-r--r--nixos/doc/manual/release-notes/rl-2311.section.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index 8fa8fb5e594..e04c63029f9 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -316,7 +316,7 @@
 
 - Emacs macport version 29 was introduced.
 
-- The option `services.networking.networkmanager.enableFccUnlock` was removed in favor of `networking.networkmanager.fccUnlockScripts`, which allows specifying unlock scripts explicitly. The previous option simply did enable all unlock scripts bundled with ModemManager, which is risky, and didn't allow using vendor-provided unlock scripts at all.
+- The option `services.networking.networkmanager.enableFccUnlock` was removed in favor of `networking.networkmanager.fccUnlockScripts`, which allows specifying unlock scripts explicitly. The previous option enabled all unlock scripts bundled with ModemManager, which is risky, and didn't allow using vendor-provided unlock scripts at all.
 
 - The `html-proofer` package has been updated from major version 3 to major version 5, which includes [breaking changes](https://github.com/gjtorikian/html-proofer/blob/v5.0.8/UPGRADING.md).