Repository: activemq-artemis Updated Branches: refs/heads/master 986af2e99 -> dd6a5ab88
ARTEMIS-1385 fixed uncomplete comment and typo Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e9c601dd Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e9c601dd Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e9c601dd Branch: refs/heads/master Commit: e9c601dd2ca3070338731ed391fdb5bb991c873d Parents: 986af2e Author: Stanislav Knot <sk...@eredhat.com> Authored: Tue Sep 5 09:09:01 2017 +0200 Committer: Stanislav Knot <sk...@eredhat.com> Committed: Tue Sep 5 10:42:10 2017 +0200 ---------------------------------------------------------------------- .../artemis/cli/commands/etc/commented-ping-settings.txt | 4 ++-- .../apache/activemq/artemis/cli/commands/etc/ping-settings.txt | 4 ++-- docs/user-manual/en/configuration-index.md | 2 +- docs/user-manual/en/network-isolation.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e9c601dd/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/commented-ping-settings.txt ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/commented-ping-settings.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/commented-ping-settings.txt index c271dc9..15adee7 100644 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/commented-ping-settings.txt +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/commented-ping-settings.txt @@ -1,6 +1,6 @@ <!-- - You can specify the NIC you want to use to verify if the network - <network-check-NIC>theNickName</network-check-NIC> + You can verify the network health of a particular NIC by specifying the <network-check-NIC> element. + <network-check-NIC>theNicName</network-check-NIC> --> <!-- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e9c601dd/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/ping-settings.txt ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/ping-settings.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/ping-settings.txt index 90a2c00..242c835 100644 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/ping-settings.txt +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/ping-settings.txt @@ -1,6 +1,6 @@ <!-- - You can specify the NIC you want to use to verify if the network - <network-check-NIC>theNickName</network-check-NIC> + You can verify the network health of a particular NIC by specifying the <network-check-NIC> element. + <network-check-NIC>theNicName</network-check-NIC> --> <!-- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e9c601dd/docs/user-manual/en/configuration-index.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/configuration-index.md b/docs/user-manual/en/configuration-index.md index b0aa408..5311515 100644 --- a/docs/user-manual/en/configuration-index.md +++ b/docs/user-manual/en/configuration-index.md @@ -112,7 +112,7 @@ system-property-prefix | Prefix for replacing configuration settings using Bean [transaction-timeout](transaction-config.md "Resource Manager Configuration") | how long (in ms) before a transaction can be removed from the resource manager after create time. Default=300000 [transaction-timeout-scan-period](transaction-config.md "Resource Manager Configuration") | how often (in ms) to scan for timeout transactions. Default=1000 [wild-card-routing-enabled](wildcard-routing.md "Routing Messages With Wild Cards") | true means that the server supports wild card routing. Default=true -[network-check-NIC](network-isolation.md) | The network internet card to be used on InetAddress.isReacheable +[network-check-NIC](network-isolation.md) | The NIC (Network Interface Controller) to be used on InetAddress.isReacheable [network-check-URL](network-isolation.md) | The list of http URIs to be used to validate the network [network-check-list](network-isolation.md) | The list of pings to be used on ping or InetAddress.isReacheable [network-check-ping-command](network-isolation.md) | The command used to oping IPV4 addresses http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e9c601dd/docs/user-manual/en/network-isolation.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/network-isolation.md b/docs/user-manual/en/network-isolation.md index 1ab5e62..06eda31 100644 --- a/docs/user-manual/en/network-isolation.md +++ b/docs/user-manual/en/network-isolation.md @@ -73,8 +73,8 @@ This XML part will be added to your broker.xml: ```xml <!-- -You can specify the NIC you want to use to verify if the network - <network-check-NIC>theNickName</network-check-NIC> +You can verify the network health of a particular NIC by specifying the <network-check-NIC> element. + <network-check-NIC>theNicName</network-check-NIC> --> <!--