Merge branch 'elb-help-error' into develop

* elb-help-error:
  Add #622 to changelog
  Add test for #622

CHANGELOG.rst

@@ -5,6 +5,9 @@ CHANGELOG
 Next Release (TBD)
 ==================
 
+* bugfix:``aws elb``: Fix issue with documentation errors
+  in ``aws elb help``
+  (`issue 622 <https://github.com/aws/aws-cli/issues/622>`__)
 * bugfix:JSON Parameters: Add a more clear error message
   when parsing invalid JSON parameters
   (`issue 639 <https://github.com/aws/aws-cli/pull/639>`__)

awscli/help.py

@@ -88,7 +88,7 @@ def render(self, contents):
             raise ExecutableNotFoundError('groff')
         cmdline = ['groff', '-man', '-T', 'ascii']
         LOG.debug("Running command: %s", cmdline)
-        p3 = self._popen(cmdline, stdin=PIPE, stdout=PIPE)
+        p3 = self._popen(cmdline, stdin=PIPE, stdout=PIPE, stderr=PIPE)
         groff_output = p3.communicate(input=man_contents)[0]
         cmdline = self.get_pager_cmdline()
         LOG.debug("Running command: %s", cmdline)

tests/unit/docs/test_help_output.py

@@ -113,6 +113,12 @@ def test_add_help_for_dryrun(self):
         self.assert_contains('DryRunOperation')
         self.assert_contains('UnauthorizedOperation')
 
+    def test_elb_help_output(self):
+        self.driver.main(['elb', 'help'])
+        # We should *not* have any invalid links like
+        # .. _`:
+        self.assert_not_contains('.. _`:')
+
 
 class TestRemoveDeprecatedCommands(BaseAWSHelpOutputTest):
     def assert_command_does_not_exist(self, service, command):