Merge pull request #14119 from gravyboat/develop

Fixed a few more files with code block issues.

doc/topics/installation/debian.rst

@@ -11,41 +11,49 @@ Configure Apt
 
 
 Squeeze (Old Stable)
-~~~~~~~~~~~~~~~~~~~~
+--------------------
 
 For squeeze, you will need to enable the Debian backports repository
 as well as the debian.saltstack.com repository. To do so, add the
 following to ``/etc/apt/sources.list`` or a file in
-``/etc/apt/sources.list.d``::
+``/etc/apt/sources.list.d``:
 
-  deb http://debian.saltstack.com/debian squeeze-saltstack main
+.. code-block:: bash
-  deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free
+
+    deb http://debian.saltstack.com/debian squeeze-saltstack main
+    deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free
 
 
 
 Wheezy (Stable)
-~~~~~~~~~~~~~~~
+---------------
 
 For wheezy, the following line is needed in either
-``/etc/apt/sources.list`` or a file in ``/etc/apt/sources.list.d``::
+``/etc/apt/sources.list`` or a file in ``/etc/apt/sources.list.d``:
 
-  deb http://debian.saltstack.com/debian wheezy-saltstack main
+.. code-block:: bash
+
+    deb http://debian.saltstack.com/debian wheezy-saltstack main
 
 Jessie (Testing)
-~~~~~~~~~~~~~~~~
+----------------
 
 For jessie, the following line is needed in either
-``/etc/apt/sources.list`` or a file in ``/etc/apt/sources.list.d``::
+``/etc/apt/sources.list`` or a file in ``/etc/apt/sources.list.d``:
 
-  deb http://debian.saltstack.com/debian jessie-saltstack main
+.. code-block:: bash
+
+    deb http://debian.saltstack.com/debian jessie-saltstack main
 
 Sid (Unstable)
-~~~~~~~~~~~~~~
+--------------
 
 For sid, the following line is needed in either
-``/etc/apt/sources.list`` or a file in ``/etc/apt/sources.list.d``::
+``/etc/apt/sources.list`` or a file in ``/etc/apt/sources.list.d``:
 
-  deb http://debian.saltstack.com/debian unstable main
+.. code-block:: bash
+
+    deb http://debian.saltstack.com/debian unstable main
 
 
 Import the repository key.
@@ -60,7 +68,9 @@ You will need to import the key used for signing.
 .. note:: 
  
     You can optionally verify the key integrity with ``sha512sum`` using the 
-    public key signature shown here. E.g::
+    public key signature shown here. E.g:
+
+    .. code-block:: bash
 
         echo "b702969447140d5553e31e9701be13ca11cc0a7ed5fe2b30acb8491567560ee62f834772b5095d735dfcecb2384a5c1a20045f52861c417f50b68dd5ff4660e6  debian-salt-team-joehealy.gpg.key" | sha512sum -c
 

doc/topics/installation/index.rst

@@ -71,7 +71,7 @@ vary:
 Salt defaults to the `ZeroMQ`_ transport, and the choice can be made at install 
 time, for example:
 
-.. code-block:: console
+.. code-block:: bash
 
     python setup.py install --salt-transport=raet
 
@@ -81,7 +81,7 @@ be.
 If installing using pip, the ``--salt-transport`` install option can be 
 provided like:
 
-.. code-block:: console
+.. code-block:: bash
 
   pip install --install-option="--salt-transport=raet" salt
 

doc/topics/tutorials/salt_bootstrap.rst

@@ -59,7 +59,7 @@ bottom and use the instructions for `Installing via an Insecure One-Liner`_
 
 Using ``curl`` to install latest git:
 
-.. code:: console
+.. code:: bash
 
   curl -L https://bootstrap.saltstack.com -o install_salt.sh
   sudo sh install_salt.sh git develop
@@ -67,7 +67,7 @@ Using ``curl`` to install latest git:
 
 Using ``wget`` to install your distribution's stable packages:
 
-.. code:: console
+.. code:: bash
 
   wget -O install_salt.sh https://bootstrap.saltstack.com
   sudo sh install_salt.sh
@@ -75,14 +75,14 @@ Using ``wget`` to install your distribution's stable packages:
 
 Install a specific version from git using ``wget``:
 
-.. code:: console
+.. code:: bash
 
   wget -O install_salt.sh https://bootstrap.saltstack.com
   sudo sh install_salt.sh -P git v0.16.4
 
 If you already have python installed, ``python 2.6``, then it's as easy as:
 
-.. code:: console
+.. code:: bash
 
   python -m urllib "https://bootstrap.saltstack.com" > install_salt.sh
   sudo sh install_salt.sh git develop
@@ -90,7 +90,7 @@ If you already have python installed, ``python 2.6``, then it's as easy as:
 
 All python versions should support the following one liner:
 
-.. code:: console
+.. code:: bash
 
   python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' > install_salt.sh
   sudo sh install_salt.sh git develop
@@ -99,7 +99,7 @@ All python versions should support the following one liner:
 On a FreeBSD base system you usually don't have either of the above binaries available. You **do** 
 have ``fetch`` available though:
 
-.. code:: console
+.. code:: bash
 
   fetch -o install_salt.sh https://bootstrap.saltstack.com
   sudo sh install_salt.sh
@@ -107,21 +107,21 @@ have ``fetch`` available though:
 
 If all you want is to install a ``salt-master`` using latest git:
 
-.. code:: console
+.. code:: bash
 
   curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com
   sudo sh install_salt.sh.sh -M -N git develop
 
 If you want to install a specific release version (based on the git tags):
 
-.. code:: console
+.. code:: bash
 
   curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com
   sudo sh install_salt.sh.sh git v0.16.4
 
 To install a specific branch from a git fork:
 
-.. code:: console
+.. code:: bash
 
   curl -o install_salt.sh.sh -L https://bootstrap.saltstack.com
   sudo sh install_salt.sh.sh -g https://github.com/myuser/salt.git git mybranch
@@ -142,7 +142,7 @@ Examples
 
 Installing the latest develop branch of Salt:
 
-.. code:: console
+.. code:: bash
 
   curl -L https://bootstrap.saltstack.com | sudo sh -s -- git develop
 

doc/topics/tutorials/writing_tests.rst

@@ -43,7 +43,7 @@ like package installation.
 To write a destructive test import and use the `destructiveTest` decorator for
 the test method:
 
-.. code-block:: yaml
+.. code-block:: python
 
     import integration
     from salttesting.helpers import destructiveTest