Merge pull request #4262 from mgwilliams/docs

docs for new pillar and tops modules

doc/ref/pillar/all/index.rst

@@ -16,3 +16,4 @@ Full list of builtin pillar modules
     mongo
     pillar_ldap
     puppet
+    cobbler

doc/ref/pillar/all/salt.pillar.cobbler.rst

@@ -0,0 +1,6 @@
+===================
+salt.pillar.cobbler
+===================
+
+.. automodule:: salt.pillar.cobbler
+    :members:

doc/ref/tops/all/index.rst

@@ -11,3 +11,5 @@ Full list of builtin master tops modules
     :template: autosummary.rst.tmpl
 
     ext_nodes
+    cobbler
+    mongo

doc/ref/tops/all/salt.tops.cobbler.rst

@@ -0,0 +1,6 @@
+=================
+salt.tops.cobbler
+=================
+
+.. automodule:: salt.tops.cobbler
+    :members:

doc/ref/tops/all/salt.tops.mongo.rst

@@ -0,0 +1,6 @@
+===============
+salt.tops.mongo
+===============
+
+.. automodule:: salt.tops.mongo
+    :members:

salt/modules/service.py

@@ -80,7 +80,7 @@ def stop(name):
 
 def restart(name, **kwargs):
     '''
-    Restart the named service
+    Restart the specified service
 
     CLI Example::
 
@@ -106,7 +106,7 @@ def status(name, sig=None):
 
 def reload(name):
     '''
-    Restart the named service
+    Restart the specified service
 
     CLI Example::
 
@@ -132,7 +132,7 @@ def get_all(name):
 
 def available(name):
     '''
-    Return if the names service is available
+    Return if the specified service is available
 
     CLI Example::
 

salt/pillar/cobbler.py

@@ -2,18 +2,28 @@
 Cobbler Pillar
 ==============
 A pillar module to pull data from Cobbler via its API into the pillar dictionary.
+
+
+Configuring the Cobbler ext_pillar
+================================
+
 The same cobbler.* parameters are used for both the Cobbler tops and Cobbler pillar
 modules.
 
 .. code-block:: yaml
-    ext_pillar:
-       - cobbler:
-         - key: cobbler # Nest results within this key. By default, values are not nested.
-         - only: [parameters] # Add only these keys to pillar.
 
-    cobbler.url: https://example.com/cobbler_api #default is http://localhost/cobbler_api
+  ext_pillar:
-    cobbler.user: username # default is no username
+  - cobbler:
-    cobbler.password: password # default is no password
+    - key: cobbler # Nest results within this key. By default, values are not nested.
+    - only: [parameters] # Add only these keys to pillar.
+
+  cobbler.url: https://example.com/cobbler_api #default is http://localhost/cobbler_api
+  cobbler.user: username # default is no username
+  cobbler.password: password # default is no password
+
+
+Module Documentation
+====================
 '''
 
 # Import python libs

salt/tops/cobbler.py

@@ -7,13 +7,16 @@ from Cobbler via its API. The same cobbler.* parameters are used for both
 the Cobbler tops and Cobbler pillar modules.
 
 .. code-block:: yaml
-    master_tops:
-      cobbler: {}
 
-    cobbler.url: https://example.com/cobbler_api #default is http://localhost/cobbler_api
+  master_tops:
-    cobbler.user: username # default is no username
+    cobbler: {}
-    cobbler.password: password # default is no password
+  cobbler.url: https://example.com/cobbler_api #default is http://localhost/cobbler_api
+  cobbler.user: username # default is no username
+  cobbler.password: password # default is no password
 
+
+Module Documentation
+====================
 '''
 
 # Import python libs