This is a pretty lame commit in a attempt to use a common wording of
HAProxy used 1319 times compared to HA-Proxy used 10 times
---
doc/internals/filters.txt | 2 +-
doc/intro.txt | 8 ++++----
doc/management.txt | 2 +-
examples/haproxy.init | 2 +-
scripts/run-regtests.sh | 2 +-
src/haproxy.c | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/doc/internals/filters.txt b/doc/internals/filters.txt
index 5e9b58e56194..a72e908136b4 100644
--- a/doc/internals/filters.txt
+++ b/doc/internals/filters.txt
@@ -109,7 +109,7 @@ itself.
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 <[email protected]>
[...]
diff --git a/doc/intro.txt b/doc/intro.txt
index c8021405ba7c..3e650e5faf07 100644
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -1498,24 +1498,24 @@ branch, you need to proceed this way :
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 1.6-dev3-385ecc-68 2015/08/18
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
In addition, 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
diff --git a/doc/management.txt b/doc/management.txt
index 2600478fddbc..b4a610d46f12 100644
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -354,7 +354,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 :
$ 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 <[email protected]>
Build options :
diff --git a/examples/haproxy.init b/examples/haproxy.init
index f08fcb0dd95c..cc120d855dae 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
diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh
index 27bb13cbf75b..5e2cf0f23bf6 100755
--- a/scripts/run-regtests.sh
+++ b/scripts/run-regtests.sh
@@ -345,7 +345,7 @@ if [ $preparefailed ]; then
fi
{ read HAPROXY_VERSION; read TARGET; read FEATURES; read SERVICES; } << EOF
-$($HAPROXY_PROGRAM $HAPROXY_ARGS -vv | grep 'HA-Proxy
version\|TARGET.*=\|^Feature\|^Available services' | sed 's/.* [:=] //')
+$($HAPROXY_PROGRAM $HAPROXY_ARGS -vv | grep 'HAProxy
version\|TARGET.*=\|^Feature\|^Available services' | sed 's/.* [:=] //')
EOF
HAPROXY_VERSION=$(echo $HAPROXY_VERSION | cut -d " " -f 3)
diff --git a/src/haproxy.c b/src/haproxy.c
index e36e020c5ce7..92449a04f6e2 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1,5 +1,5 @@
/*
- * HA-Proxy : High Availability-enabled HTTP/TCP proxy
+ * HAProxy : High Availability-enabled HTTP/TCP proxy
* Copyright 2000-2021 Willy Tarreau <[email protected]>.
*
* This program is free software; you can redistribute it and/or
@@ -537,7 +537,7 @@ static void display_version()
{
struct utsname utsname;
- printf("HA-Proxy version %s %s - https://haproxy.org/\n";
+ printf("HAProxy version %s %s - https://haproxy.org/\n";
PRODUCT_STATUS "\n", haproxy_version, haproxy_date);
if (strlen(PRODUCT_URL_BUGS) > 0) {
