From c12a0526ffa3bf1d4aef5c9bf289a6b149e7f326 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sat, 28 Sep 2013 18:43:15 +0200
Subject: [PATCH] Avoid having twice Appendix A

Both user-guide and user-guide-admin had two versions appendices
labelled "A". The problem was setting appendixAutolabel to 1 in
the pom.xml file and manual overrides of the number in the files.
The patch cleanes all of this up and renames ch_resources.xml
to an appendix part.

security-guide and training-guide also set this variable but did
not have an appendix yet, so remove the variable there as well.

Change-Id: I446f4968b675d3286f2302071ddfa8037425fd6f
---
 doc/common/app_command_reference.xml               | 2 +-
 doc/common/{ch_resources.xml => app_resources.xml} | 6 +++---
 doc/security-guide/pom.xml                         | 1 -
 doc/training-guide/pom.xml                         | 1 -
 doc/user-guide-admin/bk-admin-user-guide.xml       | 2 +-
 doc/user-guide-admin/pom.xml                       | 2 --
 doc/user-guide/bk-user-guide.xml                   | 2 +-
 doc/user-guide/pom.xml                             | 1 -
 8 files changed, 6 insertions(+), 11 deletions(-)
 rename doc/common/{ch_resources.xml => app_resources.xml} (97%)

diff --git a/doc/common/app_command_reference.xml b/doc/common/app_command_reference.xml
index 9e21d45a9b..055763b486 100644
--- a/doc/common/app_command_reference.xml
+++ b/doc/common/app_command_reference.xml
@@ -13,7 +13,7 @@
 <appendix 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="nova_summary" label="A">
+        xml:id="nova_summary">
         <title>Command reference</title>
         <xi:include
                 href="section_keystone_cli_commands.xml"/>
diff --git a/doc/common/ch_resources.xml b/doc/common/app_resources.xml
similarity index 97%
rename from doc/common/ch_resources.xml
rename to doc/common/app_resources.xml
index 87d0b5c56d..5efc7cfe87 100644
--- a/doc/common/ch_resources.xml
+++ b/doc/common/app_resources.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<chapter xmlns="http://docbook.org/ns/docbook"
+<appendix xmlns="http://docbook.org/ns/docbook"
         xmlns:xlink="http://www.w3.org/1999/xlink"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xmlns:svg="http://www.w3.org/2000/svg"
         xmlns:m="http://www.w3.org/1998/Math/MathML"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:db="http://docbook.org/ns/docbook" version="5.0"
-        xml:id="resources" label="A">
+        xml:id="resources">
         <title>Resources</title>
         <para>For the available OpenStack documentation, see <link
               xlink:href="http://docs.openstack.org"
@@ -90,4 +90,4 @@
                 or <link
                         xlink:href="https://bugs.launchpad.net/openstack-manuals/+filebug"
                         >report a bug</link>.</para>
-</chapter>
+</appendix>
diff --git a/doc/security-guide/pom.xml b/doc/security-guide/pom.xml
index 24bed7b9fd..2b8d772164 100644
--- a/doc/security-guide/pom.xml
+++ b/doc/security-guide/pom.xml
@@ -43,7 +43,6 @@
                             <enableGoogleAnalytics>1</enableGoogleAnalytics>
                             <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
                             <chapterAutolabel>1</chapterAutolabel>
-                            <appendixAutolabel>1</appendixAutolabel>
                             <sectionAutolabel>0</sectionAutolabel>
                             <tocSectionDepth>1</tocSectionDepth>
                             <formalProcedures>0</formalProcedures>
diff --git a/doc/training-guide/pom.xml b/doc/training-guide/pom.xml
index 13f5c4ec52..bbd3f1f6e7 100644
--- a/doc/training-guide/pom.xml
+++ b/doc/training-guide/pom.xml
@@ -38,7 +38,6 @@
                             <enableGoogleAnalytics>1</enableGoogleAnalytics>
                             <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
                             <chapterAutolabel>1</chapterAutolabel>
-                            <appendixAutolabel>1</appendixAutolabel>
                             <sectionAutolabel>0</sectionAutolabel>
                             <tocSectionDepth>1</tocSectionDepth>
                             <formalProcedures>0</formalProcedures>
diff --git a/doc/user-guide-admin/bk-admin-user-guide.xml b/doc/user-guide-admin/bk-admin-user-guide.xml
index f8c85d839e..3c94550ad6 100644
--- a/doc/user-guide-admin/bk-admin-user-guide.xml
+++ b/doc/user-guide-admin/bk-admin-user-guide.xml
@@ -61,5 +61,5 @@
     <xi:include href="ch_dashboard.xml"/>
     <xi:include href="ch_cli.xml"/>
     <xi:include href="../common/app_command_reference.xml"/>
-    <xi:include href="../common/ch_resources.xml"/>
+    <xi:include href="../common/app_resources.xml"/>
 </book>
diff --git a/doc/user-guide-admin/pom.xml b/doc/user-guide-admin/pom.xml
index 1d5258dac6..7b46f19a0e 100644
--- a/doc/user-guide-admin/pom.xml
+++ b/doc/user-guide-admin/pom.xml
@@ -54,7 +54,6 @@
         <configuration>
           <profileOs>adminuser</profileOs>
           <chapterAutolabel>1</chapterAutolabel>
-          <appendixAutolabel>1</appendixAutolabel>
           <sectionAutolabel>0</sectionAutolabel>
           <tocSectionDepth>1</tocSectionDepth>
           <formalProcedures>0</formalProcedures>
@@ -72,7 +71,6 @@
           <suppressFooterNavigation>0</suppressFooterNavigation>
           <formalProcedures>0</formalProcedures>
           <sectionAutolabel>0</sectionAutolabel>
-          <appendixAutolabel>0</appendixAutolabel>
           <tocSectionDepth>1</tocSectionDepth>
         </configuration>
       </plugin>
diff --git a/doc/user-guide/bk-user-guide.xml b/doc/user-guide/bk-user-guide.xml
index 12f2ad9b8d..d8a9a2e048 100644
--- a/doc/user-guide/bk-user-guide.xml
+++ b/doc/user-guide/bk-user-guide.xml
@@ -70,5 +70,5 @@
     <xi:include href="ch_dashboard.xml"/>
     <xi:include href="ch_cli.xml"/>
     <xi:include href="../common/app_command_reference.xml"/>
-    <xi:include href="../common/ch_resources.xml"/>
+    <xi:include href="../common/app_resources.xml"/>
 </book>
diff --git a/doc/user-guide/pom.xml b/doc/user-guide/pom.xml
index 0888f38bb4..247428faa7 100644
--- a/doc/user-guide/pom.xml
+++ b/doc/user-guide/pom.xml
@@ -54,7 +54,6 @@ set toc,title </generateToc>
         <configuration>
           <profileOs>enduser</profileOs>
           <chapterAutolabel>1</chapterAutolabel>
-          <appendixAutolabel>1</appendixAutolabel>
           <sectionAutolabel>0</sectionAutolabel>
           <tocSectionDepth>1</tocSectionDepth>
           <formalProcedures>0</formalProcedures>