summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-15 19:08:28 -0500
committerChris McDonough <chrism@plope.com>2011-01-15 19:08:28 -0500
commit2c4cd00d071d53efc560fb38f63d7db4a162e13b (patch)
treed9aed9f00f4a11ececd692f71daca9f20b5239fb /docs/narr
parentf2681ae753b9cc94f88b4cf47fa44714ff20216a (diff)
parent3d0d55e3f04810f4da83f4b794eb30f605f86d0e (diff)
downloadpyramid-2c4cd00d071d53efc560fb38f63d7db4a162e13b.tar.gz
pyramid-2c4cd00d071d53efc560fb38f63d7db4a162e13b.tar.bz2
pyramid-2c4cd00d071d53efc560fb38f63d7db4a162e13b.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/project.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 5af8c3231..46de560c2 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -601,7 +601,7 @@ or influencing runtime behavior of a :app:`Pyramid` application. See
default 'application' (although it's actually a pipeline of middleware and an
application) run by ``paster serve`` when it is invoked against this
configuration file. The name ``main`` is a convention used by PasteDeploy
-signifying that it the default application.
+signifying that it is the default application.
The ``[server:main]`` section of the configuration file configures a WSGI
server which listens on TCP port 6543. It is configured to listen on all
@@ -705,7 +705,8 @@ who want to use your application.
be included in the tarball. If you don't use Subversion, and instead use
a different version control system, you may need to install a setuptools
add-on such as ``setuptools-git`` or ``setuptools-hg`` for this behavior
- to work properly.
+ to work properly. Alternatively, you can specify the non-Python-source
+ files by hand in a ``manifest template``, called ``MANIFEST.in`` by default.
``setup.cfg``
~~~~~~~~~~~~~