You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/12/20 21:08:30 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1183 Delete empty
"queue-attributes.html" doc page
Repository: activemq-artemis
Updated Branches:
refs/heads/master 7e97dbd2e -> 6822bad0c
ARTEMIS-1183 Delete empty "queue-attributes.html" doc page
This is a follow-up to ARTEMIS-780 Added section on latest address model
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9d685b6f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9d685b6f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9d685b6f
Branch: refs/heads/master
Commit: 9d685b6f2d6b880120f0b75100d351933b395df0
Parents: 7e97dbd
Author: Jiri Danek <jd...@redhat.com>
Authored: Tue Dec 19 13:50:47 2017 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Dec 20 16:08:23 2017 -0500
----------------------------------------------------------------------
docs/user-manual/en/SUMMARY.md | 1 -
docs/user-manual/en/clusters.md | 4 ++--
docs/user-manual/en/flow-control.md | 2 +-
docs/user-manual/en/queue-attributes.md | 2 --
4 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9d685b6f/docs/user-manual/en/SUMMARY.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index ba488f3..e92a033 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -31,7 +31,6 @@
* [Message Expiry](message-expiry.md)
* [Large Messages](large-messages.md)
* [Paging](paging.md)
-* [Queue Attributes](queue-attributes.md)
* [Scheduled Messages](scheduled-messages.md)
* [Last-Value Queues](last-value-queues.md)
* [Message Grouping](message-grouping.md)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9d685b6f/docs/user-manual/en/clusters.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/clusters.md b/docs/user-manual/en/clusters.md
index 3ae7cf5..dd08046 100644
--- a/docs/user-manual/en/clusters.md
+++ b/docs/user-manual/en/clusters.md
@@ -802,8 +802,8 @@ after the last consumer on a queue is closed before redistributing. By
default message redistribution is disabled.
Message redistribution can be configured on a per address basis, by
-specifying the redistribution delay in the address settings, for more
-information on configuring address settings, please see [Queue Attributes](queue-attributes.md).
+specifying the redistribution delay in the address settings. For more
+information on configuring address settings, please see [Configuring Addresses and Queues via Address Settings](address-model.md#configuring-addresses-and-queues-via-address-settings).
Here's an address settings snippet from `broker.xml`
showing how message redistribution is enabled for a set of queues:
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9d685b6f/docs/user-manual/en/flow-control.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/flow-control.md b/docs/user-manual/en/flow-control.md
index 3c3da6f..7ee2927 100644
--- a/docs/user-manual/en/flow-control.md
+++ b/docs/user-manual/en/flow-control.md
@@ -170,7 +170,7 @@ but instead pages messages to storage.
To configure an address with a maximum size and tell the server that you
want to block producers for this address if it becomes full, you need to
-define an AddressSettings ([Configuring Queues Via Address Settings](queue-attributes.md)) block for the address and specify
+define an AddressSettings ([Configuring Queues Via Address Settings](address-model.md#configuring-addresses-and-queues-via-address-setting)) block for the address and specify
`max-size-bytes` and `address-full-policy`
The address block applies to all queues registered to that address. I.e.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9d685b6f/docs/user-manual/en/queue-attributes.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/queue-attributes.md b/docs/user-manual/en/queue-attributes.md
deleted file mode 100644
index 156b9ba..0000000
--- a/docs/user-manual/en/queue-attributes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Address and Queue Attributes and Settings
-
[2/2] activemq-artemis git commit: This closes #1727
Posted by cl...@apache.org.
This closes #1727
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6822bad0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6822bad0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6822bad0
Branch: refs/heads/master
Commit: 6822bad0cca0e085a6b7b456fd772e9b3fefe548
Parents: 7e97dbd 9d685b6
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Dec 20 16:08:24 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Dec 20 16:08:24 2017 -0500
----------------------------------------------------------------------
docs/user-manual/en/SUMMARY.md | 1 -
docs/user-manual/en/clusters.md | 4 ++--
docs/user-manual/en/flow-control.md | 2 +-
docs/user-manual/en/queue-attributes.md | 2 --
4 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------