Merge "Remove cinder-log.xml"

doc/common/tables/cinder-log.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-        <!-- Warning: Do not edit this file. It is automatically
-             generated and your changes will be overwritten.
-             The tool to do so lives in the tools directory of this
-             repository -->
-        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
-          <caption>Description of configuration options for log</caption>
-           <col width="50%"/>
-           <col width="50%"/>
-           <thead>
-              <tr>
-                  <th>Configuration option = Default value</th>
-                  <th>Description</th>
-              </tr>
-          </thead>
-          <tbody>
-              <tr>
-                  <th colspan="2">[DEFAULT]</th>
-              </tr>
-              <tr>
-                       <td>backlog = 4096</td>
-                       <td>(IntOpt) Number of backlog requests to configure the socket with</td>
-              </tr>
-       </tbody>
-        </table>
-        </para>

doc/common/tables/cinder-netapp_cdot_extraspecs.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+        <!-- This file is NOT autogenerated -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
         <table rules="all">
           <caption>Description of extra specs options for NetApp Unified Driver with Clustered Data ONTAP</caption>

doc/config-reference/block-storage/section_misc.xml

@@ -21,7 +21,6 @@
     <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"/>