DOC: remove last occurrences of "HA-Proxy" syntax
There were only a few more used as output examples and comments in a few
docs, it was the right moment to get rid of them. The file intro.txt
which explains how to parse the version also got a hint about the possible
presence of a hyphen in the name in older versions.
diff --git a/doc/internals/filters.txt b/doc/internals/filters.txt
index da73acc..0bf6815 100644
--- a/doc/internals/filters.txt
+++ b/doc/internals/filters.txt
@@ -109,7 +109,7 @@
The list of available filters is reported by 'haproxy -vv' :
$> haproxy -vv
- HA-Proxy version 1.7-dev2-3a1d4a-33 2016/03/21
+ HAProxy version 1.7-dev2-3a1d4a-33 2016/03/21
Copyright 2000-2016 Willy Tarreau <willy@haproxy.org>
[...]
diff --git a/doc/intro.txt b/doc/intro.txt
index c802140..54e8ea1 100644
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -1498,26 +1498,32 @@
generally sufficient to type "haproxy -v". A development version will
appear like this, with the "dev" word after the branch number :
- HA-Proxy version 1.6-dev3-385ecc-68 2015/08/18
+ HAProxy version 2.4-dev18-a5357c-137 2021/05/09 - https://haproxy.org/
A stable version will appear like this, as well as unmodified stable
versions provided by operating system vendors :
- HA-Proxy version 1.5.14 2015/07/02
+ HAProxy version 1.5.14 2015/07/02
And a nightly snapshot of a stable version will appear like this with an
hexadecimal sequence after the version, and with the date of the snapshot
instead of the date of the release :
- HA-Proxy version 1.5.14-e4766ba 2015/07/29
+ HAProxy version 1.5.14-e4766ba 2015/07/29
Any other format may indicate a system-specific package with its own
patch set. For example HAProxy Enterprise versions will appear with the
following format (<branch>-<latest commit>-<revision>) :
- HA-Proxy version 1.5.0-994126-357 2015/07/02
+ HAProxy version 1.5.0-994126-357 2015/07/02
+
+ Please note that historically versions prior to 2.4 used to report the
+ process name with a hyphen between "HA" and "Proxy", including those above
+ which were adjusted to show the correct format only, so better ignore this
+ word or use a relaxed match in scripts. Additionally, modern versions add
+ a URL linking to the project's home.
- In addition, versions 2.1 and above will include a "Status" line indicating
+ Finally, versions 2.1 and above will include a "Status" line indicating
whether the version is safe for production or not, and if so, till when, as
well as a link to the list of known bugs affecting this version.
diff --git a/doc/management.txt b/doc/management.txt
index 75e872b..fd96272 100644
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -358,7 +358,7 @@
you will systematically be asked for when posting a bug report :
$ haproxy -vv
- HA-Proxy version 1.6-dev7-a088d3-4 2015/10/08
+ HAProxy version 1.6-dev7-a088d3-4 2015/10/08
Copyright 2000-2015 Willy Tarreau <willy@haproxy.org>
Build options :
diff --git a/examples/haproxy.init b/examples/haproxy.init
index f08fcb0..cc120d8 100644
--- a/examples/haproxy.init
+++ b/examples/haproxy.init
@@ -1,7 +1,7 @@
#!/bin/sh
#
# chkconfig: - 85 15
-# description: HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited \
+# description: HAProxy is a TCP/HTTP reverse proxy which is particularly suited \
# for high availability environments.
# processname: haproxy
# config: /etc/haproxy/haproxy.cfg