summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/install.rst15
-rw-r--r--docs/narr/introspector.rst17
2 files changed, 32 insertions, 0 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index e8482a289..882e76f11 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -243,6 +243,21 @@ Once you've got setuptools or distribute installed, you should install the
:term:`virtualenv` package. To install the :term:`virtualenv` package into
your setuptools-enabled Python interpreter, use the ``easy_install`` command.
+.. warning::
+
+ Even though Python 3.3 and better comes with ``pyvenv`` out of the box,
+ which is similar to ``virtualenv``, we suggest using ``virtualenv`` instead.
+ ``virtualenv`` works on well Python 3.3. This isn't a recommendation made
+ for technical reasons, it's one made because it's not feasible for the
+ authors of this guide to explain setup using multiple virtual environment
+ systems. We are aiming to not need to make the installation documentation
+ Turing-complete.
+
+ ``pyvenv`` will work fine. However, if you use ``pyvenv`` instead of
+ ``virtualenv``, you'll need to understand how to install software such as
+ ``distribute`` into the virtual environment manually, which this guide does
+ not cover.
+
.. code-block:: text
$ easy_install virtualenv
diff --git a/docs/narr/introspector.rst b/docs/narr/introspector.rst
index b88f3f0c8..bd81fb56a 100644
--- a/docs/narr/introspector.rst
+++ b/docs/narr/introspector.rst
@@ -130,6 +130,23 @@ introspectables in categories not described here.
A sequence of interfaces (or classes) that are subscribed to (the
resolution of the ``ifaces`` argument passed to ``add_subscriber``).
+ ``derived_subscriber``
+
+ A wrapper around the subscriber used internally by the system so it can
+ call it with more than one argument if your original subscriber accepts
+ only one.
+
+ ``predicates``
+
+ The predicate objects created as the result of passing predicate arguments
+ to ``add_susbcriber``
+
+ ``derived_predicates``
+
+ Wrappers around the predicate objects created as the result of passing
+ predicate arguments to ``add_susbcriber`` (to be used when predicates take
+ only one value but must be passed more than one).
+
``response adapters``
Each introspectable in the ``response adapters`` category represents a call