summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2011-09-09 03:23:49 -0700
committerSteve Piercy <web@stevepiercy.com>2011-09-09 03:23:49 -0700
commit3970b06caa0e51fadc9525c7f4ac83b733fd19be (patch)
treebe72c7a6c30e844088b2cb5ec984a9115b7b36d6 /docs
parent82dcba5bf8d6d024f42ded1565d30c314b8e8b4b (diff)
downloadpyramid-3970b06caa0e51fadc9525c7f4ac83b733fd19be.tar.gz
pyramid-3970b06caa0e51fadc9525c7f4ac83b733fd19be.tar.bz2
pyramid-3970b06caa0e51fadc9525c7f4ac83b733fd19be.zip
Removed line break in hyphenation of "import-time" which rendered as "import- time".
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/introduction.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 8694556b2..b2fb95c42 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -456,9 +456,9 @@ No singletons
Pyramid is written in such a way that it requires your application to have
exactly zero "singleton" data structures. Or, put another way, Pyramid
doesn't require you to construct any "mutable globals". Or put even a
-different way, an import of a Pyramid application needn't have any "import-
-time side effects". This is esoteric-sounding, but if you've ever tried to
-cope with parameterizing a Django "settings.py" file for multiple
+different way, an import of a Pyramid application needn't have any
+"import-time side effects". This is esoteric-sounding, but if you've ever
+tried to cope with parameterizing a Django "settings.py" file for multiple
installations of the same application, or if you've ever needed to
monkey-patch some framework fixture so that it behaves properly for your use
case, or if you've ever wanted to deploy your system using an asynchronous