diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/registry.rst | 4 | ||||
| -rwxr-xr-x | docs/make_book | 2 | ||||
| -rwxr-xr-x | docs/make_epub | 2 | ||||
| -rwxr-xr-x | docs/make_pdf | 2 | ||||
| -rw-r--r-- | docs/narr/install.rst | 4 | ||||
| -rw-r--r-- | docs/narr/viewconfig.rst | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki/design.rst | 4 |
7 files changed, 12 insertions, 8 deletions
diff --git a/docs/api/registry.rst b/docs/api/registry.rst index 1d5d52248..4c1af2678 100644 --- a/docs/api/registry.rst +++ b/docs/api/registry.rst @@ -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. diff --git a/docs/make_book b/docs/make_book index 22883ac4a..94e249441 100755 --- a/docs/make_book +++ b/docs/make_book @@ -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 diff --git a/docs/make_epub b/docs/make_epub index 868749e3b..cf9263451 100755 --- a/docs/make_epub +++ b/docs/make_epub @@ -1,2 +1,2 @@ #!/bin/sh -make clean epub SPHINXBUILD=../env26/bin/sphinx-build +make clean epub SPHINXBUILD=../env/bin/sphinx-build diff --git a/docs/make_pdf b/docs/make_pdf index 558feb857..6c9863bc9 100755 --- a/docs/make_pdf +++ b/docs/make_pdf @@ -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 diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 882e76f11..a1c7b0d64 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -52,6 +52,10 @@ command: $ sudo apt-get install python2.7-dev +This command will install both the Python interpreter and its development +header files. Note that the headers are required by some (optional) C +extensions in software depended upon by Pyramid, not by Pyramid itself. + Once these steps are performed, the Python interpreter will usually be invokable via ``python2.7`` from a shell prompt. diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst index 6373a8d26..799de768f 100644 --- a/docs/narr/viewconfig.rst +++ b/docs/narr/viewconfig.rst @@ -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. diff --git a/docs/tutorials/wiki/design.rst b/docs/tutorials/wiki/design.rst index c94612fb1..b44ccb10e 100644 --- a/docs/tutorials/wiki/design.rst +++ b/docs/tutorials/wiki/design.rst @@ -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 |