This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new f5ef65f DISPATCH-840 Properly escape the token `${user}` in asciidoc
(#1357)
f5ef65f is described below
commit f5ef65f2587ba93e6dd50f1791c321f74dbe99b2
Author: Jiri Daněk <jda...@redhat.com>
AuthorDate: Fri Sep 3 12:46:11 2021 +0200
DISPATCH-840 Properly escape the token `${user}` in asciidoc (#1357)
---
console/react/test_data/schema.js | 8 ++++----
docs/man/qdstat.8.adoc | 8 ++++----
python/qpid_dispatch/management/qdrouter.json | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/console/react/test_data/schema.js
b/console/react/test_data/schema.js
index 7dcde01..0eafe99 100644
--- a/console/react/test_data/schema.js
+++ b/console/react/test_data/schema.js
@@ -435,7 +435,7 @@ export default {
sourcePattern: {
type: "string",
description:
- "A wildcarded pattern for matching source addresses from which
users in this group may receive messages. The pattern consists of one or more
tokens separated by a forward slash '/'. A token can be one of the following: a
* character, a # character, or a sequence of characters that do not include /,
*, or #. The * token matches any single token. The # token matches zero or
more tokens. * has higher precedence than #, and exact match has the highest
precedence. To specify mul [...]
+ "A wildcarded pattern for matching source addresses from which
users in this group may receive messages. The pattern consists of one or more
tokens separated by a forward slash '/'. A token can be one of the following: a
* character, a # character, or a sequence of characters that do not include /,
*, or #. The * token matches any single token. The # token matches zero or
more tokens. * has higher precedence than #, and exact match has the highest
precedence. To specify mul [...]
},
allowWaypointLinks: {
default: true,
@@ -463,12 +463,12 @@ export default {
targets: {
type: "string",
description:
- "A list of target addresses to which users in this group may send
messages. To specify multiple addresses, separate the addresses with either a
comma or a space. If you do not specify any addresses, users in this group are
not allowed to send messages to any addresses. You can use the substitution
token '${user}' to specify an address that contains a user's authenticated user
name. You can use an asterisk ('*') wildcard to match one or more characters in
an address. However, [...]
+ "A list of target addresses to which users in this group may send
messages. To specify multiple addresses, separate the addresses with either a
comma or a space. If you do not specify any addresses, users in this group are
not allowed to send messages to any addresses. You can use the substitution
token `${user}` to specify an address that contains a user's authenticated user
name. You can use an asterisk ('*') wildcard to match one or more characters in
an address. However, [...]
},
sources: {
type: "string",
description:
- "A list of source addresses from which users in this group may
receive messages. To specify multiple addresses, separate the addresses with
either a comma or a space. If you do not specify any addresses, users in this
group are not allowed to receive messages from any addresses. You can use the
substitution token '${user}' to specify an address that contains a user's
authenticated user name. You can use an asterisk ('*') wildcard to match one or
more characters in an address. [...]
+ "A list of source addresses from which users in this group may
receive messages. To specify multiple addresses, separate the addresses with
either a comma or a space. If you do not specify any addresses, users in this
group are not allowed to receive messages from any addresses. You can use the
substitution token `${user}` to specify an address that contains a user's
authenticated user name. You can use an asterisk ('*') wildcard to match one or
more characters in an address. [...]
},
allowAdminStatusUpdate: {
default: true,
@@ -502,7 +502,7 @@ export default {
targetPattern: {
type: "string",
description:
- "A wildcarded pattern for matching target addresses to which users
in this group may send messages. The pattern consists of one or more tokens
separated by a forward slash '/'. A token can be one of the following: a *
character, a # character, or a sequence of characters that do not include /, *,
or #. The * token matches any single token. The # token matches zero or more
tokens. * has higher precedence than #, and exact match has the highest
precedence. To specify multiple [...]
+ "A wildcarded pattern for matching target addresses to which users
in this group may send messages. The pattern consists of one or more tokens
separated by a forward slash '/'. A token can be one of the following: a *
character, a # character, or a sequence of characters that do not include /, *,
or #. The * token matches any single token. The # token matches zero or more
tokens. * has higher precedence than #, and exact match has the highest
precedence. To specify multiple [...]
},
maxSessions: {
default: 32768,
diff --git a/docs/man/qdstat.8.adoc b/docs/man/qdstat.8.adoc
index fa9c2bc..fb57f70 100644
--- a/docs/man/qdstat.8.adoc
+++ b/docs/man/qdstat.8.adoc
@@ -643,7 +643,7 @@ A list of source addresses from which users in this group
may receive messages.
To specify multiple addresses, separate the addresses with either a comma or
a space. If you do not specify any addresses, users in this group are not
allowed to receive messages from any addresses. You can use the substitution
-token '${user}' to specify an address that contains a user's authenticated
+token `${user}` to specify an address that contains a user's authenticated
user name. You can use an 'asterisk \*' wildcard to match one or more
characters in an address. However, this wildcard is only recognized if
it is the last character in the address name. You may specify attributes
@@ -654,7 +654,7 @@ A list of target addresses to which users in this group may
send messages.
To specify multiple addresses, separate the addresses with either a comma or
a space. If you do not specify any addresses, users in this group are not
allowed to send messages to any addresses. You can use the substitution
-token '${user}' to specify an address that contains a user's authenticated
+token `${user}` to specify an address that contains a user's authenticated
user name. You can use an 'asterisk \*' wildcard to match one or more
characters in an address. However, this wildcard is only recognized if it
is the last character in the address name. You may specify attributes
@@ -669,7 +669,7 @@ that do not include '/', 'asterisk \*', or 'hash \#'. The
'asterisk \*' token m
The 'hash \#' token matches zero or more tokens. 'asterisk \*' has higher
precedence than 'hash \#',
and exact match has the highest precedence. To specify multiple addresses,
separate the addresses with either a comma or a space. You can use the
-text string '${user}' in a token to specify an address that contains a
+text string `${user}` in a token to specify an address that contains a
user's authenticated user name. If you do not specify any addresses then
users in this group are not allowed to receive messages from any addresses.
You may specify attributes 'sources' or 'sourcePattern' but not both at
@@ -684,7 +684,7 @@ include "/", 'asterisk \*', or 'hash \#'. The 'asterisk
\*' token matches any s
token matches zero or more tokens. 'asterisk \*' has higher precedence than
'hash \#',
and exact match has the highest precedence. To specify multiple addresses,
separate the addresses with either a comma or a space. You can use the
-text string '${user}' in a token to specify an address that contains a
+text string `${user}` in a token to specify an address that contains a
user's authenticated user name. If you do not specify any addresses then
users in this group are not allowed to send messages to any addresses.
You may specify attributes 'targets' or 'targetPattern' but not both at
diff --git a/python/qpid_dispatch/management/qdrouter.json
b/python/qpid_dispatch/management/qdrouter.json
index 2619ad0..ed0aa8e 100644
--- a/python/qpid_dispatch/management/qdrouter.json
+++ b/python/qpid_dispatch/management/qdrouter.json
@@ -2441,25 +2441,25 @@
},
"sources": {
"type": "string",
- "description": "A list of source addresses from which
users in this group may receive messages. To specify multiple addresses,
separate the addresses with either a comma or a space. If you do not specify
any addresses, users in this group are not allowed to receive messages from any
addresses. You can use the substitution token '${user}' to specify an address
that contains a user's authenticated user name. You can use an asterisk ('*')
wildcard to match one or more ch [...]
+ "description": "A list of source addresses from which
users in this group may receive messages. To specify multiple addresses,
separate the addresses with either a comma or a space. If you do not specify
any addresses, users in this group are not allowed to receive messages from any
addresses. You can use the substitution token `${user}` to specify an address
that contains a user's authenticated user name. You can use an asterisk ('*')
wildcard to match one or more ch [...]
"required": false,
"create": true
},
"targets": {
"type": "string",
- "description": "A list of target addresses to which users
in this group may send messages. To specify multiple addresses, separate the
addresses with either a comma or a space. If you do not specify any addresses,
users in this group are not allowed to send messages to any addresses. You can
use the substitution token '${user}' to specify an address that contains a
user's authenticated user name. You can use an asterisk ('*') wildcard to match
one or more characters i [...]
+ "description": "A list of target addresses to which users
in this group may send messages. To specify multiple addresses, separate the
addresses with either a comma or a space. If you do not specify any addresses,
users in this group are not allowed to send messages to any addresses. You can
use the substitution token `${user}` to specify an address that contains a
user's authenticated user name. You can use an asterisk ('*') wildcard to match
one or more characters i [...]
"required": false,
"create": true
},
"sourcePattern": {
"type": "string",
- "description": "A wildcarded pattern for matching source
addresses from which users in this group may receive messages. The pattern
consists of one or more tokens separated by a forward slash '/'. A token can be
one of the following: a * character, a # character, or a sequence of characters
that do not include /, *, or #. The * token matches any single token. The #
token matches zero or more tokens. * has higher precedence than #, and exact
match has the highest pre [...]
+ "description": "A wildcarded pattern for matching source
addresses from which users in this group may receive messages. The pattern
consists of one or more tokens separated by a forward slash '/'. A token can be
one of the following: a * character, a # character, or a sequence of characters
that do not include /, *, or #. The * token matches any single token. The #
token matches zero or more tokens. * has higher precedence than #, and exact
match has the highest pre [...]
"create": true,
"required": false
},
"targetPattern": {
"type": "string",
- "description": "A wildcarded pattern for matching target
addresses to which users in this group may send messages. The pattern consists
of one or more tokens separated by a forward slash '/'. A token can be one of
the following: a * character, a # character, or a sequence of characters that
do not include /, *, or #. The * token matches any single token. The # token
matches zero or more tokens. * has higher precedence than #, and exact match
has the highest preceden [...]
+ "description": "A wildcarded pattern for matching target
addresses to which users in this group may send messages. The pattern consists
of one or more tokens separated by a forward slash '/'. A token can be one of
the following: a * character, a # character, or a sequence of characters that
do not include /, *, or #. The * token matches any single token. The # token
matches zero or more tokens. * has higher precedence than #, and exact match
has the highest preceden [...]
"create": true,
"required": false
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
