summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-03 15:11:54 -0400
committerChris McDonough <chrism@plope.com>2012-08-03 15:11:54 -0400
commit92b64cca2994774987cbce88cef89e9f71366185 (patch)
tree12074d3509c8c549a81d0523d4967d8fae1cc05d /docs
parentc2000a61c0b2eb637c31b1123d2ed59a0d08acbe (diff)
parentaa62a18c7e5f39a42ca777c871cf7cf61ffd869b (diff)
downloadpyramid-92b64cca2994774987cbce88cef89e9f71366185.tar.gz
pyramid-92b64cca2994774987cbce88cef89e9f71366185.tar.bz2
pyramid-92b64cca2994774987cbce88cef89e9f71366185.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
-rw-r--r--docs/index.rst12
-rw-r--r--docs/narr/firstapp.rst3
2 files changed, 5 insertions, 10 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 31c2fde6b..c84314274 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,15 +13,9 @@ Here is one of the simplest :app:`Pyramid` applications you can make:
.. literalinclude:: narr/helloworld.py
-When saved to ``helloworld.py``, the above application can be run via:
-
-.. code-block:: text
-
- $ easy_install pyramid
- $ python helloworld.py
-
-When you visit ``http://localhost:8080/hello/world`` in a browser, you will
-see the text ``Hello, world!``.
+After you install :app:`Pyramid` and run this application, 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
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index 1ca188d7e..a86826d86 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -8,7 +8,8 @@ Creating Your First :app:`Pyramid` Application
In this chapter, we will walk through the creation of a tiny :app:`Pyramid`
application. After we're finished creating the application, we'll explain in
-more detail how it works.
+more detail how it works. It assumes you already have :app:`Pyramid` installed.
+If you do not, head over to the :ref:`installing_chapter` section.
.. _helloworld_imperative: