Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMartins Abele <martins.abele@zabbix.com>2020-03-10 14:34:07 +0300
committerMartins Abele <martins.abele@zabbix.com>2020-03-10 14:34:07 +0300
commitc8b6250cc6fbee9ace45d4beb3bb2497c8881deb (patch)
tree72c5458414f48a5fb03c11337e5dc59a8c4f57d6 /conf
parent7aeb20156503e2c08718194bdff7c0382a79b4f6 (diff)
.......PS. [ZBXNEXT-2753] fixed inconsistency in configuration file comment
Diffstat (limited to 'conf')
-rw-r--r--conf/zabbix_proxy.conf2
-rw-r--r--conf/zabbix_server.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf
index 22f9ec966ca..e3f431fd2c2 100644
--- a/conf/zabbix_proxy.conf
+++ b/conf/zabbix_proxy.conf
@@ -743,7 +743,7 @@ StatsAllowedIP=127.0.0.1
# verify_ca - connect using TLS and verify certificate
# verify_full - connect using TLS, verify certificate and verify that database identity specified by DBHost
# matches its certificate
-# On MySQL starting with 5.7.11 and PostgreSQL following values are supported: "required", "verify_ca" and
+# On MySQL starting from 5.7.11 and PostgreSQL following values are supported: "required", "verify_ca" and
# "verify_full".
# On MariaDB starting from version 10.2.6 "required" and "verify_full" values are supported.
# Default is not to set any option and behavior depends on database configuration
diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf
index 165134da56f..b8de9f0fe01 100644
--- a/conf/zabbix_server.conf
+++ b/conf/zabbix_server.conf
@@ -727,7 +727,7 @@ StatsAllowedIP=127.0.0.1
# verify_ca - connect using TLS and verify certificate
# verify_full - connect using TLS, verify certificate and verify that database identity specified by DBHost
# matches its certificate
-# On MySQL starting with 5.7.11 and PostgreSQL following values are supported: "required", "verify_ca" and
+# On MySQL starting from 5.7.11 and PostgreSQL following values are supported: "required", "verify_ca" and
# "verify_full".
# On MariaDB starting from version 10.2.6 "required" and "verify_full" values are supported.
# Default is not to set any option and behavior depends on database configuration