From c1bc021263d4ae2299851b809d5c4d0e48399f61 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 10 Nov 2009 05:03:02 +0000 Subject: Templates --------- - Remove ``ez_setup.py`` and its import from all paster templates, samples, and tutorials for ``distribute`` compatibility. The documentation already explains how to install virtualenv (which will include some ``setuptools`` package), so these files, imports and usages were superfluous. Deprecations ------------ - The ``options`` kw arg to the ``repoze.bfg.router.make_app`` function is deprecated. In its place is the keyword argument ``settings``. The ``options`` keyword continues to work, and a deprecation warning is not emitted when it is detected. However, the paster templates, code samples, and documentation now make reference to ``settings`` rather than ``options``. This change/deprecation was mainly made for purposes of clarity and symmetry with the ``get_settings()`` API and dicussions of "settings" in various places in the docs: we want to use the same name to refer to the same thing everywhere. --- docs/tutorials/bfgwiki2/basiclayout.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/tutorials/bfgwiki2/basiclayout.rst') diff --git a/docs/tutorials/bfgwiki2/basiclayout.rst b/docs/tutorials/bfgwiki2/basiclayout.rst index 8f28cce37..4cb37aa91 100644 --- a/docs/tutorials/bfgwiki2/basiclayout.rst +++ b/docs/tutorials/bfgwiki2/basiclayout.rst @@ -138,6 +138,6 @@ be in ``run.py`` and its ``app`` function: :mod:`repoze.bfg` :term:`traversal` mechanism. Since this is a URL dispatch application, the root factory is ``None``. The second argument is the *package* representing our application, and the - third argument, ``options`` is passed as a keyword argument. It - contains a dictionary of options parsed by PasteDeploy. + third argument, ``settings`` is passed as a keyword argument. It + contains a dictionary of settings parsed by PasteDeploy. -- cgit v1.2.3