summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-03-05 12:58:00 -0800
committerTres Seaver <tseaver@palladion.com>2013-03-05 12:58:00 -0800
commitdc017478b2378fa8b163d1ab296e1af4cf365d9d (patch)
tree2e7c5b781b9fbdcb46dc5226449ad66d7fb59f6e /docs
parent319a0c295f2e10cf19cc7e648cd0bd52ff603f50 (diff)
parentc4c182b47d1abdf899077ecd433a268618f4f493 (diff)
downloadpyramid-dc017478b2378fa8b163d1ab296e1af4cf365d9d.tar.gz
pyramid-dc017478b2378fa8b163d1ab296e1af4cf365d9d.tar.bz2
pyramid-dc017478b2378fa8b163d1ab296e1af4cf365d9d.zip
Merge pull request #887 from tshepang/concise
be more concise; simplify; remove obvious info
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/paste.rst2
-rw-r--r--docs/narr/project.rst17
2 files changed, 4 insertions, 15 deletions
diff --git a/docs/narr/paste.rst b/docs/narr/paste.rst
index 86b047aec..aee5f9069 100644
--- a/docs/narr/paste.rst
+++ b/docs/narr/paste.rst
@@ -62,7 +62,7 @@ Take a look at the generated ``setup.py`` file for this project.
:language: python
:linenos:
-Note that the ``entry_point`` line in ``setup.py`` points at a string which
+Note that ``entry_points`` is assigned a string which
looks a lot like an ``.ini`` file. This string representation of an ``.ini``
file has a section named ``[paste.app_factory]``. Within this section, there
is a key named ``main`` (the entry point name) which has a value
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 5ddf89ec4..214440328 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -459,20 +459,9 @@ Put a hash mark at the beginning of the ``pyramid_debugtoolbar`` line:
Then restart the application to see that the toolbar has been turned off.
Note that if you comment out the ``pyramid_debugtoolbar`` line, the ``#``
-*must* be in the first column. If you put the hash mark anywhere except the
-first column instead, for example like this:
-
-.. code-block:: ini
- :linenos:
-
- [app:main]
- ...
- pyramid.includes =
- #pyramid_debugtoolbar
-
-When you attempt to restart the application with a section like the above
-you'll receive an error that ends something like this, and the application
-will not start:
+*must* be in the first column. If you put it anywhere else,
+and then attempt to restart the application,
+you'll receive an error that ends something like this:
.. code-block:: text