diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-10-16 17:07:27 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-10-16 17:21:24 +0200 |
| commit | 8cbdd9d0c290e294a9d783c8868e738db05c9ce2 (patch) | |
| tree | 324cf42913f03b7d9d484ebc9f39443079ad99c8 | |
| parent | 634a098940396830f0f9cb6b38e6ac5f1e2f376e (diff) | |
| download | nixpkgs-8cbdd9d0c290e294a9d783c8868e738db05c9ce2.tar nixpkgs-8cbdd9d0c290e294a9d783c8868e738db05c9ce2.tar.gz nixpkgs-8cbdd9d0c290e294a9d783c8868e738db05c9ce2.tar.bz2 nixpkgs-8cbdd9d0c290e294a9d783c8868e738db05c9ce2.tar.lz nixpkgs-8cbdd9d0c290e294a9d783c8868e738db05c9ce2.tar.xz nixpkgs-8cbdd9d0c290e294a9d783c8868e738db05c9ce2.tar.zst nixpkgs-8cbdd9d0c290e294a9d783c8868e738db05c9ce2.zip | |
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.
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1609.xml | 8 | ||||
| -rw-r--r-- | 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 18b9a333e23..ade7d5581ce 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 21cea77f876..efff8b895a1 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> |