Merge branch 'master' into trunk

This commit is contained in:
root
2019-05-31 16:19:47 +03:00
19 changed files with 19 additions and 19 deletions

View File

@ -191,7 +191,7 @@ Default values of these variables are specified after equal sign.
The allowed variables are identical of parameters in official ``zabbix_proxy.conf``. For example, ``ZBX_LOGSLOWQUERIES`` = ``LogSlowQueries``.
Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix.com/documentation/3.0/manual/appendix/config/zabbix_proxy) to get more information about the variables.
Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_proxy) to get more information about the variables.
## Allowed volumes for the Zabbix proxy container

View File

@ -191,7 +191,7 @@ Default values of these variables are specified after equal sign.
The allowed variables are identical of parameters in official ``zabbix_proxy.conf``. For example, ``ZBX_LOGSLOWQUERIES`` = ``LogSlowQueries``.
Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix.com/documentation/3.0/manual/appendix/config/zabbix_proxy) to get more information about the variables.
Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_proxy) to get more information about the variables.
## Allowed volumes for the Zabbix proxy container

View File

@ -191,7 +191,7 @@ Default values of these variables are specified after equal sign.
The allowed variables are identical of parameters in official ``zabbix_proxy.conf``. For example, ``ZBX_LOGSLOWQUERIES`` = ``LogSlowQueries``.
Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix.com/documentation/3.0/manual/appendix/config/zabbix_proxy) to get more information about the variables.
Please use official documentation for [``zabbix_proxy.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_proxy) to get more information about the variables.
## Allowed volumes for the Zabbix proxy container