Merge branch 'current' into next

This commit is contained in:
Fabian Affolter 2017-04-06 09:29:33 +02:00
commit bdc3a02fb5
No known key found for this signature in database
GPG key ID: E23CD2DD36A4397F
25 changed files with 197 additions and 63 deletions

View file

@ -55,7 +55,7 @@ If you don't want HTTPS, you can change `<VirtualHost *:443>` to `<VirtualHost *
<p class='note'>
In case you are getting occasional HTTP 504 error messages ("Gateway Timeout") when accessing the Web UI through your proxy, try adding disablereuse=on to both ProxyPass directives:
</p>
```text
<VirtualHost *:443>
[...]
@ -65,7 +65,6 @@ In case you are getting occasional HTTP 504 error messages ("Gateway Timeout") w
[...]
</VirtualHost>
```
</p>
#### {% linkable_title Multiple Instance %}