Fix the docs printing sequence

salt/cli/caller.py

@@ -33,18 +33,17 @@ class Caller(object):
         '''
         Pick up the documentation for all of the modules and print it out.
         '''
-        ret = self.loader.call('sys.doc', self.opts['arg'])
+        ret = self.loader.apply_introspection(self.loader.gen_functions())
         docs = {}
-        for host in ret:
+        for name in ret:
-            for fun in ret[host]:
+            if not docs.has_key(name):
-                if not docs.has_key(fun):
+                if ret[name].__doc__:
-                    if ret[host][fun]:
+                    docs[name] = ret[name].__doc__
-                        docs[fun] = ret[host][fun]
+        for name in sorted(docs):
-        for fun in sorted(docs):
+            print name + ':'
-            print fun + ':'
+            print docs[name]
-            print docs[fun]
             print ''
-
+                   
     def run(self):
         '''
         Execute the salt call logic

salt/loader.py

@@ -103,6 +103,8 @@ class Loader(object):
         modules = []
         funcs = {}
         for mod_dir in self.module_dirs:
+            if not mod_dir.startswith('/'):
+                continue
             for fn_ in os.listdir(mod_dir):
                 if fn_.startswith('_'):
                     continue