summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-03-21 13:44:50 -0700
committerTres Seaver <tseaver@palladion.com>2013-03-21 13:44:50 -0700
commit056b0901b4577cbbee1ae37f462cbcf7f247880e (patch)
tree6fe1bf32736d9fbdf3ce0f041cb2709baa71f744 /docs/tutorials
parentf38126c3214c936f022e68a1cac88c3cd8644879 (diff)
parent1ec39d51636ec72ef55b6bfb6c3115cc0be7c160 (diff)
downloadpyramid-056b0901b4577cbbee1ae37f462cbcf7f247880e.tar.gz
pyramid-056b0901b4577cbbee1ae37f462cbcf7f247880e.tar.bz2
pyramid-056b0901b4577cbbee1ae37f462cbcf7f247880e.zip
Merge pull request #932 from stevepiercy/master
Clean up SQLite3 language; cd into venv; minor heading renames
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki2/installation.rst28
1 files changed, 17 insertions, 11 deletions
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index e646f63d2..4361f18e8 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -67,28 +67,35 @@ Install Pyramid Into the Virtual Python Environment
c:\env> %VENV%\Scripts\easy_install pyramid
-SQLite3
--------
+Install SQLite3 and Its Development Packages
+--------------------------------------------
-Install SQLite3 and its development packages if you don't already
-have them installed. Usually this is via your system's package
-manager. On a Debian system, this would be:
+If you used a package manager to install your Python or if you compiled
+your Python from source, then you must install SQLite3 and its
+development packages. If you downloaded your Python as an installer
+from python.org, then you already have it installed and can proceed to
+the next section :ref:`sql_making_a_project`..
+
+If you need to install the SQLite3 packages, then, for example, using
+the Debian system and apt-get, the command would be the following:
.. code-block:: text
$ sudo apt-get install libsqlite3-dev
-Entering the virtualenv
------------------------
+Change Directory to Your Virtual Python Environment
+---------------------------------------------------
+
+Change directory to the ``pyramidtut`` directory.
-Do not forget to switch to the ``pyramidtut`` directory.
-In order to do so, run this command if you are on Unix:
+**On UNIX:**
.. code-block:: text
$ cd pyramidtut
-And run this if you are on Windows:
+**On Windows**
+=======
.. code-block:: text
@@ -361,4 +368,3 @@ the following assumptions:
mechanism to map URLs to code (:term:`traversal`). However, for the
purposes of this tutorial, we'll only be using url dispatch and
SQLAlchemy.
-