From e47e400a4c33a75c48915c5299bc4bbb3214c1d8 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 20 Mar 2015 11:30:10 +1100
Subject: [PATCH] Ignore stderr for documentation program output

novaclient is helpfully giving a deprecation warning at the moment
which totally messes up the command output in the documentation.  Just
ignore this extraneous output by only capturing stdout.

Change-Id: Ie126deb555fff52385bfb11d82f510cc9431b0a4
---
 doc/source/operation.rst | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/source/operation.rst b/doc/source/operation.rst
index 181a78a8d..911a5b7e0 100644
--- a/doc/source/operation.rst
+++ b/doc/source/operation.rst
@@ -30,51 +30,61 @@ Usage
 The general options that apply to all subcommands are:
 
 .. program-output:: nodepool --help
+   :nostderr:
 
 The following subcommands deal with nodepool images:
 
 dib-image-list
 ^^^^^^^^^^^^^^
 .. program-output:: nodepool dib-image-list --help
+   :nostderr:
 
 image-list
 ^^^^^^^^^^
 .. program-output:: nodepool image-list --help
+   :nostderr:
 
 image-build
 ^^^^^^^^^^^
 .. program-output:: nodepool image-build --help
+   :nostderr:
 
 image-update
 ^^^^^^^^^^^^
 .. program-output:: nodepool image-update --help
+   :nostderr:
 
 image-upload
 ^^^^^^^^^^^^
 .. program-output:: nodepool image-upload --help
+   :nostderr:
 
 dib-image-delete
 ^^^^^^^^^^^^^^^^
 .. program-output:: nodepool dib-image-delete --help
+   :nostderr:
 
 image-delete
 ^^^^^^^^^^^^
 .. program-output:: nodepool image-delete --help
-
+   :nostderr:
 
 The following subcommands deal with nodepool nodes:
 
 list
 ^^^^
 .. program-output:: nodepool list --help
+   :nostderr:
 
 hold
 ^^^^
 .. program-output:: nodepool hold --help
+   :nostderr:
 
 delete
 ^^^^^^
 .. program-output:: nodepool delete --help
+   :nostderr:
 
 If Nodepool's database gets out of sync with reality, the following
 commands can help identify compute instances or images that are
@@ -83,7 +93,9 @@ unknown to Nodepool:
 alien-list
 ^^^^^^^^^^
 .. program-output:: nodepool alien-list --help
+   :nostderr:
 
 alien-image-list
 ^^^^^^^^^^^^^^^^
 .. program-output:: nodepool alien-image-list --help
+   :nostderr: