diff options
| author | Aleksandrs Saveljevs <git-no-reply@zabbix.com> | 2016-01-13 13:58:59 +0300 |
|---|---|---|
| committer | Aleksandrs Saveljevs <git-no-reply@zabbix.com> | 2016-01-13 13:58:59 +0300 |
| commit | 9c8521c9974945ade27afec29840bbf3ff7dca2a (patch) | |
| tree | dcf9c1a1bdbcbb4dc7e81ff05e3ab95d5a132ce1 /man | |
| parent | bfb9073ba5a8ef3da69ed2b19e7cccdc00b55e90 (diff) | |
| parent | 71fa6f65ed9c38ce36e50c5963b39e26e0d6469e (diff) | |
.......... [ZBXNEXT-611] updated to the latest trunk (resolved conflicts in src/zabbix_agent/zabbix_agentd.c)
Diffstat (limited to 'man')
| -rw-r--r-- | man/zabbix_get.man | 2 | ||||
| -rw-r--r-- | man/zabbix_sender.man | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/man/zabbix_get.man b/man/zabbix_get.man index f4b6a614de5..a748ed14b19 100644 --- a/man/zabbix_get.man +++ b/man/zabbix_get.man @@ -68,7 +68,7 @@ How to connect to agent. Values:\fR .RS 12 .TP 12 .B unencrypted -connect without encryption +connect without encryption (default) .RE .RS 12 .TP 12 diff --git a/man/zabbix_sender.man b/man/zabbix_sender.man index 6c15b6e540b..3e009479728 100644 --- a/man/zabbix_sender.man +++ b/man/zabbix_sender.man @@ -291,7 +291,8 @@ By default .B Zabbix sender does not read any configuration file. Absolute path should be specified. -Only parameters \fBHostname\fR, \fBServerActive\fR and \fBSourceIP\fR are supported. +Only parameters \fBHostname\fR, \fBServerActive\fR, \fBSourceIP\fR, \fBTLSConnect\fR, \fBTLSCAFile\fR, \fBTLSCRLFile\fR, +\fBTLSServerCertIssuer\fR, \fBTLSServerCertSubject\fR, \fBTLSCertFile\fR, \fBTLSKeyFile\fR, \fBTLSPSKIdentity\fR and \fBTLSPSKFile\fR are supported. First entry from the \fBServerActive\fR parameter is used. .IP "\fB\-z\fR, \fB\-\-zabbix\-server\fR \fIserver\fR" Hostname or IP address of Zabbix server. @@ -372,7 +373,7 @@ How to connect to server or proxy. Values:\fR .RS 12 .TP 12 .B unencrypted -connect without encryption +connect without encryption (default) .RE .RS 12 .TP 12 |