From 8cbdd9d0c290e294a9d783c8868e738db05c9ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 16 Oct 2016 17:07:27 +0200
Subject: [PATCH] nixos/release-notes: move "PHP config-file-scan-dir" from
16.09 to 17.03
Commits
351d12437 ("nixos/release-notes: PHP config-file-scan-dir /etc -> /etc/php.d")
41c8aa8d6 ("php: change config-file-scan-dir from /etc to /etc/php.d")
were merged to master _after_ NixOS 16.09. Commit 351d12437 then wrongly
updated the NixSO 16.09 release notes. Fix by moving the entry to NixOS
17.03.
---
nixos/doc/manual/release-notes/rl-1609.xml | 8 --------
nixos/doc/manual/release-notes/rl-1703.xml | 7 +++++++
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index 18b9a333e233..ade7d5581ced 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -164,14 +164,6 @@ following incompatible changes:</para>
PHP has been upgraded to 7.0
</para>
</listitem>
-
- <listitem>
- <para>PHP now scans for extra configuration .ini files in /etc/php.d
- instead of /etc. This prevents accidentally loading non-PHP .ini files
- that may be in /etc.
- </para>
- </listitem>
-
</itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 21cea77f8768..efff8b895a1a 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -61,6 +61,13 @@ following incompatible changes:</para>
<literal>strippedName</literal>.
</para>
</listitem>
+
+ <listitem>
+ <para>PHP now scans for extra configuration .ini files in /etc/php.d
+ instead of /etc. This prevents accidentally loading non-PHP .ini files
+ that may be in /etc.
+ </para>
+ </listitem>
</itemizedlist>