mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
doc: fix warnings + some rendering issues
This commit is contained in:
parent
50f48c4bf3
commit
6922da46dc
11 changed files with 13 additions and 15 deletions
|
@ -2794,7 +2794,7 @@ for pre-2015.8.0 minions. 2015.8.0 and later minions use
|
|||
.. conf_master:: winrepo_dir_ng
|
||||
|
||||
``winrepo_dir_ng``
|
||||
---------------
|
||||
------------------
|
||||
|
||||
.. versionadded:: 2015.8.0
|
||||
A new :ref:`ng <windows-package-manager>` repo was added.
|
||||
|
@ -2865,7 +2865,7 @@ event that an error is introduced in the latest revision of the repo.
|
|||
.. conf_master:: winrepo_remotes_ng
|
||||
|
||||
``winrepo_remotes_ng``
|
||||
-------------------
|
||||
----------------------
|
||||
|
||||
.. versionadded:: 2015.8.0
|
||||
A new :ref:`ng <windows-package-manager>` repo was added.
|
||||
|
|
|
@ -484,7 +484,7 @@ behavior is to have time-frame within all minions try to reconnect.
|
|||
.. conf_minion:: return_retry_timer
|
||||
|
||||
``return_retry_timer``
|
||||
-------------------
|
||||
----------------------
|
||||
|
||||
Default: ``5``
|
||||
|
||||
|
@ -498,7 +498,7 @@ The default timeout for a minion return attempt.
|
|||
.. conf_minion:: return_retry_timer_max
|
||||
|
||||
``return_retry_timer_max``
|
||||
-------------------
|
||||
--------------------------
|
||||
|
||||
Default: ``10``
|
||||
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
.. _module-sync:
|
||||
|
||||
===========================
|
||||
.. _dynamic-module-distribution:
|
||||
|
||||
===========================
|
||||
Dynamic Module Distribution
|
||||
===========================
|
||||
|
||||
|
@ -51,4 +50,4 @@ Sync Via the saltutil Module
|
|||
The saltutil module has a number of functions that can be used to sync all
|
||||
or specific dynamic modules. The saltutil module function ``saltutil.sync_all``
|
||||
will sync all module types over to a minion. For more information see:
|
||||
:mod:`salt.modules.saltutil`
|
||||
:mod:`salt.modules.saltutil`
|
||||
|
|
|
@ -912,7 +912,7 @@ point, and should be stored immediately.
|
|||
salt-cloud -f create_keypair ec2 keyname=mykeypair
|
||||
|
||||
Importing a Key Pair
|
||||
-------------------
|
||||
--------------------
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
|
|
@ -77,11 +77,6 @@ def trigger_event(event=None, **kwargs):
|
|||
:param event: The name of the event to trigger.
|
||||
|
||||
:return: A dictionary with status, text, and error if result was failure.
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: yaml
|
||||
TBA
|
||||
'''
|
||||
|
||||
res = {'result': False, 'message': 'Something went wrong'}
|
||||
|
|
|
@ -149,7 +149,7 @@ It is capable of handling single rows or multiple rows per minion.
|
|||
Configuration of the connection depends on the adapter in use.
|
||||
|
||||
More complete example for MySQL (to also show configuration)
|
||||
=====================================
|
||||
============================================================
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ To connect as a user other than root, modify the cloud configuration file
|
|||
usually located at /etc/salt/cloud. For example, add the following:
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
ssh_username: my_user
|
||||
sudo: True
|
||||
'''
|
||||
|
|
|
@ -101,6 +101,7 @@ passed in as a dict, or as a string to pull from pillars or minion config:
|
|||
- name: mycert
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
create keys for user:
|
||||
boto_iam.keys_present:
|
||||
- name: myusername
|
||||
|
|
|
@ -6,6 +6,7 @@ Management of PostgreSQL tablespace
|
|||
A module used to create and manage PostgreSQL tablespaces.
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
ssd-tablespace:
|
||||
postgres_tablespace.present:
|
||||
- name: indexes
|
||||
|
|
|
@ -364,7 +364,7 @@ def key_absent(name, force=False, use_32bit_registry=False):
|
|||
|
||||
Example:
|
||||
|
||||
.. codeblock:: yaml
|
||||
.. code-block:: yaml
|
||||
|
||||
'HKEY_CURRENT_USER\SOFTWARE\Salt':
|
||||
reg.key_absent:
|
||||
|
|
|
@ -125,6 +125,7 @@ handle properly formatting the text before writing the output.
|
|||
/srv/salt/cert.sls
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
/usr/local/share/ca-certificates:
|
||||
file.directory: []
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue