Permalink
Browse files

Merge branch 'master' of github.com:Pylons/pyramid

  • Loading branch information...
mcdonc committed Jan 2, 2013
2 parents 96ab9f2 + e006229 commit 1a19bf74afc768db45c77604c2cd33cc26af34c1
View
@@ -14,12 +14,12 @@
accessed as ``request.registry.settings`` or
``config.registry.settings`` in a typical Pyramid application.
- .. attribute:: introspector
+ .. attribute:: introspector
When a registry is set up (or created) by a :term:`Configurator`, the
registry will be decorated with an instance named ``introspector``
implementing the :class:`pyramid.interfaces.IIntrospector` interface.
- See also :attr:`pyramid.config.Configurator.introspector``.
+ See also :attr:`pyramid.config.Configurator.introspector`.
When a registry is created "by hand", however, this attribute will not
exist until set up by a configurator.
View
@@ -1,4 +1,4 @@
#!/bin/sh
-make clean latex SPHINXBUILD=../env26/bin/sphinx-build BOOK=1
+make clean latex SPHINXBUILD=../env/bin/sphinx-build BOOK=1
cd _build/latex && make all-pdf
View
@@ -1,2 +1,2 @@
#!/bin/sh
-make clean epub SPHINXBUILD=../env26/bin/sphinx-build
+make clean epub SPHINXBUILD=../env/bin/sphinx-build
View
@@ -1,4 +1,4 @@
#!/bin/sh
-make clean latex SPHINXBUILD=../env26/bin/sphinx-build
+make clean latex SPHINXBUILD=../env/bin/sphinx-build
cd _build/latex && make all-pdf
View
@@ -228,7 +228,7 @@ listens only on the ``127.0.0.1`` interface, which is problematic if you're
running the server on a remote system and you wish to access it with a web
browser from a local system. We also specify a TCP port number to listen on,
which is 8080, passing it as the second argument. The final argument is the
-``app`` object (a :term:`router`), which is the the application we wish to
+``app`` object (a :term:`router`), which is the application we wish to
serve. Finally, we call the server's ``serve_forever`` method, which starts
the main loop in which it will wait for requests from the outside world.
@@ -86,7 +86,7 @@ setup code. However, the above :term:`scan` execution
``config.scan('mypackage')`` will pick up all :term:`configuration
decoration`, including any objects decorated with the
:class:`pyramid.view.view_config` decorator in the ``mypackage`` Python
-pakage. For example, if you have a ``views.py`` in your package, a scan will
+package. For example, if you have a ``views.py`` in your package, a scan will
pick up any of its configuration decorators, so we can add one there that
that references ``myroute`` as a ``route_name`` parameter:
View
@@ -986,7 +986,7 @@ there's a ``should_cache`` GET or POST variable:
Note that the ``http_cache`` machinery will overwrite or add to caching
headers you set within the view itself unless you use ``prevent_auto``.
-You can also turn of the effect of ``http_cache`` entirely for the duration
+You can also turn off the effect of ``http_cache`` entirely for the duration
of a Pyramid application lifetime. To do so, set the
``PYRAMID_PREVENT_HTTP_CACHE`` environment variable or the
``pyramid.prevent_http_cache`` configuration value setting to a true value.
@@ -53,10 +53,10 @@ Security
We'll eventually be adding security to our application. The components we'll
use to do this are below.
-- USERS, a dictionary mapping users names to their
+- USERS, a dictionary mapping usernames to their
corresponding passwords.
-- GROUPS, a dictionary mapping user names to a
+- GROUPS, a dictionary mapping usernames to a
list of groups they belong to.
- ``groupfinder``, an *authorization callback* that looks up

0 comments on commit 1a19bf7

Please sign in to comment.