From 86b0b9be70525c5d329a101498ee75f2768a965c Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Mon, 21 Apr 2014 07:39:28 +0200
Subject: [PATCH] Remove cinder-log.xml

The backlog option is not in cinder anymore, but the autoconf script
doesn't remove old files.

Also add a comment in cinder-netapp_cdot_extraspecs.xml warning that
this file is not autogenerated to avoid seeing it removed by accident.

Change-Id: I2d7fc7b47c7ce4a44ea64d371f023235de6c5b74
---
 doc/common/tables/cinder-log.xml              | 27 -------------------
 .../tables/cinder-netapp_cdot_extraspecs.xml  |  1 +
 .../block-storage/section_misc.xml            |  1 -
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 doc/common/tables/cinder-log.xml

diff --git a/doc/common/tables/cinder-log.xml b/doc/common/tables/cinder-log.xml
deleted file mode 100644
index cec92288e1..0000000000
--- a/doc/common/tables/cinder-log.xml
+++ /dev/null
@@ -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>
diff --git a/doc/common/tables/cinder-netapp_cdot_extraspecs.xml b/doc/common/tables/cinder-netapp_cdot_extraspecs.xml
index 09ffc274fd..bad2cbd986 100644
--- a/doc/common/tables/cinder-netapp_cdot_extraspecs.xml
+++ b/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>
diff --git a/doc/config-reference/block-storage/section_misc.xml b/doc/config-reference/block-storage/section_misc.xml
index a8039be2a1..dce7871df6 100644
--- a/doc/config-reference/block-storage/section_misc.xml
+++ b/doc/config-reference/block-storage/section_misc.xml
@@ -20,7 +20,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"/>