old_contents: # -*- coding: utf-8 -*-
  '''
  A runner module to collect and display the inline documentation from the
  various module types
  '''
  # Import Python libs
  from __future__ import absolute_import, print_function
  import itertools
  
  # Import salt libs
  import salt.client
  import salt.runner
  import salt.wheel
  
  # Import 3rd-party libs
  import salt.ext.six as six
  from salt.exceptions import SaltClientError
  
  
  def __virtual__():
      '''
      Always load
      '''
      return True
  
  
  def runner():
      '''
      Return all inline documentation for runner modules
  
      CLI Example:
  
      .. code-block:: bash
  
          salt-run doc.runner
      '''
      client = salt.runner.RunnerClient(__opts__)
      ret = client.get_docs()
      return ret
  
  
  def wheel():
      '''
      Return all inline documentation for wheel modules
  
      CLI Example:
  
      .. code-block:: bash
  
          salt-run doc.wheel
      '''
      client = salt.wheel.Wheel(__opts__)
      ret = client.get_docs()
      return ret
  
  
  def execution():
      '''
      Collect all the sys.doc output from each minion and return the aggregate
  
      CLI Example:
  
      .. code-block:: bash
  
          salt-run doc.execution
      '''
      client = salt.client.get_local_client(__opts__['conf_file'])
  
      docs = {}
      try:
          for ret in client.cmd_iter('*', 'sys.doc', timeout=__opts__['timeout']):
              for v in six.itervalues(ret):
                  docs.update(v)
      except SaltClientError as exc:
          print(exc)  # pylint: disable=W1698
          return []
  
      i = itertools.chain.from_iterable([six.iteritems(i) for i in six.itervalues(docs)])
      ret = dict(list(i))
  
      return ret
  
new_contents: # -*- coding: utf-8 -*-
  '''
  A runner module to collect and display the inline documentation from the
  various module types
  '''
  # Import Python libs
  from __future__ import absolute_import, print_function
  import itertools
  
  # Import salt libs
  import salt.client
  import salt.runner
  import salt.wheel
  
  # Import 3rd-party libs
  import salt.ext.six as six
  from salt.exceptions import SaltClientError
  
  
  def __virtual__():
      '''
      Always load
      '''
      return True
  
  
  def runner():
      '''
      Return all inline documentation for runner modules
  
      CLI Example:
  
      .. code-block:: bash
  
          salt-run doc.runner
      '''
      client = salt.runner.RunnerClient(__opts__)
      ret = client.get_docs()
      return ret
  
  
  def wheel():
      '''
      Return all inline documentation for wheel modules
  
      CLI Example:
  
      .. code-block:: bash
  
          salt-run doc.wheel
      '''
      client = salt.wheel.Wheel(__opts__)
      ret = client.get_docs()
      return ret
  
  
  def execution():
      '''
      Collect all the sys.doc output from each minion and return the aggregate
  
      CLI Example:
  
      .. code-block:: bash
  
          salt-run doc.execution
      '''
      client = salt.client.get_local_client(__opts__['conf_file'])
  
      docs = {}
      try:
          for ret in client.cmd_iter('*', 'sys.doc', timeout=__opts__['timeout']):
              for v in six.itervalues(ret):
                  docs.update(v)
      except SaltClientError as exc:
          print(exc)  # pylint: disable=W1698
          return []
  
      i = itertools.chain.from_iterable([six.iteritems(docs['ret'])])
      ret = dict(list(i))
  
      return ret
  
subject: Fix for issue #25016