summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-09-17 12:01:05 +0000
committerGitHub <noreply@github.com>2023-09-17 12:01:05 +0000
commit4851185192e69783fc8166180f11548b02973eea (patch)
tree8326ae27f6eab4c0ef57ce5fca6386d0551b4a89 /nixos/doc
parent40f4cfcb9de7e1137d538a025188d731337fe504 (diff)
parentb4dbea193aec9cf05e63b2a1cb3aa5b23477cb8d (diff)
downloadnixpkgs-4851185192e69783fc8166180f11548b02973eea.tar
nixpkgs-4851185192e69783fc8166180f11548b02973eea.tar.gz
nixpkgs-4851185192e69783fc8166180f11548b02973eea.tar.bz2
nixpkgs-4851185192e69783fc8166180f11548b02973eea.tar.lz
nixpkgs-4851185192e69783fc8166180f11548b02973eea.tar.xz
nixpkgs-4851185192e69783fc8166180f11548b02973eea.tar.zst
nixpkgs-4851185192e69783fc8166180f11548b02973eea.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/release-notes/rl-2311.section.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index b50ed3e0bb2..077e7c98f7b 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -22,6 +22,8 @@
 
 - [acme-dns](https://github.com/joohoi/acme-dns), a limited DNS server to handle ACME DNS challenges easily and securely. Available as [services.acme-dns](#opt-services.acme-dns.enable).
 
+- [frp](https://github.com/fatedier/frp), a fast reverse proxy to help you expose a local server behind a NAT or firewall to the Internet. Available as [services.frp](#opt-services.frp.enable).
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 - [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable).