From 855daa63f67adb80c100a7105564ab7a38510b4e Mon Sep 17 00:00:00 2001
From: Alexis Lee <lxsli@hpe.com>
Date: Mon, 21 Nov 2016 14:18:16 +0000
Subject: [PATCH] Remove docbook

From autohelp-wrapper and autohelp.py, as it's no longer used.

Change-Id: I44d5c37c70b8b4fc0b938b6ba0c2fed5a448c265
---
 autogenerate_config_docs/autohelp-wrapper | 13 ++-----------
 autogenerate_config_docs/autohelp.py      |  8 ++++----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/autogenerate_config_docs/autohelp-wrapper b/autogenerate_config_docs/autohelp-wrapper
index 66c75fd5..de934362 100755
--- a/autogenerate_config_docs/autohelp-wrapper
+++ b/autogenerate_config_docs/autohelp-wrapper
@@ -32,11 +32,10 @@ QUIET=0
 usage() {
     echo "Wrapper for autohelp.py"
     echo "Usage:"
-    echo "  $(basename $0) [ OPTIONS ] update|docbook|rst|setup [ project... ]"
+    echo "  $(basename $0) [ OPTIONS ] update|rst|setup [ project... ]"
     echo
     echo "Subcommands:"
     echo "  update:     Update or create the flagmapping files"
-    echo "  docbook:    Generate the options tables in docbook format"
     echo "  rst:        Generate the options tables in RST format"
     echo "  setup:      Install the environment only"
     echo
@@ -149,7 +148,7 @@ if [ $QUIET -eq 1 ]; then
 fi
 
 case $ACTION in
-    update|docbook|rst|dump|setup) ;;
+    update|rst|dump|setup) ;;
     *)
         usage
         exit 1
@@ -249,14 +248,6 @@ for project in $PROJECTS; do
             $extra_flags $AUTOOPT
         mv $project.flagmappings.new $project.flagmappings
         ;;
-    docbook)
-        if [ "$project" = "swift" ]; then
-            $EXTRACT_SWIFT docbook -m $MANUALSREPO -s $SOURCESDIR/swift
-        else
-            $AUTOHELP docbook $project -i $SOURCESDIR/$project/$project \
-                $extra_flags $AUTOOPT
-        fi
-        ;;
     rst)
         if [ "$project" = "swift" ]; then
             $EXTRACT_SWIFT rst -m $MANUALSREPO -s $SOURCESDIR/swift
diff --git a/autogenerate_config_docs/autohelp.py b/autogenerate_config_docs/autohelp.py
index bd05803e..37030357 100755
--- a/autogenerate_config_docs/autohelp.py
+++ b/autogenerate_config_docs/autohelp.py
@@ -565,8 +565,8 @@ def main():
         description='Manage flag files, to aid in updating documentation.',
         usage='%(prog)s <cmd> <package> [options]')
     parser.add_argument('subcommand',
-                        help='Action (update, docbook, rst, dump).',
-                        choices=['update', 'docbook', 'rst', 'dump'])
+                        help='Action (update, rst, dump).',
+                        choices=['update', 'rst', 'dump'])
     parser.add_argument('package',
                         help='Name of the top-level package.')
     parser.add_argument('-v', '--verbose',
@@ -586,7 +586,7 @@ def main():
                         dest='target',
                         help='Directory or file in which data will be saved.\n'
                              'Defaults to ../../doc/common/tables/ '
-                             'for "docbook".\n'
+                             'for "rst".\n'
                              'Defaults to stdout for "dump"',
                         required=False,
                         type=str,)
@@ -621,7 +621,7 @@ def main():
     if args.subcommand == 'update':
         update_flagmappings(args.package, options, verbose=args.verbose)
 
-    elif args.subcommand in ('docbook', 'rst'):
+    elif args.subcommand == 'rst':
         write_files(args.package, options, args.target, args.subcommand)
 
     elif args.subcommand == 'dump':