summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2022-11-14 11:44:08 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2022-11-20 18:21:41 +0100
commit9d7e9c5965c72f516285fe52af14ceeefb315fdc (patch)
tree79320a788918a5683e4580592d329b4ab0ae952c /nixos/doc
parent2f1dfb0db379c1bf13785a5c7d94ad31bd0eb46b (diff)
downloadnixpkgs-9d7e9c5965c72f516285fe52af14ceeefb315fdc.tar
nixpkgs-9d7e9c5965c72f516285fe52af14ceeefb315fdc.tar.gz
nixpkgs-9d7e9c5965c72f516285fe52af14ceeefb315fdc.tar.bz2
nixpkgs-9d7e9c5965c72f516285fe52af14ceeefb315fdc.tar.lz
nixpkgs-9d7e9c5965c72f516285fe52af14ceeefb315fdc.tar.xz
nixpkgs-9d7e9c5965c72f516285fe52af14ceeefb315fdc.tar.zst
nixpkgs-9d7e9c5965c72f516285fe52af14ceeefb315fdc.zip
nixos/grafana: allow using both directories or single YAML files for non-Nix provisioning
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2211.section.xml2
-rw-r--r--nixos/doc/manual/release-notes/rl-2211.section.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index 4ee65193778..6044b70a200 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -1300,7 +1300,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [
                 <para>
                   Instead of declaring datasources and dashboards in
                   pure Nix, it’s also possible to specify configuration
-                  files with YAML instead using
+                  files (or directories) with YAML instead using
                   <xref linkend="opt-services.grafana.provision.datasources.path" />
                   (or
                   <xref linkend="opt-services.grafana.provision.dashboards.path" />.
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 969d62c7af1..2593b36912c 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -420,7 +420,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
       [](#opt-services.grafana.provision.dashboards.settings.apiVersion)).
 
     - Instead of declaring datasources and dashboards in pure Nix, it's also possible
-      to specify configuration files with YAML instead using
+      to specify configuration files (or directories) with YAML instead using
       [](#opt-services.grafana.provision.datasources.path) (or
       [](#opt-services.grafana.provision.dashboards.path). This is useful when having
       provisioning files from non-NixOS Grafana instances that you also want to