summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-15 21:36:19 -0500
committerChris McDonough <chrism@plope.com>2011-12-15 21:36:19 -0500
commit63f7a19b58738b8fe5fbe82f362825fa53ddc0d2 (patch)
treeae76a8285e901994ba62802b639802d2de2e0b0e /docs/index.rst
parent8e615c4f433c4df9b694c6452f793ed4763434ff (diff)
parent61838b76639d6dcf9facd549841a2ed0d07ea012 (diff)
downloadpyramid-63f7a19b58738b8fe5fbe82f362825fa53ddc0d2.tar.gz
pyramid-63f7a19b58738b8fe5fbe82f362825fa53ddc0d2.tar.bz2
pyramid-63f7a19b58738b8fe5fbe82f362825fa53ddc0d2.zip
Merge branch '1.3-branch'
Diffstat (limited to 'docs/index.rst')
-rw-r--r--docs/index.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/index.rst b/docs/index.rst
index df7a422d4..21e587992 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,10 +19,9 @@ When saved to ``helloworld.py``, the above application can be run via:
$ easy_install pyramid
$ python helloworld.py
- serving on 0.0.0.0:8080 view at http://127.0.0.1:8080
-And when you visit ``http://localhost:8080/hello/world`` in a browser, you
-will see the text ``Hello, world!``.
+When you visit ``http://localhost:8080/hello/world`` in a browser, you will
+see the text ``Hello, world!``.
See :ref:`firstapp_chapter` for a full explanation of how this application
works. Read the :ref:`html_narrative_documentation` to understand how
@@ -93,6 +92,7 @@ Narrative documentation in chapter form explaining how to use
narr/extending
narr/advconfig
narr/extconfig
+ narr/scaffolding
narr/threadlocals
narr/zca