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
diff options
context:
space:
mode:
authorVladimir Levijev <vladimir.levijev@zabbix.com>2019-02-28 17:18:41 +0300
committerVladimir Levijev <vladimir.levijev@zabbix.com>2019-02-28 17:18:41 +0300
commit8c50ca135450b43190995839b1a9c4ed2afd9acc (patch)
treeafdd074559e0996b4e4ddf62d729d39c130bed3d
parenteae576a99c4d27abd2732b6a6a1038c0482fb80e (diff)
.D........ [ZBX-10496] fix links to installation instructions in README file
[svn merge -c r90388 ^/branches/4.0] fixed version in links (4.0 -> 4.2)
-rw-r--r--ChangeLog2
-rw-r--r--README9
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c017aa3de26..258822e0e2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -168,6 +168,7 @@ New features:
..F....... [ZBXNEXT-4819] implemented date and time showing in SVG graph widget (miks)
Bug fixes:
+.D........ [ZBX-10496] fixed links to installation instructions in README file (dimir)
..F....... [ZBX-15625] removed links leading to media type edit form for non-superadmins in Reports->Notifications page (Ivo)
.......PS. [ZBX-15703] fixed case with 0 bytes received in socket (akozlovs)
..F....... [ZBX-15537] fixed visual bug when filter tab was overlapped by sub navigation (gcalenko)
@@ -2415,6 +2416,7 @@ Changes for 3.0.26rc1
New features:
Bug fixes:
+.D........ [ZBX-10496] fixed links to installation instructions in README file (dimir)
...G....S. [ZBX-15494] fixed handling numbers that written in scientific notation (asitals)
...G...... [ZBX-15316] fixed problem with socket inheritance preventing Windows agent from restarting under certain circumstances (kalimulin)
diff --git a/README b/README
index f4f3b778955..165e322bd67 100644
--- a/README
+++ b/README
@@ -21,5 +21,12 @@ versions of it that use the same license as the OpenSSL library), and
distribute the linked executables.
Please see http://www.zabbix.com/ for detailed information about Zabbix.
+
On-line Zabbix documentation is available at
-http://www.zabbix.com/documentation/4.0/manual/installation/install .
+http://www.zabbix.com/documentation/4.2/manual/ .
+
+Zabbix installation instructions can be found at
+http://www.zabbix.com/documentation/4.2/manual/installation/ .
+
+If you are installing Zabbix from packages the instructions can be found at
+http://www.zabbix.com/documentation/4.2/manual/installation/install_from_packages .