diff options
| author | Chris McDonough <chrism@plope.com> | 2014-05-05 23:56:09 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-05-05 23:56:09 -0400 |
| commit | 7423971bf8aaa5fd205778820d91a6c7e3cea1bd (patch) | |
| tree | 35130316c871ff0d8c41c3ad57a5f5cc1d876c7c /docs/quick_tutorial/requirements.rst | |
| parent | 7a6bf6f0ff1b85d0158ad49fc21037db4999c1cf (diff) | |
| parent | f9bc568657f316f20b5f576085472b80dec15cba (diff) | |
| download | pyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.tar.gz pyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.tar.bz2 pyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.zip | |
fix merge conflicts
Diffstat (limited to 'docs/quick_tutorial/requirements.rst')
| -rw-r--r-- | docs/quick_tutorial/requirements.rst | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst index 72bb4a4f8..b5778ea42 100644 --- a/docs/quick_tutorial/requirements.rst +++ b/docs/quick_tutorial/requirements.rst @@ -187,9 +187,15 @@ pipe it to your environment's version of Python. $ wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | $VENV/bin/python # Windows - # Use your browser to download: - # https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.p - # ...into c:\projects\quick_tutorial\ez_setup.py + # + # Use your web browser to download this file: + # https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py + # + # ...and save it to: + # c:\projects\quick_tutorial\ez_setup.py + # + # Then run the following command: + c:\> %VENV%\Scripts\python ez_setup.py If ``wget`` complains with a certificate error, then run this command instead: |