Merge pull request #26851 from jacobhammons/doc-bugs

states/pkgrepo examples, suse installation updates

doc/ref/modules/index.rst

@@ -256,6 +256,7 @@ You can call the logger from custom modules to write messages to the minion
 logs. The following code snippet demonstrates writing log messages:
 
 .. code-block:: python
+
     import logging
 
     log = logging.getLogger(__name__)

doc/ref/states/writing.rst

@@ -207,6 +207,7 @@ You can call the logger from custom modules to write messages to the minion
 logs. The following code snippet demonstrates writing log messages:
 
 .. code-block:: python
+
     import logging
 
     log = logging.getLogger(__name__)

doc/topics/installation/suse.rst

@@ -9,7 +9,7 @@ all package development will be done there.
 Installation
 ============
 
-Salt can be installed using ``zypper`` and is available in the standard openSUSE 13.1
+Salt can be installed using ``zypper`` and is available in the standard openSUSE
 repositories.
 
 Stable Release
@@ -101,6 +101,16 @@ For openSUSE Factory run the following as root:
     zypper refresh
     zypper install salt salt-minion salt-master
 
+
+For openSUSE 13.2 run the following as root:
+
+.. code-block:: bash
+
+    zypper addrepo http://download.opensuse.org/repositories/devel:languages:python/openSUSE_13.2/devel:languages:python.repo
+    zypper refresh
+    zypper install salt salt-minion salt-master
+
+
 For openSUSE 13.1 run the following as root:
 
 .. code-block:: bash

salt/states/pkgrepo.py

@@ -34,6 +34,28 @@ these states. Here is some example SLS:
         - name: logstash
         - refresh: True
 
+.. code-block:: yaml
+
+    base:
+      pkgrepo.managed:
+        - humanname: deb-multimedia
+        - name: deb http://www.deb-multimedia.org stable main
+        - file: /etc/apt/sources.list.d/deb-multimedia.list
+        - key_url: salt://deb-multimedia/files/marillat.pub
+
+.. code-block:: yaml
+
+    base:
+      pkgrepo.managed:
+        - humanname: Google Chrome
+        - name: deb http://dl.google.com/linux/chrome/deb/ stable main
+        - dist: stable
+        - file: /etc/apt/sources.list.d/chrome-browser.list
+        - require_in:
+          - pkg: google-chrome-stable
+        - gpgcheck: 1
+        - key_url: https://dl-ssl.google.com/linux/linux_signing_key.pub
+
 .. code-block:: yaml
 
     base:
@@ -186,8 +208,11 @@ def managed(name, **kwargs):
 
     key_url
        URL to retrieve a GPG key from. Allows the usage of ``http://``,
-       ``https://`` as well as ``salt://``. Use either ``keyid``/``keyserver``
-       or ``key_url``, but not both.
+       ``https://`` as well as ``salt://``.
+
+       .. note::
+
+           Use either ``keyid``/``keyserver`` or ``key_url``, but not both.
 
     consolidate
        If set to true, this will consolidate all sources definitions to