diff options
| author | Michael Merickel <michael@merickel.org> | 2017-06-18 01:46:27 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2017-06-18 01:46:27 -0500 |
| commit | 75c30dfe18b26ca04efae2acbe35052fa0d93ed6 (patch) | |
| tree | ebb57879035b60a801cd4deb113c4091956b67be /docs/tutorials/wiki/installation.rst | |
| parent | 4983421128e2e0fc92c771510f7b3af57de6d855 (diff) | |
| parent | 5c437abba0926f6093efbd481e49763de2436665 (diff) | |
| download | pyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.tar.gz pyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.tar.bz2 pyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.zip | |
Merge branch 'master' into pr/3034
Diffstat (limited to 'docs/tutorials/wiki/installation.rst')
| -rw-r--r-- | docs/tutorials/wiki/installation.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst index de057b1cc..e9a93f9fe 100644 --- a/docs/tutorials/wiki/installation.rst +++ b/docs/tutorials/wiki/installation.rst @@ -31,7 +31,7 @@ On UNIX .. code-block:: bash $ cd ~ - $ cookiecutter https://github.com/Pylons/pyramid-cookiecutter-zodb + $ cookiecutter gh:Pylons/pyramid-cookiecutter-zodb --checkout 1.9-branch On Windows ^^^^^^^^^^ @@ -39,7 +39,7 @@ On Windows .. code-block:: doscon c:\> cd \ - c:\> cookiecutter https://github.com/Pylons/pyramid-cookiecutter-zodb + c:\> cookiecutter gh:Pylons/pyramid-cookiecutter-zodb --checkout 1.9-branch On all operating systems ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -180,12 +180,12 @@ Testing requirements are defined in our project's ``setup.py`` file, in the ``te .. 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 .. _running_tests: |