Browse files

Merge pull request #926 from stevepiercy/master

Add "Before You Begin"; fix whitespace in CHANGES.txt so it builds
  • Loading branch information...
2 parents 5075c8c + 07c189d commit c31a81c10470bd0c11f49b5b2ba86684bf566997 @mcdonc mcdonc committed Mar 20, 2013
Showing with 21 additions and 6 deletions.
  1. +6 −0 CHANGES.txt
  2. +15 −6 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
21 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:

0 comments on commit c31a81c

Please sign in to comment.