From 814455d4475046a24cd11a30805a5db8d4e4ed13 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 9 Sep 2011 03:09:23 -0700 Subject: Insert missing "to". --- docs/narr/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 8694556b2..63f142124 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -618,7 +618,7 @@ A lot is made of the aesthetics of what *kinds* of objects you're allowed to return from view callables in various frameworks. In a previous section in this document we showed you that, if you use a :term:`renderer`, you can usually return a dictionary from a view callable instead of a full-on -:term:`Response` object. But some frameworks allow you return strings or +:term:`Response` object. But some frameworks allow you to return strings or tuples from view callables. When frameworks allow for this, code looks slightly prettier, because fewer imports need to be done, and there is less code. For example, compare this: -- cgit v1.2.3 From 7047d24edf7ade4e442d1e79dea33492f2a4ba45 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 9 Sep 2011 03:16:04 -0700 Subject: Corrected verb to agree with singular subject "Pyramid". --- docs/narr/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 8694556b2..ed0f322b6 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -715,7 +715,7 @@ Once this is done, both of these view callables will work: return (403, 'text/plain', "Forbidden") Pyramid defaults to explicit behavior, because it's the most generally -useful, but provide hooks that allow you to adapt the framework to localized +useful, but provides hooks that allow you to adapt the framework to localized aesthetic desires. See also :ref:`using_iresponse`. -- cgit v1.2.3 From 3970b06caa0e51fadc9525c7f4ac83b733fd19be Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 9 Sep 2011 03:23:49 -0700 Subject: Removed line break in hyphenation of "import-time" which rendered as "import- time". --- docs/narr/introduction.rst | 6 +++--- 1 file 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 -- cgit v1.2.3 From 157d3256acf633bb21cfd09e542c639672c2c579 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 9 Sep 2011 03:30:48 -0700 Subject: Correct spelling of "chages" to "changes". --- docs/narr/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 8694556b2..6bf2665ee 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -503,7 +503,7 @@ data if you're not extremely careful. Some data will have been written to the database that probably should not have. Having a centralized commit point saves you from needing to think about this; it's great for lazy people who also care about data integrity. Either the request completes -successfully, and all chages are committed, or it does not, and all changes +successfully, and all changes are committed, or it does not, and all changes are aborted. Also, Pyramid's transaction management system allows you to synchronize -- cgit v1.2.3 From efc17af3c788809db4fc50cd7c585f6545534933 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 9 Sep 2011 03:32:52 -0700 Subject: Insert missing "to". --- docs/narr/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 8694556b2..ef7615079 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -534,7 +534,7 @@ Configuration extensibility ~~~~~~~~~~~~~~~~~~~~~~~~~~~ Unlike other systems, Pyramid provides a structured "include" mechanism (see -:meth:`~pyramid.config.Configurator.include`) that allows you compose +:meth:`~pyramid.config.Configurator.include`) that allows you to compose applications from multiple Python packages. All the configuration statements that can be performed in your "main" Pyramid application can also be performed by included packages including the addition of views, routes, -- cgit v1.2.3 From 0e5e1bc169b137c03f9112925a10c2185c414292 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 9 Sep 2011 03:39:23 -0700 Subject: "internalization-related" s/b "internationalization-related" --- docs/narr/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 8694556b2..633b48d36 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -377,7 +377,7 @@ Example: :ref:`events_chapter` and :ref:`event_types`. Built-in internationalization ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Pyramid ships with internalization-related features in its core: +Pyramid ships with internationalization-related features in its core: localization, pluralization, and creating message catalogs from source files and templates. Pyramid allows for a plurality of message catalog via the use of translation domains: you can create a system that has its own translations -- cgit v1.2.3 From acf9ff6b8816afa4e0ce57b6301911fe343d4fb4 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 9 Sep 2011 03:42:38 -0700 Subject: "CMS systems" is redundant, so spelled out acronym. --- docs/narr/introduction.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 8694556b2..8cd6daba8 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -592,8 +592,8 @@ to be arbitrarily extensible: it's a lot easier to add a node to a tree than it is to shoehorn a route into an ordered list of other routes, or to create another entire instance of an application to service a department and glue code to allow disparate apps to share data. It's a great fit for sites that -naturally lend themselves to changing departmental hierarchies, such as CMS -systems and document management systems. Traversal also lends itself well to +naturally lend themselves to changing departmental hierarchies, such as +content management systems and document management systems. Traversal also lends itself well to systems that require very granular security ("Bob can edit *this* document" as opposed to "Bob can edit documents"). -- cgit v1.2.3