diff options
| author | Steve Piercy <web@stevepiercy.com> | 2013-03-21 13:32:14 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2013-03-21 13:32:14 -0700 |
| commit | a17c712f7f836b3506be069f60ee9ed8a8edb42b (patch) | |
| tree | d42a28e8b692fd6da1289c2ca8f99a18a8a3e59f /docs/tutorials/wiki2/installation.rst | |
| parent | 124daa3f3de2350ee4079d684736acd10b415046 (diff) | |
| parent | f38126c3214c936f022e68a1cac88c3cd8644879 (diff) | |
| download | pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.tar.gz pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.tar.bz2 pyramid-a17c712f7f836b3506be069f60ee9ed8a8edb42b.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
docs/tutorials/wiki2/installation.rst
Diffstat (limited to 'docs/tutorials/wiki2/installation.rst')
| -rw-r--r-- | docs/tutorials/wiki2/installation.rst | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst index a8b8ee877..dd7c76d5f 100644 --- a/docs/tutorials/wiki2/installation.rst +++ b/docs/tutorials/wiki2/installation.rst @@ -70,6 +70,7 @@ Install Pyramid Into the Virtual Python Environment Install SQLite3 and Its Development Packages -------------------------------------------- +<<<<<<< HEAD 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 @@ -78,23 +79,40 @@ 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: +======= +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: +>>>>>>> upstream/master .. code-block:: text $ sudo apt-get install libsqlite3-dev +<<<<<<< HEAD Change Directory to Your Virtual Python Environment --------------------------------------------------- Change directory to the ``pyramidtut`` directory. **On UNIX:** +======= +Entering the virtualenv +----------------------- + +Do not forget to switch to the ``pyramidtut`` directory. +In order to do so, run this command if you are on Unix: +>>>>>>> upstream/master .. code-block:: text $ cd pyramidtut +<<<<<<< HEAD **On Windows** +======= +And run this if you are on Windows: +>>>>>>> upstream/master .. code-block:: text |