doc: fix references to php5, use new directory structure

diff --git a/doc/md/Server-configuration.md b/doc/md/Server-configuration.md
index bd293c37919e47a24dbec6a3bf1c92db595fdff7..bc6ac980ac0f160161611e2efd970dafc3ac0af2 100644 (file)
--- a/doc/md/Server-configuration.md
+++ b/doc/md/Server-configuration.md
@@ -187,7 +187,7 @@ http {
 ```
 
 ```ini
-# /etc/php5/fpm/php.ini
+# /etc/php/$php_version/fpm/php.ini
 
 [...]
 post_max_size = 10M

diff --git a/doc/md/Server-security.md b/doc/md/Server-security.md
index 700084e272d8ebfed88f9afc41f9104570570ca3..467ec80bf37a30545b0df242f637d4e2d5658162 100644 (file)
--- a/doc/md/Server-security.md
+++ b/doc/md/Server-security.md
@@ -1,10 +1,10 @@
 ## php.ini
 PHP settings are defined in:
 
-- a main configuration file, usually found under `/etc/php5/php.ini`; some distributions provide different configuration environments, e.g.
-    - `/etc/php5/php.ini` - used when running console scripts
-    - `/etc/php5/apache2/php.ini` - used when a client requests PHP resources from Apache
-    - `/etc/php5/php-fpm.conf` - used when PHP requests are proxied to PHP-FPM
+- a main configuration file, usually found under `/etc/php/$php_version/php.ini`; some distributions provide different configuration environments, e.g.
+    - `/etc/php/$php_version/php.ini` - used when running console scripts
+    - `/etc/php/$php_version/apache2/php.ini` - used when a client requests PHP resources from Apache
+    - `/etc/php/$php_version/php-fpm.conf` - used when PHP requests are proxied to PHP-FPM
 - additional configuration files/entries, depending on the installed/enabled extensions:
     - `/etc/php/conf.d/xdebug.ini`