summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/databases.rst
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-04-12 18:03:57 -0600
committerBert JW Regeer <bertjw@regeer.org>2016-04-12 18:03:57 -0600
commitf3420699895969e825913da51dedfa5b880bc7d5 (patch)
tree40bace55d7c03e53c490b465df2b5b27e024b1a6 /docs/quick_tutorial/databases.rst
parentc8a9a4a279b7568657c5dc3e8f2ad8da31be5890 (diff)
parentefaf7300c9c3ef2a795aae7f724bf5b02e96cd75 (diff)
downloadpyramid-f3420699895969e825913da51dedfa5b880bc7d5.tar.gz
pyramid-f3420699895969e825913da51dedfa5b880bc7d5.tar.bz2
pyramid-f3420699895969e825913da51dedfa5b880bc7d5.zip
Merge branch 'master' into feature/BeforeTraversal
Diffstat (limited to 'docs/quick_tutorial/databases.rst')
-rw-r--r--docs/quick_tutorial/databases.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/quick_tutorial/databases.rst b/docs/quick_tutorial/databases.rst
index 19dfd066d..f9f548585 100644
--- a/docs/quick_tutorial/databases.rst
+++ b/docs/quick_tutorial/databases.rst
@@ -53,7 +53,7 @@ Steps
.. note::
- We aren't yet doing ``$VENV/bin/python setup.py develop`` as we
+ We aren't yet doing ``$VENV/bin/pip install -e .`` as we
will change it later.
#. Our configuration file at ``databases/development.ini`` wires
@@ -78,7 +78,7 @@ Steps
.. code-block:: bash
- $ $VENV/bin/python setup.py develop
+ $ $VENV/bin/pip install -e .
#. The script references some models in ``databases/tutorial/models.py``:
@@ -176,7 +176,7 @@ module.
The ``initialize_tutorial_db`` is a nice example of framework support.
You point your setup at the location of some ``[console_scripts]`` and
-these get generated into your virtualenv's ``bin`` directory. Our
+these get generated into your virtual environment's ``bin`` directory. Our
console script follows the pattern of being fed a configuration file
with all the bootstrapping. It then opens SQLAlchemy and creates the
root of the wiki, which also makes the SQLite file. Note the