Merge branch 'wwitzel3-ww/415'

5 files changed, 21 insertions, 5 deletions

diff --git a/docs/api/interfaces.rst b/docs/api/interfaces.rst
index 5b190b53b..11cd8cf7e 100644
--- a/docs/api/interfaces.rst
+++ b/docs/api/interfaces.rst
@@ -76,3 +76,6 @@ Other Interfaces
 
   .. autointerface:: IActionInfo
      :members:
+
+  .. autointerface:: IAssetDescriptor
+     :members:
diff --git a/docs/conf.py b/docs/conf.py
index 3496bd38c..0c56f56e7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -80,7 +80,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.3a6'
+version = '1.3a7'
 
 # The full version, including alpha/beta/rc tags.
 release = version
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index ea0045ca7..d69f0cf13 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -98,7 +98,7 @@ Or on Windows:
 
 .. code-block:: text
 
-   $ Scripts\pcreate alchemy MyProject
+   $ Scripts\pcreate -s alchemy MyProject
 
 Here's sample output from a run of ``pcreate`` on UNIX for a project we name
 ``MyProject``:
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 6d9dfdd92..a7bf74786 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -340,8 +340,8 @@ The above pattern will match these URLs, generating the following matchdicts:
 
 .. code-block:: text
 
-   foo/1/2/           -> {'baz':u'1', 'bar':u'2', 'fizzle':()}
-   foo/abc/def/a/b/c  -> {'baz':u'abc', 'bar':u'def', 'fizzle': u'a/b/c')}
+   foo/1/2/           -> {'baz':u'1', 'bar':u'2', 'fizzle':u''}
+   foo/abc/def/a/b/c  -> {'baz':u'abc', 'bar':u'def', 'fizzle': u'a/b/c'}
 
 This occurs because the default regular expression for a marker is ``[^/]+``
 which will match everything up to the first ``/``, while ``{fizzle:.*}`` will
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index ed7024f62..b6cfde039 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -15,7 +15,9 @@ The major feature additions in Pyramid 1.3 follow.
 Python 3 Compatibility
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Pyramid is now Python 3 compatible.  Python 3.2 or better is required.
+In addition to running on Python 2 (version 2.6 or 2.7 required), Pyramid is
+now Python 3 compatible.  For Python 3 compatibility, Python 3.2 or better
+is required.
 
 .. warning::
 
@@ -250,6 +252,13 @@ Minor Feature Additions
   http://www.python.org/dev/peps/pep-0333/#optional-platform-specific-file-handling)
   when one is provided by the web server.
 
+- The :meth:`pyramid.config.Configurator.scan` method can be passed an
+  ``ignore`` argument, which can be a string, a callable, or a list
+  consisting of strings and/or callables.  This feature allows submodules,
+  subpackages, and global objects from being scanned.  See
+  http://readthedocs.org/docs/venusian/en/latest/#ignore-scan-argument for
+  more information about how to use the ``ignore`` argument to ``scan``.
+
 Backwards Incompatibilities
 ---------------------------
 
@@ -315,6 +324,10 @@ Backwards Incompatibilities
   (indeterminate value based on Python 3 vs. Python 2).  This has to be done
   to normalize matching on Python 2 and Python 3.
 
+- The ``match_param`` view predicate no longer accepts a dict. This will have
+  no negative affect because the implementation was broken for dict-based
+  arguments.
+
 Documentation Enhancements
 --------------------------