diff options
| author | Steve Piercy <web@stevepiercy.com> | 2013-03-19 23:10:56 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2013-03-19 23:10:56 -0700 |
| commit | 07c189da9a9fa4a1a4231dbfff34ed77d09f73d1 (patch) | |
| tree | 4cb7479b14e784cda92ceffb9305b673071310e8 | |
| parent | 5075c8c728af46efc666c90d438dd6fbb7a840ba (diff) | |
| download | pyramid-07c189da9a9fa4a1a4231dbfff34ed77d09f73d1.tar.gz pyramid-07c189da9a9fa4a1a4231dbfff34ed77d09f73d1.tar.bz2 pyramid-07c189da9a9fa4a1a4231dbfff34ed77d09f73d1.zip | |
Fix whitespace in CHANGES.txt to permit build.
Add "Before You Begin" section.
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/installation.rst | 21 |
2 files changed, 21 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 86257cc22..6ff54884a 100644 --- a/CHANGES.txt +++ b/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 diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst index 253296b95..8c4149bfc 100644 --- a/docs/tutorials/wiki2/installation.rst +++ b/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: |