summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-29 00:15:15 -0500
committerChris McDonough <chrism@plope.com>2011-01-29 00:15:15 -0500
commit63ddb0d595be05b4c18ccdf9514a4694efb03444 (patch)
tree91a2f6a52b09e81649a372134a1cefd71447aaca
parenta5ef0f1ce6b1daa019325d13e5a834d329a41d62 (diff)
downloadpyramid-63ddb0d595be05b4c18ccdf9514a4694efb03444.tar.gz
pyramid-63ddb0d595be05b4c18ccdf9514a4694efb03444.tar.bz2
pyramid-63ddb0d595be05b4c18ccdf9514a4694efb03444.zip
wording
-rw-r--r--pyramid/config.py8
-rw-r--r--pyramid/interfaces.py3
2 files changed, 6 insertions, 5 deletions
diff --git a/pyramid/config.py b/pyramid/config.py
index f24e0d1f5..5c97e25de 100644
--- a/pyramid/config.py
+++ b/pyramid/config.py
@@ -907,10 +907,10 @@ class Configurator(object):
return self.registry.settings
def make_wsgi_app(self):
- """ Returns a :app:`Pyramid` WSGI application representing
- the current configuration state and sends a
- :class:`pyramid.events.ApplicationCreated`
- event to all listeners."""
+ """ Commits any pending configuration statements, sends a
+ :class:`pyramid.events.ApplicationCreated` event to all listeners,
+ and returns a :app:`Pyramid` WSGI application representing the
+ committed configuration state."""
self.commit()
from pyramid.router import Router # avoid circdep
app = Router(self.registry)
diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py
index 62dd0b5a6..d462545a2 100644
--- a/pyramid/interfaces.py
+++ b/pyramid/interfaces.py
@@ -618,6 +618,7 @@ class IRendererInfo(Interface):
type = Attribute('The renderer type name')
registry = Attribute('The "current" application registry when the '
'renderer was created')
- settings = Attribute('The ISettings dictionary related to the current app')
+ settings = Attribute('The deployment settings dictionary related '
+ 'to the current application')