1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DOC: remove last occurrences of "HA-Proxy" syntax

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2021-05-09 06:25:16 +02:00
parent a5357cdfa5
commit 58000fe16d
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/internals/filters.txt
View File

@ -109,7 +109,7 @@ itself.
The list of available filters is reported by 'haproxy -vv' : The list of available filters is reported by 'haproxy -vv' :
$> 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> Copyright 2000-2016 Willy Tarreau <willy@haproxy.org>
[...] [...]

16
doc/intro.txt
View File

@ -1498,26 +1498,32 @@ branch, you need to proceed this way :
generally sufficient to type "haproxy -v". A development version will generally sufficient to type "haproxy -v". A development version will
appear like this, with the "dev" word after the branch number : 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 A stable version will appear like this, as well as unmodified stable
versions provided by operating system vendors : 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 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 hexadecimal sequence after the version, and with the date of the snapshot
instead of the date of the release : 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 Any other format may indicate a system-specific package with its own
patch set. For example HAProxy Enterprise versions will appear with the patch set. For example HAProxy Enterprise versions will appear with the
following format (<branch>-<latest commit>-<revision>) : 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
In addition, versions 2.1 and above will include a "Status" line indicating 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.
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 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. well as a link to the list of known bugs affecting this version.

2
doc/management.txt
View File

@ -358,7 +358,7 @@ the versions of the libraries being used are reported there. It is also what
you will systematically be asked for when posting a bug report : you will systematically be asked for when posting a bug report :
$ haproxy -vv $ 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> Copyright 2000-2015 Willy Tarreau <willy@haproxy.org>
Build options : Build options :

2
examples/haproxy.init
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# chkconfig: - 85 15 # 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. # for high availability environments.
# processname: haproxy # processname: haproxy
# config: /etc/haproxy/haproxy.cfg # config: /etc/haproxy/haproxy.cfg