diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-16 12:01:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 12:01:03 +0000 |
| commit | 9fe75f18c0b0fef185247e1bfc460437098a1c7e (patch) | |
| tree | 0de7d44d010255b51ce68b5e3bbe45dfc395e11d /nixos/doc | |
| parent | 1e9175815bff54995d71136a5b330196b987ea72 (diff) | |
| parent | 91367071919c3972cadaf71f6842b00f97cde989 (diff) | |
| download | nixpkgs-9fe75f18c0b0fef185247e1bfc460437098a1c7e.tar nixpkgs-9fe75f18c0b0fef185247e1bfc460437098a1c7e.tar.gz nixpkgs-9fe75f18c0b0fef185247e1bfc460437098a1c7e.tar.bz2 nixpkgs-9fe75f18c0b0fef185247e1bfc460437098a1c7e.tar.lz nixpkgs-9fe75f18c0b0fef185247e1bfc460437098a1c7e.tar.xz nixpkgs-9fe75f18c0b0fef185247e1bfc460437098a1c7e.tar.zst nixpkgs-9fe75f18c0b0fef185247e1bfc460437098a1c7e.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 16 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 4 |
2 files changed, 20 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 42d87c27bcc..dd58934c82e 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 @@ -560,6 +560,22 @@ <literal>claws-mail-gtk2</literal> package. </para> </listitem> + <listitem> + <para> + The wordpress module provides a new interface which allows to + use different webservers with the new option + <link xlink:href="options.html#opt-services.wordpress.webserver"><literal>services.wordpress.webserver</literal></link>. + Currently <literal>httpd</literal> and + <literal>nginx</literal> are supported. The definitions of + wordpress sites should now be set in + <link xlink:href="options.html#opt-services.wordpress.sites"><literal>services.wordpress.sites</literal></link>. + </para> + <para> + Sites definitions that use the old interface are automatically + migrated in the new option. This backward compatibility will + be removed in 22.05. + </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 f2a8dff7988..eae82856785 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -139,3 +139,7 @@ In addition to numerous new and upgraded packages, this release has the followin - `python3` now defaults to Python 3.9. Python 3.9 introduces many deprecation warnings, please look at the [What's New In Python 3.9 post](https://docs.python.org/3/whatsnew/3.9.html) for more information. - The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package. + +- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). + + Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05. |