You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2020/08/05 12:11:36 UTC
[qpid-broker-j] branch master updated: NO-JIRA: remove links etc
from the documentation, missed from removal in QPID 7487
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/master by this push:
new 7ba6bbe NO-JIRA: remove links etc from the documentation, missed from removal in QPID 7487
7ba6bbe is described below
commit 7ba6bbeef8d402b2e55ced9ca0a83bd71648e1ff
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Aug 5 13:09:14 2020 +0100
NO-JIRA: remove links etc from the documentation, missed from removal in QPID 7487
---
.../src/docbkx/Java-Broker-Initial-Configuration.xml | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml b/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
index ad552b2..41e366b 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
@@ -68,8 +68,7 @@
<para>Broker startup involves two configuration related items, the 'Initial Configuration'
and the Configuration Store. When the broker is started, if a Configuration Store does
not exist at the current <link linkend="Java-Broker-Initial-Configuration-Location">store location</link> then one will be initialised with the current <link linkend="Java-Broker-Initial-Configuration-Initial-Config-Location">'Initial
- Configuration'</link>. Unless otherwise requested to <link linkend="Java-Broker-Initial-Configuration-Location">overwrite the configuration
- store</link> then subsequent broker restarts will use the existing configuration
+ Configuration'</link>. Subsequent broker restarts will use the existing configuration
store and ignore the contents of the 'Initial Configuration'. </para>
</section>
@@ -103,8 +102,7 @@ $ ./qpid-server -icp ./my-initial-configuration.json
</screen>
<para> If a Configuration Store already exists at the current <link linkend="Java-Broker-Initial-Configuration-Location">store location</link> then the
- current 'Initial Configuration' will be ignored unless otherwise requested to <link linkend="Java-Broker-Initial-Configuration-Location">overwrite the configuration
- store</link>
+ current 'Initial Configuration' will be ignored.
</para>
</section>
@@ -247,9 +245,8 @@ $ ./qpid-server -prop "qpid.amqp_port=10000" -prop "qpid.http_port=10001"
<para> In the example above, property used to set the port number of the default AMQP port
is specified with the value 10000, overriding the default value of 5672, and similarly
the value 10001 is used to override the default HTTP port number of 8080. When using the
- 'Initial Configuration' to initialise a new Configuration Store (either at first broker
- startup, when requesting to <link linkend="Java-Broker-Initial-Configuration-Location">overwrite the configuration store</link>) these new values will be used for the
- port numbers instead. </para>
+ 'Initial Configuration' to initialise a new Configuration Store at first broker
+ startup these new values will be used for the port numbers instead. </para>
<para> NOTE: When running the broker on Windows and starting it via the qpid-server.bat
file, the "name=value" argument MUST be quoted. </para>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org