Merge pull request #30668 from multani/fix/docs

Fix salt.modules.mount documentation
This commit is contained in:
Nicole Thomas 2016-01-27 10:18:43 -07:00
commit de81a85e73

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
'''
Salt module to manage unix mounts and the fstab file
Salt module to manage Unix mounts and the fstab file
'''
# Import python libs
@ -331,7 +331,7 @@ def rm_fstab(name, device, config='/etc/fstab'):
.. code-block:: bash
salt '*' mount.rm_fstab /mnt/foo
salt '*' mount.rm_fstab /mnt/foo /dev/sdg
'''
modified = False
@ -498,7 +498,7 @@ def rm_automaster(name, device, config='/etc/auto_salt'):
.. code-block:: bash
salt '*' mount.rm_automaster /mnt/foo
salt '*' mount.rm_automaster /mnt/foo /dev/sdg
'''
contents = automaster(config)
if name not in contents:
@ -671,13 +671,13 @@ def set_automaster(
def automaster(config='/etc/auto_salt'):
'''
List the contents of the fstab
List the contents of the auto master
CLI Example:
.. code-block:: bash
salt '*' mount.fstab
salt '*' mount.automaster
'''
ret = {}
if not os.path.isfile(config):
@ -806,7 +806,8 @@ def umount(name, device=None, user=None, util='mount'):
salt '*' mount.umount /mnt/foo
.. versionadded:: 2015.5.0
.. versionadded:: 2015.5.0
.. code-block:: bash
salt '*' mount.umount /mnt/foo /dev/xvdc1
'''