Use 1.1 index.

Explain where "request" comes from in templates.

4 files changed, 21 insertions, 12 deletions

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index e15c4afbf..52f92960f 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -236,10 +236,10 @@ virtualenv (``bfgenv``) directory:
 .. code-block:: bash
    :linenos:
 
-   $ bin/easy_install -i http://dist.repoze.org/bfg/current/simple repoze.bfg
+   $ bin/easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg
 
 .. warning:: Note carefully the ``-i
-   http://dist.repoze.org/bfg/current/simple`` above.  It is required.
+   http://dist.repoze.org/bfg/1.1/simple`` above.  It is required.
    :mod:`repoze.bfg` software is maintained in its own index;
    :mod:`repoze.bfg` cannot be installed from PyPI.
 
@@ -288,12 +288,12 @@ Installing :mod:`repoze.bfg` on a Windows System
 #. (Optional) Consider using ``bin\activate.bat`` to make your shell
    environment wired to use the virtualenv.
 
-#. Use ``easy_install`` and point to the BFG "current index to get BFG
+#. Use ``easy_install`` and point to the BFG "1.1" index to get BFG
    and its direct dependencies installed:
 
    .. code-block:: bat
 
-     c:\bfgenv> Scripts\easy_install -i http://dist.repoze.org/bfg/current/simple repoze.bfg
+     c:\bfgenv> Scripts\easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg
 
 Installing :mod:`repoze.bfg` on Google App Engine
 -------------------------------------------------
diff --git a/docs/tutorials/bfgwiki/installation.rst b/docs/tutorials/bfgwiki/installation.rst
index 53adec6bd..df3eeee93 100644
--- a/docs/tutorials/bfgwiki/installation.rst
+++ b/docs/tutorials/bfgwiki/installation.rst
@@ -51,12 +51,12 @@ Preparation, UNIX
 #. (Optional) Consider using ``source bin/activate`` to make your
    shell environment wired to use the virtualenv.
 
-#. Use ``easy_install`` and point to the BFG "current" index to get
+#. Use ``easy_install`` and point to the BFG "1.1" index to get
    :mod:`repoze.bfg` and its direct dependencies installed:
 
    .. code-block:: bash
 
-     $ bin/easy_install -i http://dist.repoze.org/bfg/current/simple repoze.bfg
+     $ bin/easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg
 
 #. Use ``easy_install`` to install ``docutils``, ``repoze.tm``,
    ``repoze.zodbconn``, ``repoze.who``, ``nose`` and ``coverage`` from
@@ -104,12 +104,12 @@ Preparation, Windows
 #. (Optional) Consider using ``bin\activate.bat`` to make your shell
    environment wired to use the virtualenv.
 
-#. Use ``easy_install`` and point to the BFG "current" index to get
+#. Use ``easy_install`` and point to the BFG "1,1" index to get
    :mod:`repoze.bfg` and its direct dependencies installed:
 
    .. code-block:: bat
 
-     c:\bigfntut> Scripts/easy_install -i http://dist.repoze.org/bfg/current/simple repoze.bfg
+     c:\bigfntut> Scripts/easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg
 
 #. Use ``easy_install`` to install ``docutils``, ``repoze.tm``,
    ``repoze.zodbconn``, ``repoze.who``, ``nose`` and ``coverage`` from
diff --git a/docs/tutorials/bfgwiki2/definingviews.rst b/docs/tutorials/bfgwiki2/definingviews.rst
index 35e02b1cc..c4c609ff2 100644
--- a/docs/tutorials/bfgwiki2/definingviews.rst
+++ b/docs/tutorials/bfgwiki2/definingviews.rst
@@ -208,6 +208,15 @@ the below:
    :linenos:
    :language: xml
 
+.. note:: The names available for our use in a template are always
+   those that are present in the dictionary returned by the view
+   callable.  But our templates make use of a ``request`` object that
+   none of our tutorial views return in their dictionary.  This value
+   appears as if "by magic".  However, ``request`` is one of several
+   names that are available "by default" in a template when a template
+   renderer is used.  See :ref:`chameleon_template_renderers` for more
+   information about other names that are available by default in a
+   template when a Chameleon template is used as a renderer.
 
 The ``edit.pt`` Template
 ------------------------
diff --git a/docs/tutorials/bfgwiki2/installation.rst b/docs/tutorials/bfgwiki2/installation.rst
index 03f629ad9..22fc6b563 100644
--- a/docs/tutorials/bfgwiki2/installation.rst
+++ b/docs/tutorials/bfgwiki2/installation.rst
@@ -56,12 +56,12 @@ Preparation, UNIX
 #. (Optional) Consider using ``source bin/activate`` to make your
    shell environment wired to use the virtualenv.
 
-#. Use ``easy_install`` and point to the BFG "current" index to get
+#. Use ``easy_install`` and point to the BFG "1.1" index to get
    :mod:`repoze.bfg` and its direct dependencies installed:
 
    .. code-block:: bash
 
-     $ bin/easy_install -i http://dist.repoze.org/bfg/current/simple repoze.bfg
+     $ bin/easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg
 
 #. Use ``easy_install`` to install various packages from PyPI.
 
@@ -106,12 +106,12 @@ Preparation, Windows
 #. (Optional) Consider using ``bin\activate.bat`` to make your shell
    environment wired to use the virtualenv.
 
-#. Use ``easy_install`` and point to the BFG "current" index to get
+#. Use ``easy_install`` and point to the BFG "1.1" index to get
    :mod:`repoze.bfg` and its direct dependencies installed:
 
    .. code-block:: bat
 
-     c:\bigfntut> Scripts/easy_install -i http://dist.repoze.org/bfg/current/simple repoze.bfg
+     c:\bigfntut> Scripts/easy_install -i http://dist.repoze.org/bfg/1.1/simple repoze.bfg
 
 #. Use ``easy_install`` to install various packages from PyPI.