summary refs log tree commit diff
path: root/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-02 12:02:08 +0000
committerGitHub <noreply@github.com>2021-11-02 12:02:08 +0000
commit36b42d42c916a202dfedbec1c1c29baf889c9bf9 (patch)
tree376c1c1ea90e763bd30d73641d2861caee7d425f /nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
parentde72551e2285aca512ef69b2d06b71d8cd6e42bd (diff)
parent20c2dc6c9323e7d005518f94acbf96e7113c01dd (diff)
downloadnixpkgs-36b42d42c916a202dfedbec1c1c29baf889c9bf9.tar
nixpkgs-36b42d42c916a202dfedbec1c1c29baf889c9bf9.tar.gz
nixpkgs-36b42d42c916a202dfedbec1c1c29baf889c9bf9.tar.bz2
nixpkgs-36b42d42c916a202dfedbec1c1c29baf889c9bf9.tar.lz
nixpkgs-36b42d42c916a202dfedbec1c1c29baf889c9bf9.tar.xz
nixpkgs-36b42d42c916a202dfedbec1c1c29baf889c9bf9.tar.zst
nixpkgs-36b42d42c916a202dfedbec1c1c29baf889c9bf9.zip
Merge staging-next into staging
Diffstat (limited to 'nixos/doc/manual/from_md/release-notes/rl-2111.section.xml')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml23
1 files changed, 23 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 33abf9df1f2..2ba82beda18 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
@@ -1723,6 +1723,29 @@ Superuser created successfully.
           better user experience and benefit from this change.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Dokuwiki now supports caddy! However
+        </para>
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>
+              the nginx option has been removed, in the new
+              configuration, please use the
+              <literal>dokuwiki.webserver = &quot;nginx&quot;</literal>
+              instead.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              The <quote>${hostname}</quote> option has been deprecated,
+              please use
+              <literal>dokuwiki.sites = [ &quot;${hostname}&quot; ]</literal>
+              instead
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
     </itemizedlist>
   </section>
 </section>