aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/md
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2020-01-19 13:52:03 +0100
committernodiscc <nodiscc@gmail.com>2020-01-19 13:52:03 +0100
commit04a816f648edeaeb7d1545064b87b4b2135a43e8 (patch)
treeed23fc2c2f580f6a0966c70f7beb808908fcc837 /doc/md
parent3b04d19a6265b43d8593d53b682072643f12853a (diff)
downloadShaarli-04a816f648edeaeb7d1545064b87b4b2135a43e8.tar.gz
Shaarli-04a816f648edeaeb7d1545064b87b4b2135a43e8.tar.zst
Shaarli-04a816f648edeaeb7d1545064b87b4b2135a43e8.zip
doc: fix references to php5, use new directory structure
Diffstat (limited to 'doc/md')
-rw-r--r--doc/md/Server-configuration.md2
-rw-r--r--doc/md/Server-security.md8
2 files changed, 5 insertions, 5 deletions
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 {
187``` 187```
188 188
189```ini 189```ini
190# /etc/php5/fpm/php.ini 190# /etc/php/$php_version/fpm/php.ini
191 191
192[...] 192[...]
193post_max_size = 10M 193post_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 @@
1## php.ini 1## php.ini
2PHP settings are defined in: 2PHP settings are defined in:
3 3
4- a main configuration file, usually found under `/etc/php5/php.ini`; some distributions provide different configuration environments, e.g. 4- a main configuration file, usually found under `/etc/php/$php_version/php.ini`; some distributions provide different configuration environments, e.g.
5 - `/etc/php5/php.ini` - used when running console scripts 5 - `/etc/php/$php_version/php.ini` - used when running console scripts
6 - `/etc/php5/apache2/php.ini` - used when a client requests PHP resources from Apache 6 - `/etc/php/$php_version/apache2/php.ini` - used when a client requests PHP resources from Apache
7 - `/etc/php5/php-fpm.conf` - used when PHP requests are proxied to PHP-FPM 7 - `/etc/php/$php_version/php-fpm.conf` - used when PHP requests are proxied to PHP-FPM
8- additional configuration files/entries, depending on the installed/enabled extensions: 8- additional configuration files/entries, depending on the installed/enabled extensions:
9 - `/etc/php/conf.d/xdebug.ini` 9 - `/etc/php/conf.d/xdebug.ini`
10 10