update

3 files changed, 27 insertions, 34 deletions

diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index edf954587..62a588187 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -285,9 +285,9 @@ segment replacement marker.  For example, for the URL ``/abc/``:
 
 - ``/:foo/`` will match.
 
-.. warning:: Due to a bug, the
-   must-be-one-character-to-match-segment-marker rule new to version
-   1.3.  It is untrue for older releases.
+.. warning:: The must-be-one-character-to-match-segment-marker rule is
+   new in version 1.3.  It is untrue for older releases, but this was
+   due to a bug.
 
 Note that values representing path segments matched with a
 ``:segment`` match will be url-unquoted and decoded from UTF-8 into
diff --git a/docs/tutorials/bfgwiki/installation.rst b/docs/tutorials/bfgwiki/installation.rst
index e58d73493..4425a4606 100644
--- a/docs/tutorials/bfgwiki/installation.rst
+++ b/docs/tutorials/bfgwiki/installation.rst
@@ -40,7 +40,8 @@ Preparation, UNIX
 
    .. code-block:: bash
 
-     $ path/to/my/Python-2.6/bin/virtualenv --no-site-packages bigfntut
+     $ path/to/my/Python-2.6/bin/virtualenv --no-site-packages \
+               bigfntut
 
 #. Switch to the ``bigfntut`` directory:
 
@@ -51,23 +52,21 @@ 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 :mod:`repoze.bfg` "current"
-   index to get :mod:`repoze.bfg` and its direct dependencies
-   installed:
+#. Use ``easy_install`` 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 repoze.bfg
 
 #. Use ``easy_install`` to install ``docutils``, ``repoze.tm``,
-   ``repoze.zodbconn``, ``repoze.who``, ``nose`` and ``coverage`` from
+   ``repoze.zodbconn``, ``nose`` and ``coverage`` from
    a different custom index (the "bfgsite" index).
 
    .. code-block:: bash
 
-     $ bin/easy_install -i http://dist.repoze.org/bfgsite/simple \
-        docutils repoze.tm repoze.zodbconn repoze.who nose coverage
+     $ bin/easy_install docutils repoze.tm repoze.zodbconn \
+               nose coverage
 
 Preparation, Windows
 --------------------
@@ -106,24 +105,21 @@ 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 :mod:`repoze.bfg` "current"
-   index to get :mod:`repoze.bfg` and its direct dependencies
-   installed:
+#. Use ``easy_install`` 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 repoze.bfg
 
 #. Use ``easy_install`` to install ``docutils``, ``repoze.tm``,
-   ``repoze.zodbconn``, ``repoze.who``, ``nose`` and ``coverage`` from
-   a *different* index (the "bfgsite" index).
+   ``repoze.zodbconn``, ``nose`` and ``coverage`` from a *different*
+   index (the "bfgsite" index).
 
    .. code-block:: bat
 
-     c:\bigfntut> Scripts\easy_install -i \
-           http://dist.repoze.org/bfgsite/simple docutils repoze.tm \
-           repoze.zodbconn repoze.who nose coverage
+     c:\bigfntut> Scripts\easy_install docutils repoze.tm \
+           repoze.zodbconn nose coverage
 
 .. _making_a_project:
 
diff --git a/docs/tutorials/bfgwiki2/installation.rst b/docs/tutorials/bfgwiki2/installation.rst
index 1225bb18a..6fd31ce65 100644
--- a/docs/tutorials/bfgwiki2/installation.rst
+++ b/docs/tutorials/bfgwiki2/installation.rst
@@ -56,20 +56,19 @@ 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
-   :mod:`repoze.bfg` and its direct dependencies installed:
+#. Use ``easy_install`` to get :mod:`repoze.bfg` and its direct
+   dependencies installed:
 
    .. code-block:: text
 
-      $ bin/easy_install -i http://dist.repoze.org/bfg/current/simple 
-                 repoze.bfg
+      $ bin/easy_install repoze.bfg
 
 #. Use ``easy_install`` to install various packages from PyPI.
 
    .. code-block:: text
 
-      $ bin/easy_install docutils nose coverage zope.sqlalchemy SQLAlchemy \
-                repoze.tm2
+      $ bin/easy_install docutils nose coverage zope.sqlalchemy \
+                SQLAlchemy repoze.tm2
 
 Preparation, Windows
 --------------------
@@ -108,20 +107,18 @@ 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
-   :mod:`repoze.bfg` and its direct dependencies installed:
+#. Use ``easy_install`` to get :mod:`repoze.bfg` and its direct
+   dependencies installed:
 
    .. code-block:: text
 
-      c:\bigfntut> Scripts\easy_install -i \
-                http://dist.repoze.org/bfg/current/simple repoze.bfg
+      c:\bigfntut> Scripts\easy_install repoze.bfg
 
 #. Use ``easy_install`` to install various packages from PyPI.
 
    .. code-block:: text
 
-      c:\bigfntut> Scripts\easy_install -i \
-               http://dist.repoze.org/bfg/current/simple docutils \
+      c:\bigfntut> Scripts\easy_install -i docutils \
                nose coverage zope.sqlalchemy SQLAlchemy repoze.tm2