Merge pull request #16213 from terminalmage/docs

Fix some outdated docs references
This commit is contained in:
Thomas S Hatch 2014-09-29 19:52:29 -06:00
commit 035d20ecaf
3 changed files with 8 additions and 10 deletions

View File

@ -40,6 +40,8 @@ def _pecl(command, defaults=False):
def install(pecls, defaults=False, force=False, preferred_state='stable'):
'''
.. versionadded:: 0.17.0
Installs one or several pecl extensions.
pecls
@ -53,9 +55,6 @@ def install(pecls, defaults=False, force=False, preferred_state='stable'):
force
Whether to force the installed version or not
.. note::
The ``defaults`` option will be available in version 0.17.0.
CLI Example:
.. code-block:: bash

View File

@ -99,11 +99,11 @@ def present(name,
If ``True``, then ``password`` and ``password_hash`` can be omitted to
permit a passwordless login.
unix_socket
If ``True`` and allow_passwordless is ``True`` then will be used unix_socket auth plugin.
.. versionadded:: 0.16.2
.. note::
The ``allow_passwordless`` option will be available in version 0.16.2.
unix_socket
If ``True`` and allow_passwordless is ``True``, the unix_socket auth
plugin will be used.
'''
ret = {'name': name,
'changes': {},

View File

@ -36,6 +36,8 @@ def installed(name,
force=False,
preferred_state='stable'):
'''
.. versionadded:: 0.17.0
Make sure that a pecl extension is installed.
name
@ -55,9 +57,6 @@ def installed(name,
preferred_state
The pecl extension state to install
.. note::
The ``defaults`` option will be available in version 0.17.0.
'''
# Check to see if we have a designated version
if not isinstance(version, string_types) and version is not None: