diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-09 03:47:10 -0700 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-09 03:47:10 -0700 |
| commit | 43850d404e77f050930ec32226670c54f78be347 (patch) | |
| tree | ec39301f2e098373600dcaabb05710fcb9a71e64 | |
| parent | bc9357ffcec3f6bb5f7798f0e0610d604dcafae8 (diff) | |
| parent | 3970b06caa0e51fadc9525c7f4ac83b733fd19be (diff) | |
| download | pyramid-43850d404e77f050930ec32226670c54f78be347.tar.gz pyramid-43850d404e77f050930ec32226670c54f78be347.tar.bz2 pyramid-43850d404e77f050930ec32226670c54f78be347.zip | |
Merge pull request #271 from stevepiercy/patch-4
Removed line break in hyphenation of "import-time" which rendered as "imp
| -rw-r--r-- | docs/narr/introduction.rst | 6 |
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 |