From 3e5e584c1f7589e3525101df32a04fb76b3fe77c Mon Sep 17 00:00:00 2001 From: Xiami Date: Tue, 26 Apr 2022 18:32:32 +0800 Subject: [PATCH] nixos/zookeeper: Update doc with suggested description --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 7 ++++--- nixos/doc/manual/release-notes/rl-2205.section.md | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 524d0d7945a5..e8155410ead3 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1311,9 +1311,10 @@ services.zookeeper has a new option jre for specifying the JRE to start - zookeeper with. It defaults to the JRE built with - pkgs.zookeeper instead of - pkgs.jre. + zookeeper with. It defaults to the JRE that + pkgs.zookeeper was wrapped with, instead of + pkgs.jre. This changes the JRE to + pkgs.jdk11_headless by default. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 4360f04afa46..5ce11ba2afe2 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -519,8 +519,8 @@ In addition to numerous new and upgraded packages, this release has the followin commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary. - `services.zookeeper` has a new option `jre` for specifying the JRE to start - zookeeper with. It defaults to the JRE built with `pkgs.zookeeper` instead of - `pkgs.jre`. + zookeeper with. It defaults to the JRE that `pkgs.zookeeper` was wrapped with, + instead of `pkgs.jre`. This changes the JRE to `pkgs.jdk11_headless` by default. - `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. `pgadmin3` has been removed.