Skip to content

Commit 5ab9060

Browse files
authored
Merge pull request #12365 from rabbitmq/mergify/bp/v3.13.x/pr-12363
Fix non-canonical and broken links (backport #12357) (backport #12363)
2 parents 851100c + e710f29 commit 5ab9060

23 files changed

+102
-105
lines changed

deps/rabbit/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ exports_files(glob([
2626
]) + ["INSTALL"])
2727

2828
_APP_ENV = """[
29-
%% See https://www.rabbitmq.com/consumers.html#acknowledgement-timeout
29+
%% See https://www.rabbitmq.com/docs/consumers#acknowledgement-timeout
3030
%% 30 minutes
3131
{consumer_timeout, 1800000},
3232
{tcp_listeners, [5672]},

deps/rabbit/INSTALL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Please see https://www.rabbitmq.com/download.html for installation
1+
Please see https://www.rabbitmq.com/docs/download for installation
22
guides.

deps/rabbit/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ define PROJECT_ENV
8585
%% see rabbitmq-server#248
8686
%% and rabbitmq-server#667
8787
{channel_operation_timeout, 15000},
88-
%% See https://www.rabbitmq.com/consumers.html#acknowledgement-timeout
88+
%% See https://www.rabbitmq.com/docs/consumers#acknowledgement-timeout
8989
%% 30 minutes
9090
{consumer_timeout, 1800000},
9191

@@ -295,6 +295,7 @@ web-manpages: $(WEB_MANPAGES) $(MD_MANPAGES)
295295
gsub(/class="D1"/, "class=\"D1 lang-bash\"", line); \
296296
gsub(/class="Bd Bd-indent"/, "class=\"Bd Bd-indent lang-bash\"", line); \
297297
gsub(/&#[xX]201[cCdD];/, "\\"", line); \
298+
gsub(/\.html/, "", line); \
298299
print line; \
299300
} } \
300301
' > "$@"

deps/rabbit/README.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# RabbitMQ Server
55

6-
[RabbitMQ](https://rabbitmq.com) is a [feature rich](https://rabbitmq.com/documentation.html), multi-protocol messaging broker. It supports:
6+
[RabbitMQ](https://www.rabbitmq.com) is a [feature rich](https://www.rabbitmq.com/docs), multi-protocol messaging broker. It supports:
77

88
* AMQP 0-9-1
99
* AMQP 1.0
@@ -13,38 +13,38 @@
1313

1414
## Installation
1515

16-
* [Installation guides](https://rabbitmq.com/download.html) for various platforms
17-
* [Kubernetes Cluster Operator](https://www.rabbitmq.com/kubernetes/operator/operator-overview.html)
18-
* [Changelog](https://www.rabbitmq.com/changelog.html)
16+
* [Installation guides](https://www.rabbitmq.com/docs/download) for various platforms
17+
* [Kubernetes Cluster Operator](https://www.rabbitmq.com/kubernetes/operator/operator-overview)
1918
* [Releases](https://github.com/rabbitmq/rabbitmq-server/releases) on GitHub
20-
* [Supported and unsupported series](https://www.rabbitmq.com/versions.html)
21-
* [Supported Erlang versions](https://www.rabbitmq.com/which-erlang.html)
19+
* [Supported and unsupported series](https://www.rabbitmq.com/release-information)
20+
* [Supported Erlang versions](https://www.rabbitmq.com/docs/which-erlang)
2221

2322

2423
## Tutorials & Documentation
2524

26-
* [RabbitMQ tutorials](https://rabbitmq.com/getstarted.html)
27-
* [All documentation guides](https://rabbitmq.com/documentation.html)
28-
* [CLI tools guide](https://rabbitmq.com/cli.html)
29-
* [Configuration guide](https://rabbitmq.com/configure.html)
30-
* [Client libraries and tools](https://rabbitmq.com/devtools.html)
31-
* [Monitoring guide](https://rabbitmq.com/monitoring.html)
32-
* [Production checklist](https://rabbitmq.com/production-checklist.html)
25+
* [RabbitMQ tutorials](https://www.rabbitmq.com/tutorials)
26+
* [All documentation guides](https://www.rabbitmq.com/docs)
27+
* [CLI tools guide](https://www.rabbitmq.com/docs/cli)
28+
* [Configuration guide](https://www.rabbitmq.com/docs/configure)
29+
* [Client libraries and tools](https://www.rabbitmq.com/client-libraries/devtools)
30+
* [Monitoring guide](https://www.rabbitmq.com/docs/monitoring)
31+
* [Production checklist](https://www.rabbitmq.com/docs/production-checklist)
3332
* [Runnable tutorials](https://github.com/rabbitmq/rabbitmq-tutorials/)
3433
* [Documentation source](https://github.com/rabbitmq/rabbitmq-website/)
3534

3635

3736
## Getting Help
3837

3938
* [RabbitMQ mailing list](https://groups.google.com/forum/#!forum/rabbitmq-users)
40-
* [Commercial support](https://rabbitmq.com/services.html) from [Pivotal](https://pivotal.io) for open source RabbitMQ
41-
* [Community Slack](https://rabbitmq-slack.herokuapp.com/)
39+
* [Commercial support](https://tanzu.vmware.com/rabbitmq/oss) from [Broadcom](https://tanzu.vmware.com) for open source RabbitMQ
40+
* [Community Discord](https://www.rabbitmq.com/discord)
41+
* [Community Slack](https://www.rabbitmq.com/slack)
4242
* `#rabbitmq` on Freenode
4343

4444

4545
## Contributing
4646

47-
See [CONTRIBUTING.md](./CONTRIBUTING.md) and our [development process overview](https://rabbitmq.com/github.html).
47+
See [CONTRIBUTING.md](./CONTRIBUTING.md) and our [development process overview](https://www.rabbitmq.com/github).
4848

4949
Questions about contributing, internals and so on are very welcome on the [mailing list](https://groups.google.com/forum/#!forum/rabbitmq-users).
5050

@@ -56,8 +56,8 @@ RabbitMQ server is [licensed under the MPL 2.0](LICENSE-MPL-RabbitMQ).
5656

5757
## Building From Source and Packaging
5858

59-
* [Building RabbitMQ from Source](https://rabbitmq.com/build-server.html)
60-
* [Building RabbitMQ Distribution Packages](https://rabbitmq.com/build-server.html)
59+
* [Building RabbitMQ from Source](https://www.rabbitmq.com/docs/build-server)
60+
* [Building RabbitMQ Distribution Packages](https://www.rabbitmq.com/docs/build-server)
6161

6262

6363
## Copyright

deps/rabbit/SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Supported Versions
44

5-
See [RabbitMQ Release Series](https://www.rabbitmq.com/versions.html) for a list of currently supported
5+
See [RabbitMQ Release Series](https://www.rabbitmq.com/release-information) for a list of currently supported
66
versions.
77

88
Vulnerabilities reported for versions out of support will not be investigated.

deps/rabbit/docs/README-for-packages

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,24 @@ This is rabbitmq-server, a message broker implementing AMQP 0-9-1, AMQP 1.0,
22
STOMP and MQTT.
33

44
Most of the documentation for RabbitMQ is provided on the RabbitMQ web
5-
site. You can see documentation for the current version at
5+
site. You can see documentation for the current and previous versions at
66

7-
https://www.rabbitmq.com/documentation.html
8-
9-
and for previous versions at
10-
11-
https://www.rabbitmq.com/previous.html
7+
https://www.rabbitmq.com/docs
128

139
Man pages are installed with this package. Of particular interest are
1410
rabbitmqctl(8), rabbitmq-diagnostics(8), rabbitmq-queues(8).
1511
They interact with a running node. rabbitmq-plugins(8) is used to manage plugins.
1612
All of these should be run as the superuser. Learn more about
1713
CLI tools at
1814

19-
https://www.rabbitmq.com/cli.html
15+
https://www.rabbitmq.com/docs/cli
2016

2117
An example configuration file is provided in the same directory as
2218
this README. Copy it to /etc/rabbitmq/rabbitmq.conf to use it. The
2319
RabbitMQ server must be restarted after changing the configuration
2420
file. Learn more about configuration at
2521

26-
https://www.rabbitmq.com/configure.html
22+
https://www.rabbitmq.com/docs/configure
2723

2824
An example policy file for HA queues is provided in the same directory
2925
as this README. Copy and chmod +x it to

deps/rabbit/docs/advanced.config.example

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
%% ----------------------------------------------------------------------------
55
%% Advanced Erlang Networking/Clustering Options.
66
%%
7-
%% See https://www.rabbitmq.com/clustering.html for details
7+
%% See https://www.rabbitmq.com/docs/clustering for details
88
%% ----------------------------------------------------------------------------
99
%% Sets the net_kernel tick time.
1010
%% Please see http://erlang.org/doc/man/kernel_app.html and
11-
%% https://www.rabbitmq.com/nettick.html for further details.
11+
%% https://www.rabbitmq.com/docs/nettick for further details.
1212
%%
1313
%% {kernel, [{net_ticktime, 60}]},
1414
%% ----------------------------------------------------------------------------
1515
%% RabbitMQ Shovel Plugin
1616
%%
17-
%% See https://www.rabbitmq.com/shovel.html for details
17+
%% See https://www.rabbitmq.com/docs/shovel for details
1818
%% ----------------------------------------------------------------------------
1919

2020
{rabbitmq_shovel,
@@ -87,7 +87,7 @@
8787

8888
%% The LDAP plugin can perform a variety of queries against your
8989
%% LDAP server to determine questions of authorisation. See
90-
%% https://www.rabbitmq.com/ldap.html#authorisation for more
90+
%% https://www.rabbitmq.com/docs/ldap#authorisation for more
9191
%% information.
9292

9393
%% Set the query to use when determining vhost access

deps/rabbit/docs/rabbitmq-diagnostics.8

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
is a command line tool that provides commands used for diagnostics, monitoring
3030
and health checks of RabbitMQ nodes.
3131
See the
32-
.Lk https://rabbitmq.com/documentation.html "RabbitMQ documentation guides"
32+
.Lk https://www.rabbitmq.com/docs "RabbitMQ documentation guides"
3333
to learn more about RabbitMQ diagnostics, monitoring and health checks.
3434

3535
.Nm
@@ -40,7 +40,7 @@ health checks are available to be used interactively and by monitoring tools.
4040
By default if it is not possible to connect to and authenticate with the target node
4141
(for example if it is stopped), the operation will fail.
4242
To learn more, see the
43-
.Lk https://rabbitmq.com/monitoring.html "RabbitMQ Monitoring guide"
43+
.Lk https://www.rabbitmq.com/docs/monitoring "RabbitMQ Monitoring guide"
4444
.
4545
.\" ------------------------------------------------------------------
4646
.Sh OPTIONS
@@ -81,14 +81,14 @@ Default is
8181
.It Fl l , Fl -longnames
8282
Must be specified when the cluster is configured to use long (FQDN) node names.
8383
To learn more, see the
84-
.Lk https://rabbitmq.com/clustering.html "RabbitMQ Clustering guide"
84+
.Lk https://www.rabbitmq.com/docs/clustering "RabbitMQ Clustering guide"
8585
.It Fl -erlang-cookie Ar cookie
8686
Shared secret to use to authenticate to the target node.
8787
Prefer using a local file or the
8888
.Ev RABBITMQ_ERLANG_COOKIE
8989
environment variable instead of specifying this option on the command line.
9090
To learn more, see the
91-
.Lk https://rabbitmq.com/cli.html "RabbitMQ CLI Tools guide"
91+
.Lk https://www.rabbitmq.com/docs/cli "RabbitMQ CLI Tools guide"
9292
.El
9393
.\" ------------------------------------------------------------------
9494
.Sh COMMANDS
@@ -215,7 +215,7 @@ in
215215
Lists resource alarms, if any, in the cluster.
216216
.Pp
217217
See
218-
.Lk https://rabbitmq.com/alarms.html "RabbitMQ Resource Alarms guide"
218+
.Lk https://www.rabbitmq.com/docs/alarms "RabbitMQ Resource Alarms guide"
219219
to learn more.
220220
.Pp
221221
Example:
@@ -236,7 +236,7 @@ Health check that fails (returns with a non-zero code) if there are alarms
236236
in effect on any of the cluster nodes.
237237
.Pp
238238
See
239-
.Lk https://rabbitmq.com/alarms.html "RabbitMQ Resource Alarms guide"
239+
.Lk https://www.rabbitmq.com/docs/alarms "RabbitMQ Resource Alarms guide"
240240
to learn more.
241241
.Pp
242242
Example:
@@ -268,7 +268,7 @@ Health check that fails (returns with a non-zero code) if there are alarms
268268
in effect on the target node.
269269
.Pp
270270
See
271-
.Lk https://rabbitmq.com/alarms.html "RabbitMQ Resource Alarms guide"
271+
.Lk https://www.rabbitmq.com/docs/alarms "RabbitMQ Resource Alarms guide"
272272
to learn more.
273273
.Pp
274274
Example:
@@ -285,7 +285,7 @@ The check only validates if a new TCP connection is accepted. It does not
285285
perform messaging protocol handshake or authenticate.
286286
.Pp
287287
See
288-
.Lk https://rabbitmq.com/networking.html "RabbitMQ Networking guide"
288+
.Lk https://www.rabbitmq.com/docs/networking "RabbitMQ Networking guide"
289289
to learn more.
290290
.Pp
291291
Example:
@@ -299,7 +299,7 @@ is not listening on the specified port (there is no listener that
299299
uses that port).
300300
.Pp
301301
See
302-
.Lk https://rabbitmq.com/networking.html "RabbitMQ Networking guide"
302+
.Lk https://www.rabbitmq.com/docs/networking "RabbitMQ Networking guide"
303303
to learn more.
304304
.Pp
305305
Example:
@@ -312,7 +312,7 @@ Health check that fails (returns with a non-zero code) if the target node
312312
does not have a listener for the specified protocol.
313313
.Pp
314314
See
315-
.Lk https://rabbitmq.com/networking.html "RabbitMQ Networking guide"
315+
.Lk https://www.rabbitmq.com/docs/networking "RabbitMQ Networking guide"
316316
to learn more.
317317
.Pp
318318
Example:
@@ -369,7 +369,7 @@ Example:
369369
Runs a peer discovery on the target node and prints the discovered nodes, if any.
370370
.Pp
371371
See
372-
.Lk https://rabbitmq.com/cluster-formation.html "RabbitMQ Cluster Formation guide"
372+
.Lk https://www.rabbitmq.com/docs/cluster-formation "RabbitMQ Cluster Formation guide"
373373
to learn more.
374374
.Pp
375375
Example:
@@ -389,7 +389,7 @@ to authenticate CLI tools and peers. The value can be compared with the hash
389389
found in error messages of CLI tools.
390390
.Pp
391391
See
392-
.Lk https://rabbitmq.com/clustering.html#erlang-cookie "RabbitMQ Clustering guide"
392+
.Lk https://www.rabbitmq.com/docs/clustering#erlang-cookie "RabbitMQ Clustering guide"
393393
to learn more.
394394
.Pp
395395
Example:
@@ -492,7 +492,7 @@ what protocols and ports the node is listening on for client, CLI tool
492492
and peer connections.
493493
.Pp
494494
See
495-
.Lk https://rabbitmq.com/networking.html "RabbitMQ Networking guide"
495+
.Lk https://www.rabbitmq.com/docs/networking "RabbitMQ Networking guide"
496496
to learn more.
497497
.Pp
498498
Example:
@@ -544,7 +544,7 @@ terabytes
544544
.El
545545
.Pp
546546
See
547-
.Lk https://rabbitmq.com/memory-use.html "RabbitMQ Memory Use guide"
547+
.Lk https://www.rabbitmq.com/docs/memory-use "RabbitMQ Memory Use guide"
548548
to learn more.
549549
.Pp
550550
Example:
@@ -615,7 +615,7 @@ Note that RabbitMQ can be configured to only accept a subset of those
615615
versions, for example, SSLv3 is deactivated by default.
616616
.Pp
617617
See
618-
.Lk https://rabbitmq.com/ssl.html "RabbitMQ TLS guide"
618+
.Lk https://www.rabbitmq.com/docs/ssl "RabbitMQ TLS guide"
619619
to learn more.
620620
.Pp
621621
Example:

deps/rabbit/docs/rabbitmq-plugins.8

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
.Nm
2929
is a command line tool for managing RabbitMQ plugins.
3030
See the
31-
.Lk https://www.rabbitmq.com/plugins.html "RabbitMQ Plugins guide"
31+
.Lk https://www.rabbitmq.com/docs/plugins "RabbitMQ Plugins guide"
3232
for an overview of RabbitMQ plugins and how they are used.
3333

3434
.Nm
@@ -65,7 +65,7 @@ can be specified to make
6565
resolve and update plugin state directly (without contacting the node).
6666
Such changes will only have an effect on next node start.
6767
To learn more, see the
68-
.Lk https://www.rabbitmq.com/plugins.html "RabbitMQ Plugins guide"
68+
.Lk https://www.rabbitmq.com/docs/plugins "RabbitMQ Plugins guide"
6969
.
7070
.\" ------------------------------------------------------------------
7171
.Sh OPTIONS
@@ -106,14 +106,14 @@ Default is
106106
.It Fl l , Fl -longnames
107107
Must be specified when the cluster is configured to use long (FQDN) node names.
108108
To learn more, see the
109-
.Lk https://www.rabbitmq.com/clustering.html "RabbitMQ Clustering guide"
109+
.Lk https://www.rabbitmq.com/docs/clustering "RabbitMQ Clustering guide"
110110
.It Fl -erlang-cookie Ar cookie
111111
Shared secret to use to authenticate to the target node.
112112
Prefer using a local file or the
113113
.Ev RABBITMQ_ERLANG_COOKIE
114114
environment variable instead of specifying this option on the command line.
115115
To learn more, see the
116-
.Lk https://www.rabbitmq.com/cli.html "RabbitMQ CLI Tools guide"
116+
.Lk https://www.rabbitmq.com/docs/cli "RabbitMQ CLI Tools guide"
117117
.El
118118
.\" ------------------------------------------------------------------
119119
.Sh COMMANDS

deps/rabbit/docs/rabbitmq-queues.8

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
is a command line tool that provides commands used to manage queues,
3030
for example, grow, shrink or rebalance replicas of replicated queue types.
3131
See the
32-
.Lk https://www.rabbitmq.com/quorum-queues.html "RabbitMQ quorum queues guide"
32+
.Lk https://www.rabbitmq.com/docs/quorum-queues "RabbitMQ quorum queues guide"
3333
and the general
34-
.Lk https://www.rabbitmq.com/queues.html "RabbitMQ queues guide"
34+
.Lk https://www.rabbitmq.com/docs/queues "RabbitMQ queues guide"
3535
to learn more about queue types in RabbitMQ.
3636
.
3737
.\" ------------------------------------------------------------------
@@ -73,14 +73,14 @@ Default is
7373
.It Fl l , Fl -longnames
7474
Must be specified when the cluster is configured to use long (FQDN) node names.
7575
To learn more, see the
76-
.Lk https://www.rabbitmq.com/clustering.html "RabbitMQ Clustering guide"
76+
.Lk https://www.rabbitmq.com/docs/clustering "RabbitMQ Clustering guide"
7777
.It Fl -erlang-cookie Ar cookie
7878
Shared secret to use to authenticate to the target node.
7979
Prefer using a local file or the
8080
.Ev RABBITMQ_ERLANG_COOKIE
8181
environment variable instead of specifying this option on the command line.
8282
To learn more, see the
83-
.Lk https://www.rabbitmq.com/cli.html "RabbitMQ CLI Tools guide"
83+
.Lk https://www.rabbitmq.com/docs/cli "RabbitMQ CLI Tools guide"
8484
.El
8585
.\" ------------------------------------------------------------------
8686
.Sh COMMANDS

0 commit comments

Comments
 (0)