summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/api/paster.rst2
-rw-r--r--docs/conf.py2
-rw-r--r--docs/narr/install.rst15
-rw-r--r--docs/narr/introspector.rst17
-rw-r--r--docs/whatsnew-1.4.rst17
5 files changed, 51 insertions, 2 deletions
diff --git a/docs/api/paster.rst b/docs/api/paster.rst
index 3f7a1c364..bde128e05 100644
--- a/docs/api/paster.rst
+++ b/docs/api/paster.rst
@@ -7,7 +7,7 @@
.. autofunction:: bootstrap
- .. autofunction:: get_app(config_uri, name=None)
+ .. autofunction:: get_app(config_uri, name=None, options=None)
.. autofunction:: get_appsettings(config_uri, name=None)
diff --git a/docs/conf.py b/docs/conf.py
index 5e17de18a..3dc09d95d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.4a4'
+version = '1.4b1'
# The full version, including alpha/beta/rc tags.
release = version
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
diff --git a/docs/whatsnew-1.4.rst b/docs/whatsnew-1.4.rst
index 5da28bb03..34fda5f37 100644
--- a/docs/whatsnew-1.4.rst
+++ b/docs/whatsnew-1.4.rst
@@ -225,6 +225,23 @@ Minor Feature Additions
as it doesn't make sense to assert that a nonexistent view is
execution-permitted. See https://github.com/Pylons/pyramid/issues/299.
+- Small microspeed enhancement which anticipates that a
+ :class:`pyramid.response.Response` object is likely to be returned from a
+ view. Some code is shortcut if the class of the object returned by a view is
+ this class. A similar microoptimization was done to
+ :func:`pyramid.request.Request.is_response`.
+
+- Make it possible to use variable arguments on all ``p*`` commands
+ (``pserve``, ``pshell``, ``pviews``, etc) in the form ``a=1 b=2`` so you can
+ fill in values in parameterized ``.ini`` file, e.g. ``pshell
+ etc/development.ini http_port=8080``.
+
+- In order to allow people to ignore unused arguments to subscriber callables
+ and to normalize the relationship between event subscribers and subscriber
+ predicates, we now allow both subscribers and subscriber predicates to accept
+ only a single ``event`` argument even if they've been subscribed for
+ notifications that involve multiple interfaces.
+
Backwards Incompatibilities
---------------------------