Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:Pylons/pyramid

  • Loading branch information...
commit 2ca9bde9d2862655ddee276cd14a375e6a5adec6 2 parents 2f7aa7c + c31a81c
@mcdonc mcdonc authored
Showing with 25 additions and 10 deletions.
  1. +6 −0 CHANGES.txt
  2. +19 −10 docs/tutorials/wiki2/installation.rst
View
6 CHANGES.txt
@@ -36,26 +36,32 @@ Bug Fixes
.. code-block:: python
class IResource(Interface):
+
...
@view_config(context=IResource)
def get(context, request):
+
...
@view_config(context=IResource, request_method='POST')
def post(context, request):
+
...
@view_config(context=IResource, request_method='DELETE')
def delete(context, request):
+
...
@implementor(IResource)
class MyResource:
+
...
@view_config(context=MyResource, request_method='POST')
def override_post(context, request):
+
...
Previously the override_post view registration would hide the get
View
29 docs/tutorials/wiki2/installation.rst
@@ -2,13 +2,23 @@
Installation
============
-Preparation
-===========
+Before You Begin
+================
+
+Installation Requirements
+-------------------------
Follow the steps in :ref:`installing_chapter`, but name the virtualenv
-directory ``pyramidtut``.
+directory ``pyramidtut``. Following these steps will ensure you have met the
+following requirements:
-Preparation, UNIX
+* Python interpreter is installed on your operating system
+* :term:`setuptools` or :term:`distribute` is installed
+* :term:`virtualenv` is installed
+* a virtual Python environment named ``pyramidtut`` has been created
+* Pyramid is installed
+
+UNIX Requirements
-----------------
#. Install SQLite3 and its development packages if you don't already
@@ -25,8 +35,7 @@ Preparation, UNIX
$ cd pyramidtut
-
-Preparation, Windows
+Windows Requirements
--------------------
#. Switch to the ``pyramidtut`` directory:
@@ -66,11 +75,11 @@ On Windows:
startup problems, try putting both the virtualenv and the project
into directories that do not contain spaces in their paths.
-Pcreate is a script that comes with Pyramid that helps by creating and organizing files
-needed as part of a Pyramid project. By passing in `alchemy` was are asking the script to
-create the files needed to use SQLAlchemy. By passing in our app name `tutorial` it goes through and
+`pcreate` is a script that comes with Pyramid that helps by creating and organizing files
+needed as part of a Pyramid project. By passing in `alchemy`, we are asking the script to
+create the files needed to use SQLAlchemy. By passing in our app name `tutorial`, the script
places that application name in all the different files required. For example, the ``initialize_tutorial_db``
-that is in the ``pyramidtut/bin`` directory that we use later in this tutorial was created by `pcreate`
+that is in the ``pyramidtut/bin`` directory was created by `pcreate`.
Please sign in to comment.
Something went wrong with that request. Please try again.