summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/api.rst1
-rw-r--r--docs/api/personality.rst9
-rw-r--r--docs/api/request.rst5
-rw-r--r--docs/narr/project.rst15
-rw-r--r--docs/narr/webob.rst6
5 files changed, 33 insertions, 3 deletions
diff --git a/docs/api.rst b/docs/api.rst
index 8e7c0c283..e457d28f0 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -20,6 +20,7 @@ documentation is organized alphabetically by module name.
api/interfaces
api/location
api/paster
+ api/personality
api/renderers
api/request
api/router
diff --git a/docs/api/personality.rst b/docs/api/personality.rst
new file mode 100644
index 000000000..7eb964e76
--- /dev/null
+++ b/docs/api/personality.rst
@@ -0,0 +1,9 @@
+.. _personality_module:
+
+:mod:`pyramid.personality.pylons`
+---------------------------------
+
+.. module:: pyramid.personality.pylons
+
+.. function:: renderer_globals_factory_config
+
diff --git a/docs/api/request.rst b/docs/api/request.rst
index 9e851ba8d..97b164428 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -93,3 +93,8 @@
``request.session`` attribute will cause a
:class:`pyramid.exceptions.ConfigurationError` to be raised.
+ .. attribute:: tmpl_context
+
+ The template context for Pylons-style applications.
+
+
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 0e18f0924..f88496fcc 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -21,6 +21,9 @@ templates".
single: pyramid_zodb paster template
single: pyramid_alchemy paster template
single: pyramid_routesalchemy paster template
+ single: pylons_minimal paster template
+ single: pylons_basic paster template
+ single: pylons_sqla paster template
.. _additional_paster_templates:
@@ -52,6 +55,18 @@ The included templates are these:
URL mapping via :term:`traversal` and persistence via
:term:`SQLAlchemy`
+``pylons_minimal``
+ URL mapping via :term:`URL dispatch` and Pylons-style view handlers,
+ minimal setup.
+
+``pylons_basic``
+ URL mapping via :term:`URL dispatch` and Pylons-style view handlers,
+ and some extra functionality.
+
+``pylons_sqla``
+ URL mapping via :term:`URL dispatch` and Pylons-style view handlers,
+ some extra functionality, and SQLAlchemy set up.
+
Each of these project templates uses :term:`ZCML` instead of
:term:`imperative configuration`. Each also makes the assumption that
you want your code to live in a Python :term:`package`. Even if your
diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst
index 15f8da9cf..b41979a1f 100644
--- a/docs/narr/webob.rst
+++ b/docs/narr/webob.rst
@@ -112,9 +112,9 @@ Special Attributes Added to the Request by :mod:`pyramid`
In addition to the standard :term:`WebOb` attributes, :mod:`pyramid`
adds special attributes to every request: ``context``, ``registry``,
``root``, ``subpath``, ``traversed``, ``view_name``, ``virtual_root``
-, ``virtual_root_path``, and ``session``. These attributes are
-documented further within the :class:`pyramid.request.Request` API
-documentation.
+, ``virtual_root_path``, ``session``, and ``tmpl_context``. These
+attributes are documented further within the
+:class:`pyramid.request.Request` API documentation.
.. index::
single: request URLs