Merge pull request #54624 from garethgreenaway/2019_2_1_port_50904

[master] Porting #50904 to master

doc/topics/proxyminion/beacon.rst

@@ -22,15 +22,13 @@ configuring and managing multiple ``salt-proxy`` processes.
        - p8000
 
 This says that Salt's pillar should load some values for the proxy ``p8000``
-from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
+from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
 
-2. In the pillar root for your base environment, create this file:
+2. In the pillar root for your base environment, create the ``p8000.sls`` file with the
+   following contents: 
 
 .. code-block:: yaml
 
-   p8000.sls
-   ---------
-
    proxy:
      # set proxytype for your proxymodule
      proxytype: ssh_sample

doc/topics/proxyminion/demo.rst

@@ -58,16 +58,14 @@ Now, configure your salt-proxy.
 
 
 This says that Salt's pillar should load some values for the proxy ``p8000``
-from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
+from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
 
-3. In the pillar root for your base environment, create this file:
+3. In the pillar root for your base environment, create the ``p8000.sls`` file with the
+   following contents:
 
 
 .. code-block:: yaml
 
-   p8000.sls
-   ---------
-
    proxy:
      proxytype: rest_sample
      url: http://<IP your REST listens on>:port

doc/topics/proxyminion/ssh.rst

@@ -35,16 +35,14 @@ Now, configure your salt-proxy.
 
 
 This says that Salt's pillar should load some values for the proxy ``p8000``
-from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
+from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
 
-3. In the pillar root for your base environment, create this file:
+3. In the pillar root for your base environment, create the ``p8000.sls`` file with the
+   following contents: 
 
 
 .. code-block:: yaml
 
-   p8000.sls
-   ---------
-
    proxy:
      proxytype: ssh_sample
      host: saltyVM

doc/topics/proxyminion/state.rst

@@ -23,15 +23,13 @@ on the remote end.
        - p8000
 
 This says that Salt's pillar should load some values for the proxy ``p8000``
-from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
+from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
 
-2. In the pillar root for your base environment, create this file:
+2. In the pillar root for your base environment, create the ``p8000.sls`` file with the
+   following contents:
 
 .. code-block:: yaml
 
-   p8000.sls
-   ---------
-
    proxy:
      # set proxytype for your proxymodule
      proxytype: ssh_sample