summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-10 00:09:29 -0400
committerChris McDonough <chrism@plope.com>2011-07-10 00:09:29 -0400
commitb45a60617e1f7e89289acf8d1df921696fa3e0a0 (patch)
tree3070ee582ae360fd5da363f0404acac4b212746d /docs/api
parent8cad6080cda9a72902333a70c20b58c5ea02226c (diff)
parent9e7162eb7f584e8afdbc2f04846d0d7e1fcf676c (diff)
downloadpyramid-b45a60617e1f7e89289acf8d1df921696fa3e0a0.tar.gz
pyramid-b45a60617e1f7e89289acf8d1df921696fa3e0a0.tar.bz2
pyramid-b45a60617e1f7e89289acf8d1df921696fa3e0a0.zip
Merge branch 'feature.pshell' of https://github.com/mmerickel/pyramid into mmerickel-feature.pshell
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/paster.rst7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/api/paster.rst b/docs/api/paster.rst
index 9ecfa3d9c..6668f3c77 100644
--- a/docs/api/paster.rst
+++ b/docs/api/paster.rst
@@ -5,9 +5,12 @@
.. module:: pyramid.paster
-.. function:: get_app(config_file, name)
+.. function:: get_app(config_file, name=None)
Return the WSGI application named ``name`` in the PasteDeploy
config file ``config_file``.
-
+ If the ``name`` is None, this will attempt to parse the name from
+ the ``config_file`` string expecting the format ``ini_file#name``.
+ If no name is found, the name will default to "main".
+