From: nodiscc <nodiscc@gmail.com>
Date: Sun, 19 Jan 2020 12:52:03 +0000 (+0100)
Subject: doc: fix references to php5, use new directory structure
X-Git-Tag: v0.12.0-beta~11^2~4
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=04a816f648edeaeb7d1545064b87b4b2135a43e8;hp=3b04d19a6265b43d8593d53b682072643f12853a;p=github%2Fshaarli%2FShaarli.git

doc: fix references to php5, use new directory structure
---

diff --git a/doc/md/Server-configuration.md b/doc/md/Server-configuration.md
index bd293c37..bc6ac980 100644
--- 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 700084e2..467ec80b 100644
--- 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`