diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-31 06:01:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-31 06:01:26 +0000 |
| commit | 66bb8338fc1de14e3b9c765590fa6ef93cd399ef (patch) | |
| tree | bfe2bfeb9d5337681a9222df540cca5be4fbc400 /nixos | |
| parent | dd1ff149da07cd25a3e0152c67184e049256fcf1 (diff) | |
| parent | 70d8e51d872b179865cd50359d970af33ce37ddf (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/configuration/config-file.section.md | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/from_md/configuration/config-file.section.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/doc/manual/configuration/config-file.section.md b/nixos/doc/manual/configuration/config-file.section.md index efd231fd1f4e..b010026c5828 100644 --- a/nixos/doc/manual/configuration/config-file.section.md +++ b/nixos/doc/manual/configuration/config-file.section.md @@ -170,6 +170,6 @@ Packages ``` The latter option definition changes the default PostgreSQL package - used by NixOS's PostgreSQL service to 10.x. For more information on + used by NixOS's PostgreSQL service to 14.x. For more information on packages, including how to add new ones, see [](#sec-custom-packages). diff --git a/nixos/doc/manual/from_md/configuration/config-file.section.xml b/nixos/doc/manual/from_md/configuration/config-file.section.xml index f6c8f70cffc5..da5419cde4d3 100644 --- a/nixos/doc/manual/from_md/configuration/config-file.section.xml +++ b/nixos/doc/manual/from_md/configuration/config-file.section.xml @@ -221,7 +221,7 @@ services.postgresql.package = pkgs.postgresql_14; </programlisting> <para> The latter option definition changes the default PostgreSQL - package used by NixOS’s PostgreSQL service to 10.x. For more + package used by NixOS’s PostgreSQL service to 14.x. For more information on packages, including how to add new ones, see <xref linkend="sec-custom-packages" />. </para> |