diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-14 17:35:18 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-14 17:35:18 -0400 |
| commit | e9a747eeccd81ba2303372e661a92491fa8594c9 (patch) | |
| tree | fba62bd3f394a7bc38bcbfe1fdf01ed6789f33ce /docs | |
| parent | 5b5cd6fa80421b594fa14a75f3daf6a5703f1898 (diff) | |
| parent | 11027dc3d17dc687a51551dddb37da929ca2c0ba (diff) | |
| download | pyramid-e9a747eeccd81ba2303372e661a92491fa8594c9.tar.gz pyramid-e9a747eeccd81ba2303372e661a92491fa8594c9.tar.bz2 pyramid-e9a747eeccd81ba2303372e661a92491fa8594c9.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/commandline.rst | 4 | ||||
| -rw-r--r-- | docs/narr/install.rst | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst index 0c591f6d1..68078ab70 100644 --- a/docs/narr/commandline.rst +++ b/docs/narr/commandline.rst @@ -277,8 +277,8 @@ For example: catchall /*subpath <function static_view> ``paster proutes`` generates a table. The table has three columns: a Name -name column, a Pattern column, and a View column. The items listed in the -Name column are route names, the items listen in the Pattern column are route +column, a Pattern column, and a View column. The items listed in the +Name column are route names, the items listed in the Pattern column are route patterns, and the items listed in the View column are representations of the view callable that will be invoked when a request matches the associated route pattern. The view column may show ``None`` if no associated view diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 837db5a94..5b9e22182 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -14,7 +14,7 @@ run :app:`Pyramid`. .. sidebar:: Python Versions - As of this writing, :app:`Pyramid` has been tested under Python 2.5.5 and + As of this writing, :app:`Pyramid` has been tested under Python 2.5.5, Python 2.6.6, and Python 2.7.2. :app:`Pyramid` does not run under any version of Python before 2.5, and does not yet run under Python 3.X. @@ -73,9 +73,9 @@ manager. For example, this works to do so on an Ubuntu Linux system: On Mac OS X, installing `XCode <http://developer.apple.com/tools/xcode/>`_ has much the same effect. -Once you've got development tools installed on your system, On the -same system, to install a Python 2.6 interpreter from *source*, use -the following commands: +Once you've got development tools installed on your system, you can +install a Python 2.6 interpreter from *source*, on the same system, +using the following commands: .. code-block:: text |