diff options
| author | Chris McDonough <chrism@agendaless.com> | 2010-02-03 04:24:06 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2010-02-03 04:24:06 +0000 |
| commit | 3f7735c6d1f56e3bde8a1fec8c8f6e4a57c20676 (patch) | |
| tree | 020eac8768c890079928f13b31e94c9f6895ec9e | |
| parent | 394c7b268f86eb0496ba0151ac582f140fe06772 (diff) | |
| download | pyramid-3f7735c6d1f56e3bde8a1fec8c8f6e4a57c20676.tar.gz pyramid-3f7735c6d1f56e3bde8a1fec8c8f6e4a57c20676.tar.bz2 pyramid-3f7735c6d1f56e3bde8a1fec8c8f6e4a57c20676.zip | |
Renderings.
| -rw-r--r-- | docs/copyright.rst | 2 | ||||
| -rw-r--r-- | docs/narr/introduction.rst | 2 | ||||
| -rw-r--r-- | docs/narr/zca.rst | 6 | ||||
| -rw-r--r-- | repoze/bfg/url.py | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst index 28b6a4089..c927bc859 100644 --- a/docs/copyright.rst +++ b/docs/copyright.rst @@ -90,5 +90,5 @@ via http://bfg.repoze.org. Errata ------ -Errata for this book will be placed at http://bfg.repoze.org/book_errata. +Errata for this book will be placed at `http://bfg.repoze.org/book_errata`. diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 3410e6868..b4d10e7e5 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -165,7 +165,7 @@ common framework configuration tasks such as adding a view or a route. In Zope, :term:`ZCML` is typically required for similar purposes. In :term:`Grok`, a Zope-based web framework, :term:`decorator` objects and class-level declarations are used for this purpose. -:mod:`repoze.bfg` *supports* :term:`ZCML` and supports decorator-based +:mod:`repoze.bfg` supports :term:`ZCML` and decorator-based configuration, but does not require either. See :ref:`configuration_narr` for more information. diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst index 0a2fc5808..418312caa 100644 --- a/docs/narr/zca.rst +++ b/docs/narr/zca.rst @@ -127,14 +127,14 @@ interface of a registry instead, you need only know how to obtain the There are two ways of doing so: -- use the :func:`repoze.bfg.threadlocal.get_current_registry`` +- use the :func:`repoze.bfg.threadlocal.get_current_registry` function within :mod:`repoze.bfg` view or model code. This will always return the "current" :mod:`repoze.bfg` application registry. - use the attribute of the :term:`request` object named ``registry`` in your :mod:`repoze.bfg` view code, eg. ``request.registry``. This - is the application registry related to the running :mod:`repoze.bfg` - application. + is the ZCA component registry related to the running + :mod:`repoze.bfg` application. See :ref:`threadlocals_chapter` for more information about :func:`repoze.bfg.threadlocal.get_current_registry`. diff --git a/repoze/bfg/url.py b/repoze/bfg/url.py index b8340be6f..15dabaa61 100644 --- a/repoze/bfg/url.py +++ b/repoze/bfg/url.py @@ -34,9 +34,9 @@ def route_url(route_name, request, *elements, **kw): route_url('foobar', request, foo='1') => <KeyError exception> route_url('foobar', request, foo='1', bar='2') => <KeyError exception> route_url('foobar', request, foo='1', bar='2', - 'traverse=('a','b')) => http://e.com/1/2/a/b + 'traverse=('a','b')) => http://e.com/1/2/a/b route_url('foobar', request, foo='1', bar='2', - 'traverse=('/a/b')) => http://e.com/1/2/a/b + 'traverse=('/a/b')) => http://e.com/1/2/a/b Values replacing ``:segment`` arguments can be passed as strings or Unicode objects. They will be encoded to UTF-8 and URL-quoted |