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

Updated the debian and index doc files within the installation topic to fix code blocks.

Browse Source
This commit is contained in:
Forrest Alvarez 2014-07-10 14:59:37 -07:00
parent 208832f9ab
commit fd2ecf41bd
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
doc/topics/installation/debian.rst
View File

@ -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
deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free
.. code-block:: bash
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

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

@ -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