diff options
| author | Chris McDonough <chrism@plope.com> | 2011-10-25 06:55:08 -0700 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-10-25 06:55:08 -0700 |
| commit | 548ec90863ccdb4f1b4dcb0280adcb2466924323 (patch) | |
| tree | 2679b0ba9f45ac2d6cac097435ee36c999c922c1 | |
| parent | c5a8dea7ca6a5b8a039cfa57e518c1783b407fc8 (diff) | |
| parent | 62912fda287f613c4a7180c55a31b349e01e6aa8 (diff) | |
| download | pyramid-548ec90863ccdb4f1b4dcb0280adcb2466924323.tar.gz pyramid-548ec90863ccdb4f1b4dcb0280adcb2466924323.tar.bz2 pyramid-548ec90863ccdb4f1b4dcb0280adcb2466924323.zip | |
Merge pull request #324 from cypha/fix.diveintopythonlink
Fix.diveintopythonlink
| -rw-r--r-- | docs/narr/startup.rst | 14 | ||||
| -rw-r--r-- | docs/narr/testing.rst | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst index f4ebef154..971d12b45 100644 --- a/docs/narr/startup.rst +++ b/docs/narr/startup.rst @@ -76,12 +76,14 @@ Here's a high-level time-ordered overview of what happens when you press Note that the constructor function accepts a ``global_config`` argument, which is a dictionary of key/value pairs mentioned in the ``[DEFAULT]`` - section of an ``.ini`` file. It also accepts a ``**settings`` argument, - which collects another set of arbitrary key/value pairs. The arbitrary - key/value pairs received by this function in ``**settings`` will be - composed of all the key/value pairs that are present in the ``[app:main]`` - section (except for the ``use=`` setting) when this function is called by - when you run ``pserve``. + section of an ``.ini`` file (if `[DEFAULT] + <http://docs.pylonsproject.org/projects/pyramid/dev/narr/paste.html + #defaults-section-of-a-pastedeploy-ini-file>`__ is present). It also + accepts a ``**settings`` argument, which collects another set of arbitrary + key/value pairs. The arbitrary key/value pairs received by this function + in ``**settings`` will be composed of all the key/value pairs that are + present in the ``[app:main]`` section (except for the ``use=`` setting) + when this function is called by when you run ``pserve``. Our generated ``development.ini`` file looks like so: diff --git a/docs/narr/testing.rst b/docs/narr/testing.rst index 05e851fde..7ee432fa7 100644 --- a/docs/narr/testing.rst +++ b/docs/narr/testing.rst @@ -52,7 +52,7 @@ The suggested mechanism for unit and integration testing of a :app:`Pyramid` application is the Python :mod:`unittest` module. Although this module is named :mod:`unittest`, it is actually capable of driving both unit and integration tests. A good :mod:`unittest` tutorial is available within `Dive -Into Python <http://diveintopython.org/unit_testing/index.html>`_ by Mark +Into Python <http://diveintopython.nfshost.com/unit_testing/index.html>`_ by Mark Pilgrim. :app:`Pyramid` provides a number of facilities that make unit, integration, |