valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed misc rST syntax errors

Browse Source
This commit is contained in:
Seth House 2012-10-04 15:00:26 -06:00
parent 5e5a51c49c
commit 4246b27ff0
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ref/configuration/minion.rst
View File

@ -112,7 +112,7 @@ The location for minion cache data.
cachedir: /var/cache/salt
.. conf_minion:: cachedir
.. conf_minion:: backup_mode
``backup_mode``
---------------

2
doc/ref/esky.rst
View File

@ -57,7 +57,7 @@ Gotchas
My Windows minion isn't responding
----------------------------------
The process dispatch on Windows is slower than it is on *nix. You may need to
The process dispatch on Windows is slower than it is on \*nix. You may need to
add '-t 15' to your salt calls to give them plenty of time to return.
Windows and the Visual Studio Redist

4
doc/topics/installation/solaris.rst
View File

@ -58,7 +58,7 @@ Ok, time to install salt.
root> /opt/csw/bin/pkgutil -i -y py_salt
Minion Configuration
=============
====================
Now that salt is installed you can find it's configuration files in:
@ -105,7 +105,7 @@ Run a simple test against the minion:
salt '<your-salt-minion>' test.ping
Troubleshooting
=============
===============
Logs are in ``/var/log/salt``

2
doc/topics/releases/0.10.3.rst
View File

@ -49,7 +49,7 @@ The ability to generate fingerprints of keys used by Salt has been added to
``salt-key``. The new option `finger` accepts the name of the key to generate
and display a fingerprint for.
.. code-block:: base
.. code-block:: bash
salt-key -F master

2
doc/topics/targeting/nodegroups.rst
View File

@ -11,7 +11,7 @@ Node groups
Nodegroups are declared using a compound target specification. The compount
target documentation can be found here:
:doc:`Compound Matchers <topics/targeting/compound>`
:doc:`Compound Matchers <compound>`
For example, in the master config file :conf_master:`nodegroups` setting::

12
salt/modules/ldap.py
View File

@ -7,16 +7,16 @@ REQUIREMENT 1:
In order to connect to LDAP, certain configuration is required
in the salt minion config on the LDAP server.
The minimum configuration items that must be set are:
The minimum configuration items that must be set are::
ldap.basedn: dc=acme,dc=com (example values, adjust to suit)
If your LDAP server requires authentication then you must also set:
If your LDAP server requires authentication then you must also set::
ldap.binddn: <user>
ldap.bindpw: <password>
In addition, the following optional values may be set:
In addition, the following optional values may be set::
ldap.server: localhost (default=localhost)
ldap.port: 389 (default=389, standard port)
@ -97,11 +97,11 @@ def search(filter, dn=None, scope=None, attrs=None, **kwargs):
'''
Run an LDAP query and return the results.
CLI Examples:
CLI Examples::
salt 'ldaphost' ldap.search filter=cn=myhost
returns:
returns::
'myhost': { 'count': 1,
'results': [['cn=myhost,ou=hosts,o=acme,c=gb',
@ -110,7 +110,7 @@ def search(filter, dn=None, scope=None, attrs=None, **kwargs):
'time': {'human': '1.2ms', 'raw': '0.00123'}}}
Search and connection options can be overridden by specifying the relevant
option as key=value pairs, for example:
option as key=value pairs, for example::
salt 'ldaphost' ldap.search filter=cn=myhost dn=ou=hosts,o=acme,c=gb scope=1 attrs='' server=localhost port=7393 tls=True bindpw=ssh
'''