summaryrefslogtreecommitdiff
path: root/qpid/doc/book/src/java-broker/Java-Broker-Security.xml
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-10-06 06:56:59 +0000
committerKeith Wall <kwall@apache.org>2014-10-06 06:56:59 +0000
commit1cff5b63b5503feaa555c9f31ddc057fe9a18fdd (patch)
tree2af0b085d86b1c258b8946ffc3332d9b037117c8 /qpid/doc/book/src/java-broker/Java-Broker-Security.xml
parent5d1236947bf2fb8117e8976149fbffa385022c0d (diff)
downloadqpid-python-1cff5b63b5503feaa555c9f31ddc057fe9a18fdd.tar.gz
QPID-6108: [Java Broker Documentation] Updates for changes made during 0.30
* Remove references to virtualhost.xml * Rework concepts section * Rework management section to separate means of management from management of the entities themselves * Remove references message stores * Update JVM defect to Java 7 * ACL updates * Add Flow to Disk Still further changes required flagged by TODO. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1629579 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/doc/book/src/java-broker/Java-Broker-Security.xml')
-rw-r--r--qpid/doc/book/src/java-broker/Java-Broker-Security.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/qpid/doc/book/src/java-broker/Java-Broker-Security.xml b/qpid/doc/book/src/java-broker/Java-Broker-Security.xml
index 858a27abb0..d9f1c4c68c 100644
--- a/qpid/doc/book/src/java-broker/Java-Broker-Security.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Security.xml
@@ -22,8 +22,8 @@
<chapter id="Java-Broker-Security">
<title>Security</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Security-Authentication-Providers.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Security-Group-Providers.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Security-ACLs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Security-SSL.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Security-Authentication-Providers.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Security-Group-Providers.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Security-ACLs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Security-Configuration-Encryption.xml"/>
</chapter>