Merge branch 'master' into pr/3034

Michael Merickel

2017-06-18 75c30dfe18b26ca04efae2acbe35052fa0d93ed6

 docs/tutorials/wiki2/installation.rst

@@ -43,7 +43,7 @@
.. code-block:: bash

    $ cd ~
    $ cookiecutter https://github.com/Pylons/pyramid-cookiecutter-alchemy
    $ cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout 1.9-branch

On Windows
^^^^^^^^^^
@@ -51,7 +51,7 @@
.. code-block:: doscon

    c:\> cd \
    c:\> cookiecutter https://github.com/Pylons/pyramid-cookiecutter-alchemy
    c:\> cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout 1.9-branch

On all operating systems
^^^^^^^^^^^^^^^^^^^^^^^^
@@ -190,12 +190,12 @@
.. literalinclude:: src/installation/setup.py
   :language: python
   :lineno-match:
   :lines: 22-26
   :lines: 24-28

.. literalinclude:: src/installation/setup.py
   :language: python
   :lineno-match:
   :lines: 46-48
   :lines: 48-50


.. _sql_running_tests: