diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-19 00:01:36 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-19 00:01:36 +0000 |
commit | dc802b2e196f95ce42daa7591e475bba34047331 (patch) | |
tree | e490c9bceea445e1eff80d7e883b5621e2c29bec /nixos/doc/manual | |
parent | e15af378fb53182b63f645c34e4f01cc5879912c (diff) | |
parent | d5bd34ebf2c2c2b380b76cb86bc68522bc6af4d7 (diff) | |
download | nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.gz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.bz2 nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.lz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.xz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.zst nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 2 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 |
2 files changed, 2 insertions, 2 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 3c4708cd412..b5d99a15e02 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 @@ -7,7 +7,7 @@ <itemizedlist spacing="compact"> <listitem> <para> - Support is planned until the end of April 2022, handing over to + Support is planned until the end of June 2022, handing over to 22.05. </para> </listitem> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 08ecabec122..9a0e5eda128 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -2,7 +2,7 @@ In addition to numerous new and upgraded packages, this release has the following highlights: -- Support is planned until the end of April 2022, handing over to 22.05. +- Support is planned until the end of June 2022, handing over to 22.05. ## Highlights {#sec-release-21.11-highlights} |