summaryrefslogtreecommitdiffstats
path: root/nixos/doc
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-07 12:01:18 +0000
committerGitHub <noreply@github.com>2021-11-07 12:01:18 +0000
commite0cac44f901b211d112bc16ccc406ab67f306857 (patch)
tree49e2ba201bc791ec46683640a325872b20ab31f0 /nixos/doc
parent1093ddf273a4ee21add29b1f4c7d6149ee680568 (diff)
parentd631a73345354da581cf716e79c2e6ddd6d22456 (diff)
Merge master into staging-next
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml9
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
2 files changed, 11 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 555e09600db5..2488f150248c 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -1875,6 +1875,15 @@ Superuser created successfully.
directory.
</para>
</listitem>
+ <listitem>
+ <para>
+ Loki has had another release. Some default values have been
+ changed for the configuration and some configuration options
+ have been renamed. For more details, please check
+ <link xlink:href="https://grafana.com/docs/loki/latest/upgrading/#240">the
+ upgrade guide</link>.
+ </para>
+ </listitem>
</itemizedlist>
</section>
</section>
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 92a191ad5095..39663720eb6e 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -520,3 +520,5 @@ In addition to numerous new and upgraded packages, this release has the followin
- The unifi run directory can now be found under: `/run/unifi` instead of `/var/lib/unifi/run`.
- `security.pam.services.<name>.makeHomeDir` now uses `umask=0077` instead of `umask=0022` when creating the home directory.
+
+- Loki has had another release. Some default values have been changed for the configuration and some configuration options have been renamed. For more details, please check [the upgrade guide](https://grafana.com/docs/loki/latest/upgrading/#240).