DOC: remove last occurrences of "HA-Proxy" syntax · haproxy/haproxy@58000fe · GitHub
Skip to content

Commit 58000fe

Browse files
committed
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.
1 parent a5357cd commit 58000fe

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

‎doc/internals/filters.txt‎

Lines changed: 1 addition & 1 deletion

‎doc/intro.txt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,26 +1498,32 @@ branch, you need to proceed this way :
14981498
generally sufficient to type "haproxy -v". A development version will
14991499
appear like this, with the "dev" word after the branch number :
15001500

1501-
HA-Proxy version 1.6-dev3-385ecc-68 2015/08/18
1501+
HAProxy version 2.4-dev18-a5357c-137 2021/05/09 - https://haproxy.org/
15021502

15031503
A stable version will appear like this, as well as unmodified stable
15041504
versions provided by operating system vendors :
15051505

1506-
HA-Proxy version 1.5.14 2015/07/02
1506+
HAProxy version 1.5.14 2015/07/02
15071507

15081508
And a nightly snapshot of a stable version will appear like this with an
15091509
hexadecimal sequence after the version, and with the date of the snapshot
15101510
instead of the date of the release :
15111511

1512-
HA-Proxy version 1.5.14-e4766ba 2015/07/29
1512+
HAProxy version 1.5.14-e4766ba 2015/07/29
15131513

15141514
Any other format may indicate a system-specific package with its own
15151515
patch set. For example HAProxy Enterprise versions will appear with the
15161516
following format (<branch>-<latest commit>-<revision>) :
15171517

1518-
HA-Proxy version 1.5.0-994126-357 2015/07/02
1518+
HAProxy version 1.5.0-994126-357 2015/07/02
15191519

1520-
In addition, versions 2.1 and above will include a "Status" line indicating
1520+
Please note that historically versions prior to 2.4 used to report the
1521+
process name with a hyphen between "HA" and "Proxy", including those above
1522+
which were adjusted to show the correct format only, so better ignore this
1523+
word or use a relaxed match in scripts. Additionally, modern versions add
1524+
a URL linking to the project's home.
1525+
1526+
Finally, versions 2.1 and above will include a "Status" line indicating
15211527
whether the version is safe for production or not, and if so, till when, as
15221528
well as a link to the list of known bugs affecting this version.
15231529

‎doc/management.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ the versions of the libraries being used are reported there. It is also what
358358
you will systematically be asked for when posting a bug report :
359359

360360
$ haproxy -vv
361-
HA-Proxy version 1.6-dev7-a088d3-4 2015/10/08
361+
HAProxy version 1.6-dev7-a088d3-4 2015/10/08
362362
Copyright 2000-2015 Willy Tarreau <willy@haproxy.org>
363363

364364
Build options :

‎examples/haproxy.init‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)