Merge pull request #4270 from dlindquist/develop

Fix several docstrings
saltstack · Mar 26, 2013 · e3f1179 · e3f1179
2 parents 7a3adf5 + 963ae07
commit e3f1179
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/salt/loader.py b/salt/loader.py
@@ -103,7 +103,7 @@ def returners(opts, functions, whitelist=None):
 
 def pillars(opts, functions):
     '''
-    Returns the returner modules
+    Returns the pillars modules
     '''
     load = _create_loader(opts, 'pillar', 'pillar')
     pack = {'name': '__salt__',
@@ -113,7 +113,7 @@ def pillars(opts, functions):
 
 def tops(opts):
     '''
-    Returns the returner modules
+    Returns the tops modules
     '''
     if not 'master_tops' in opts:
         return {}
@@ -124,15 +124,15 @@ def tops(opts):
 
 def wheels(opts, whitelist=None):
     '''
-    Returns the returner modules
+    Returns the wheels modules
     '''
     load = _create_loader(opts, 'wheel', 'wheel')
     return load.gen_functions(whitelist=whitelist)
 
 
 def outputters(opts):
     '''
-    Returns the returner modules
+    Returns the outputters modules
     '''
     load = _create_loader(
         opts,
@@ -144,7 +144,7 @@ def outputters(opts):
 
 def auth(opts, whitelist=None):
     '''
-    Returns the returner modules
+    Returns the auth modules
     '''
     load = _create_loader(opts, 'auth', 'auth')
     return load.gen_functions(whitelist=whitelist)
@@ -171,7 +171,7 @@ def states(opts, functions, whitelist=None):
 
 def search(opts, returners, whitelist=None):
     '''
-    Returns the state modules
+    Returns the search modules
     '''
     load = _create_loader(opts, 'search', 'search')
     pack = {'name': '__ret__',