From 74048ae6b37b7f18dbd0e13404c6513d8f7086aa Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Wed, 9 Apr 2014 17:10:02 +0200
Subject: [PATCH] Add missing cinder options to config reference

Include all missing tables in a "misc" sections.

Change-Id: I8afca73c30bec0129c710a60ac8665fd649af657
---
 .../block-storage/section_misc.xml            | 40 +++++++++++++++++++
 .../ch_blockstorageconfigure.xml              |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 doc/config-reference/block-storage/section_misc.xml

diff --git a/doc/config-reference/block-storage/section_misc.xml b/doc/config-reference/block-storage/section_misc.xml
new file mode 100644
index 0000000000..a8039be2a1
--- /dev/null
+++ b/doc/config-reference/block-storage/section_misc.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://docbook.org/ns/docbook"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+    xml:id="section_volume-misc">
+    <title>Additional options</title>
+
+    <para>
+      These options can also be set in the
+      <filename>cinder.conf</filename> file.
+    </para>
+
+    <xi:include href="../../common/tables/cinder-connection.xml"/>
+    <xi:include href="../../common/tables/cinder-huawei.xml"/>
+    <xi:include href="../../common/tables/cinder-nas.xml"/>
+    <xi:include href="../../common/tables/cinder-hpmsa.xml"/>
+    <xi:include href="../../common/tables/cinder-database.xml"/>
+    <xi:include href="../../common/tables/cinder-keymgr.xml"/>
+    <xi:include href="../../common/tables/cinder-storage.xml"/>
+    <xi:include href="../../common/tables/cinder-rpc.xml"/>
+    <xi:include href="../../common/tables/cinder-san-solaris.xml"/>
+    <xi:include href="../../common/tables/cinder-rootwrap.xml"/>
+    <xi:include href="../../common/tables/cinder-log.xml"/>
+    <xi:include href="../../common/tables/cinder-ssl.xml"/>
+    <xi:include href="../../common/tables/cinder-images.xml"/>
+    <xi:include href="../../common/tables/cinder-emc.xml"/>
+    <xi:include href="../../common/tables/cinder-backups.xml"/>
+    <xi:include href="../../common/tables/cinder-hp3par.xml"/>
+    <xi:include href="../../common/tables/cinder-api.xml"/>
+    <xi:include href="../../common/tables/cinder-hplefthand.xml"/>
+    <xi:include href="../../common/tables/cinder-scality.xml"/>
+    <xi:include href="../../common/tables/cinder-block-device.xml"/>
+    <xi:include href="../../common/tables/cinder-compute.xml"/>
+    <xi:include href="../../common/tables/cinder-san.xml"/>
+    <xi:include href="../../common/tables/cinder-zones.xml"/>
+    <xi:include href="../../common/tables/cinder-auth.xml"/>
+    <xi:include href="../../common/tables/cinder-scheduler.xml"/>
+    <xi:include href="../../common/tables/cinder-quota.xml"/>
+    <xi:include href="../../common/tables/cinder-common.xml"/>
+</section>
diff --git a/doc/config-reference/ch_blockstorageconfigure.xml b/doc/config-reference/ch_blockstorageconfigure.xml
index 4c29d32e48..0d63ce5848 100644
--- a/doc/config-reference/ch_blockstorageconfigure.xml
+++ b/doc/config-reference/ch_blockstorageconfigure.xml
@@ -26,4 +26,5 @@
   <xi:include href="block-storage/section_block-storage-sample-configuration-files.xml" />
   <xi:include href="block-storage/section_cinder-log-files.xml"/>
   <xi:include href="block-storage/section_fc-zoning.xml"/>
+  <xi:include href="block-storage/section_misc.xml"/>
 </chapter>