Backport of:

saltstack/salt#49668 saltstack/salt#49669 saltstack/salt#49670 saltstack/salt#49803 saltstack/salt#49804 saltstack/salt#50126 saltstack/salt#50175 saltstack/salt#50302 saltstack/salt#50380 saltstack/salt#50396 saltstack/salt#50418 saltstack/salt#50452 saltstack/salt#50473 saltstack/salt#50541 saltstack/salt#50607 saltstack/salt#50635 saltstack/salt#50671 saltstack/salt#50706 saltstack/salt#50725 saltstack/salt#50801 saltstack/salt#50834 saltstack/salt#51074 saltstack/salt#51094 saltstack/salt#51135
aplanas · Jan 30, 2019 · 3ca915b · 3ca915b
1 parent a79ee21
commit 3ca915b
Show file tree

Hide file tree

Showing 32 changed files with 4,520 additions and 335 deletions.
diff --git a/doc/man/salt.7 b/doc/man/salt.7
@@ -45993,7 +45993,7 @@ moe:
 .UNINDENT
 .sp
 One way to think about this might be that the \fBgid\fP key is being assigned
-a value equivelent to the following python pseudo\-code:
+a value equivalent to the following python pseudo\-code:
 .INDENT 0.0
 .INDENT 3.5
 .sp

diff --git a/doc/topics/tutorials/states_pt3.rst b/doc/topics/tutorials/states_pt3.rst
@@ -141,7 +141,7 @@ The following example illustrates calling the ``group_to_gid`` function in the
         - gid: {{ salt['file.group_to_gid']('some_group_that_exists') }}
 
 One way to think about this might be that the ``gid`` key is being assigned
-a value equivelent to the following python pseudo-code:
+a value equivalent to the following python pseudo-code:
 
 .. code-block:: python
 
@@ -159,7 +159,7 @@ MAC address for eth0:
     salt['network.hw_addr']('eth0')
 
 To examine the possible arguments to each execution module function,
-one can examine the `module reference documentation </ref/modules/all>`:
+one can examine the `module reference documentation </ref/modules/all>`_:
 
 Advanced SLS module syntax
 ==========================