prep 1.10.dev0

12 files changed, 222 insertions, 205 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 08214e5ec..dd1f3ea52 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,198 +1,18 @@
-1.9 (2017-06-26)
-================
+unreleased
+==========
 
-- No major changes from 1.9b1.
-
-- Updated documentation links for ``docs.pylonsproject.org`` to use HTTPS.
-
-1.9b1 (2017-06-19)
-==================
-
-- Add an informative error message when unknown predicates are supplied. The
-  new message suggests alternatives based on the list of known predicates.
-  See https://github.com/Pylons/pyramid/pull/3054
-
-- Added integrity attributes for JavaScripts in cookiecutters, scaffolds, and
-  resulting source files in tutorials.
-  See https://github.com/Pylons/pyramid/issues/2548
-
-- Update RELEASING.txt for updating cookiecutters. Change cookiecutter URLs to
-  use shortcut.
-  See https://github.com/Pylons/pyramid/issues/3042
-
-- Ensure the correct threadlocals are pushed during view execution when
-  invoked from ``request.invoke_exception_view``.
-  See https://github.com/Pylons/pyramid/pull/3060
-
-- Fix a bug in which ``pyramid.security.ALL_PERMISSIONS`` failed to return
-  a valid iterator in its ``__iter__`` implementation.
-  See https://github.com/Pylons/pyramid/pull/3074
-
-- Normalize the permission results to a proper class hierarchy.
-  ``pyramid.security.ACLAllowed`` is now a subclass of
-  ``pyramid.security.Allowed`` and ``pyramid.security.ACLDenied`` is now a
-  subclass of ``pyramid.security.Denied``.
-  See https://github.com/Pylons/pyramid/pull/3084
-
-- Add a ``quote_via`` argument to ``pyramid.encode.urlencode`` to follow
-  the stdlib's version and enable custom quoting functions.
-  See https://github.com/Pylons/pyramid/pull/3088
-
-- Support `_query=None` and `_anchor=None` in ``request.route_url`` as well
-  as ``query=None`` and ``anchor=None`` in ``request.resource_url``.
-  Previously this would cause an `?` and a `#`, respectively, in the url
-  with nothing after it. Now the unnecessary parts are dropped from the
-  generated URL. See https://github.com/Pylons/pyramid/pull/3034
-
-- Revamp the ``IRouter`` API used by ``IExecutionPolicy`` to force
-  pushing/popping the request threadlocals. The
-  ``IRouter.make_request(environ)`` API has been replaced by
-  ``IRouter.request_context(environ)`` which should be used as a context
-  manager. See https://github.com/Pylons/pyramid/pull/3086
-
-1.9a2 (2017-05-09)
-==================
-
-Backward Incompatibilities
---------------------------
-
-- ``request.exception`` and ``request.exc_info`` will only be set if the
-  response was generated by the EXCVIEW tween. This is to avoid any confusion
-  where a response was generated elsewhere in the pipeline and not in
-  direct relation to the original exception. If anyone upstream wants to
-  catch and render responses for exceptions they should set
-  ``request.exception`` and ``request.exc_info`` themselves to indicate
-  the exception that was squashed when generating the response.
-
-  Similar behavior occurs with ``request.invoke_exception_view`` in which
-  the exception properties are set to reflect the exception if a response
-  is successfully generated by the method.
-
-  This is a very minor incompatibility. Most tweens right now would give
-  priority to the raised exception and ignore ``request.exception``. This
-  change just improves and clarifies that bookkeeping by trying to be
-  more clear about the relationship between the response and its squashed
-  exception. See https://github.com/Pylons/pyramid/pull/3029 and
-  https://github.com/Pylons/pyramid/pull/3031
-
-1.9a1 (2017-05-01)
-==================
-
-Major Features
---------------
-
-- The file format used by all ``p*`` command line scripts such as ``pserve``
-  and ``pshell``, as well as the ``pyramid.paster.bootstrap`` function
-  is now replaceable thanks to a new dependency on
-  `plaster <https://docs.pylonsproject.org/projects/plaster/en/latest/>`_.
-
-  For now, Pyramid is still shipping with integrated support for the
-  PasteDeploy INI format by depending on the
-  `plaster_pastedeploy <https://github.com/Pylons/plaster_pastedeploy>`_
-  binding library. This may change in the future.
-
-  See https://github.com/Pylons/pyramid/pull/2985
-
-- Added an execution policy hook to the request pipeline. An execution
-  policy has the ability to control creation and execution of the request
-  objects before they enter the rest of the pipeline. This means for a single
-  request environ the policy may create more than one request object.
-
-  The first library to use this feature is
-  `pyramid_retry
-  <https://docs.pylonsproject.org/projects/pyramid-retry/en/latest/>`_.
-
-  See https://github.com/Pylons/pyramid/pull/2964
-
-- CSRF support has been refactored out of sessions and into its own
-  independent API in the ``pyramid.csrf`` module. It supports a pluggable
-  ``pyramid.interfaces.ICSRFStoragePolicy`` which can be used to define your
-  own mechanism for generating and validating CSRF tokens. By default,
-  Pyramid continues to use the ``pyramid.csrf.LegacySessionCSRFStoragePolicy``
-  that uses the ``request.session.get_csrf_token`` and
-  ``request.session.new_csrf_token`` APIs under the hood to preserve
-  compatibility. Two new policies are shipped as well,
-  ``pyramid.csrf.SessionCSRFStoragePolicy`` and
-  ``pyramid.csrf.CookieCSRFStoragePolicy`` which will store the CSRF tokens
-  in the session and in a standalone cookie, respectively. The storage policy
-  can be changed by using the new
-  ``pyramid.config.Configurator.set_csrf_storage_policy`` config directive.
-
-  CSRF tokens should be used via the new ``pyramid.csrf.get_csrf_token``,
-  ``pyramid.csrf.new_csrf_token`` and ``pyramid.csrf.check_csrf_token`` APIs
-  in order to continue working if the storage policy is changed. Also, the
-  ``pyramid.csrf.get_csrf_token`` function is injected into templates to be
-  used conveniently in UI code.
-
-  See https://github.com/Pylons/pyramid/pull/2854 and
-  https://github.com/Pylons/pyramid/pull/3019
-
-Minor Features
---------------
-
-- Support an ``open_url`` config setting in the ``pserve`` section of the
-  config file. This url is used to open a web browser when ``pserve --browser``
-  is invoked. When this setting is unavailable the ``pserve`` script will
-  attempt to guess the port the server is using from the
-  ``server:<server_name>`` section of the config file but there is no
-  requirement that the server is being run in this format so it may fail.
-  See https://github.com/Pylons/pyramid/pull/2984
-
-- The ``pyramid.config.Configurator`` can now be used as a context manager
-  which will automatically push/pop threadlocals (similar to
-  ``config.begin()`` and ``config.end()``). It will also automatically perform
-  a ``config.commit()`` and thus it is only recommended to be used at the
-  top-level of your app. See https://github.com/Pylons/pyramid/pull/2874
-
-- The threadlocals are now available inside any function invoked via
-  ``config.include``. This means the only config-time code that cannot rely
-  on threadlocals is code executed from non-actions inside the main. This
-  can be alleviated by invoking ``config.begin()`` and ``config.end()``
-  appropriately or using the new context manager feature of the configurator.
-  See https://github.com/Pylons/pyramid/pull/2989
+Features
+--------
 
 Bug Fixes
 ---------
 
-- HTTPException's accepts a detail kwarg that may be used to pass additional
-  details to the exception. You may now pass objects so long as they have a
-  valid __str__ method. See https://github.com/Pylons/pyramid/pull/2951
-
-- Fix a reference cycle causing memory leaks in which the registry
-  would keep a ``Configurator`` instance alive even after the configurator
-  was discarded. Another fix was also added for the ``global_registries``
-  object in which the registry was stored in a closure preventing it from
-  being deallocated. See https://github.com/Pylons/pyramid/pull/2967
-
-- Fix a bug directly invoking ``pyramid.scripts.pserve.main`` with the
-  ``--reload`` option in which ``sys.argv`` is always used in the subprocess
-  instead of the supplied ``argv``.
-  See https://github.com/Pylons/pyramid/pull/2962
-
 Deprecations
 ------------
 
-- Pyramid currently depends on ``plaster_pastedeploy`` to simplify the
-  transition to ``plaster`` by maintaining integrated support for INI files.
-  This dependency on ``plaster_pastedeploy`` should be considered subject to
-  Pyramid's deprecation policy and may be removed in the future.
-  Applications should depend on the appropriate plaster binding to satisfy
-  their needs.
-
-- Retrieving CSRF token from the session has been deprecated in favor of
-  equivalent methods in the ``pyramid.csrf`` module. The CSRF methods
-  (``ISession.get_csrf_token`` and ``ISession.new_csrf_token``) are no longer
-  required on the ``ISession`` interface except when using the default
-  ``pyramid.csrf.LegacySessionCSRFStoragePolicy``.
-
-  Also, ``pyramid.session.check_csrf_token`` is now located at
-  ``pyramid.csrf.check_csrf_token``.
-
-  See https://github.com/Pylons/pyramid/pull/2854 and
-  https://github.com/Pylons/pyramid/pull/3019
+Backward Incompatibilities
+--------------------------
 
 Documentation Changes
 ---------------------
 
-- Added the execution policy to the routing diagram in the Request Processing
-  chapter. See https://github.com/Pylons/pyramid/pull/2993
diff --git a/HISTORY.txt b/HISTORY.txt
index c69d9514e..8a92eadcc 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -1,3 +1,202 @@
+1.9 (2017-06-26)
+================
+
+- No major changes from 1.9b1.
+
+- Updated documentation links for ``docs.pylonsproject.org`` to use HTTPS.
+
+1.9b1 (2017-06-19)
+==================
+
+- Add an informative error message when unknown predicates are supplied. The
+  new message suggests alternatives based on the list of known predicates.
+  See https://github.com/Pylons/pyramid/pull/3054
+
+- Added integrity attributes for JavaScripts in cookiecutters, scaffolds, and
+  resulting source files in tutorials.
+  See https://github.com/Pylons/pyramid/issues/2548
+
+- Update RELEASING.txt for updating cookiecutters. Change cookiecutter URLs to
+  use shortcut.
+  See https://github.com/Pylons/pyramid/issues/3042
+
+- Ensure the correct threadlocals are pushed during view execution when
+  invoked from ``request.invoke_exception_view``.
+  See https://github.com/Pylons/pyramid/pull/3060
+
+- Fix a bug in which ``pyramid.security.ALL_PERMISSIONS`` failed to return
+  a valid iterator in its ``__iter__`` implementation.
+  See https://github.com/Pylons/pyramid/pull/3074
+
+- Normalize the permission results to a proper class hierarchy.
+  ``pyramid.security.ACLAllowed`` is now a subclass of
+  ``pyramid.security.Allowed`` and ``pyramid.security.ACLDenied`` is now a
+  subclass of ``pyramid.security.Denied``.
+  See https://github.com/Pylons/pyramid/pull/3084
+
+- Add a ``quote_via`` argument to ``pyramid.encode.urlencode`` to follow
+  the stdlib's version and enable custom quoting functions.
+  See https://github.com/Pylons/pyramid/pull/3088
+
+- Support `_query=None` and `_anchor=None` in ``request.route_url`` as well
+  as ``query=None`` and ``anchor=None`` in ``request.resource_url``.
+  Previously this would cause an `?` and a `#`, respectively, in the url
+  with nothing after it. Now the unnecessary parts are dropped from the
+  generated URL. See https://github.com/Pylons/pyramid/pull/3034
+
+- Revamp the ``IRouter`` API used by ``IExecutionPolicy`` to force
+  pushing/popping the request threadlocals. The
+  ``IRouter.make_request(environ)`` API has been replaced by
+  ``IRouter.request_context(environ)`` which should be used as a context
+  manager. See https://github.com/Pylons/pyramid/pull/3086
+
+1.9a2 (2017-05-09)
+==================
+
+Backward Incompatibilities
+--------------------------
+
+- ``request.exception`` and ``request.exc_info`` will only be set if the
+  response was generated by the EXCVIEW tween. This is to avoid any confusion
+  where a response was generated elsewhere in the pipeline and not in
+  direct relation to the original exception. If anyone upstream wants to
+  catch and render responses for exceptions they should set
+  ``request.exception`` and ``request.exc_info`` themselves to indicate
+  the exception that was squashed when generating the response.
+
+  Similar behavior occurs with ``request.invoke_exception_view`` in which
+  the exception properties are set to reflect the exception if a response
+  is successfully generated by the method.
+
+  This is a very minor incompatibility. Most tweens right now would give
+  priority to the raised exception and ignore ``request.exception``. This
+  change just improves and clarifies that bookkeeping by trying to be
+  more clear about the relationship between the response and its squashed
+  exception. See https://github.com/Pylons/pyramid/pull/3029 and
+  https://github.com/Pylons/pyramid/pull/3031
+
+1.9a1 (2017-05-01)
+==================
+
+Major Features
+--------------
+
+- The file format used by all ``p*`` command line scripts such as ``pserve``
+  and ``pshell``, as well as the ``pyramid.paster.bootstrap`` function
+  is now replaceable thanks to a new dependency on
+  `plaster <https://docs.pylonsproject.org/projects/plaster/en/latest/>`_.
+
+  For now, Pyramid is still shipping with integrated support for the
+  PasteDeploy INI format by depending on the
+  `plaster_pastedeploy <https://github.com/Pylons/plaster_pastedeploy>`_
+  binding library. This may change in the future.
+
+  See https://github.com/Pylons/pyramid/pull/2985
+
+- Added an execution policy hook to the request pipeline. An execution
+  policy has the ability to control creation and execution of the request
+  objects before they enter the rest of the pipeline. This means for a single
+  request environ the policy may create more than one request object.
+
+  The first library to use this feature is
+  `pyramid_retry
+  <https://docs.pylonsproject.org/projects/pyramid-retry/en/latest/>`_.
+
+  See https://github.com/Pylons/pyramid/pull/2964
+
+- CSRF support has been refactored out of sessions and into its own
+  independent API in the ``pyramid.csrf`` module. It supports a pluggable
+  ``pyramid.interfaces.ICSRFStoragePolicy`` which can be used to define your
+  own mechanism for generating and validating CSRF tokens. By default,
+  Pyramid continues to use the ``pyramid.csrf.LegacySessionCSRFStoragePolicy``
+  that uses the ``request.session.get_csrf_token`` and
+  ``request.session.new_csrf_token`` APIs under the hood to preserve
+  compatibility. Two new policies are shipped as well,
+  ``pyramid.csrf.SessionCSRFStoragePolicy`` and
+  ``pyramid.csrf.CookieCSRFStoragePolicy`` which will store the CSRF tokens
+  in the session and in a standalone cookie, respectively. The storage policy
+  can be changed by using the new
+  ``pyramid.config.Configurator.set_csrf_storage_policy`` config directive.
+
+  CSRF tokens should be used via the new ``pyramid.csrf.get_csrf_token``,
+  ``pyramid.csrf.new_csrf_token`` and ``pyramid.csrf.check_csrf_token`` APIs
+  in order to continue working if the storage policy is changed. Also, the
+  ``pyramid.csrf.get_csrf_token`` function is injected into templates to be
+  used conveniently in UI code.
+
+  See https://github.com/Pylons/pyramid/pull/2854 and
+  https://github.com/Pylons/pyramid/pull/3019
+
+Minor Features
+--------------
+
+- Support an ``open_url`` config setting in the ``pserve`` section of the
+  config file. This url is used to open a web browser when ``pserve --browser``
+  is invoked. When this setting is unavailable the ``pserve`` script will
+  attempt to guess the port the server is using from the
+  ``server:<server_name>`` section of the config file but there is no
+  requirement that the server is being run in this format so it may fail.
+  See https://github.com/Pylons/pyramid/pull/2984
+
+- The ``pyramid.config.Configurator`` can now be used as a context manager
+  which will automatically push/pop threadlocals (similar to
+  ``config.begin()`` and ``config.end()``). It will also automatically perform
+  a ``config.commit()`` and thus it is only recommended to be used at the
+  top-level of your app. See https://github.com/Pylons/pyramid/pull/2874
+
+- The threadlocals are now available inside any function invoked via
+  ``config.include``. This means the only config-time code that cannot rely
+  on threadlocals is code executed from non-actions inside the main. This
+  can be alleviated by invoking ``config.begin()`` and ``config.end()``
+  appropriately or using the new context manager feature of the configurator.
+  See https://github.com/Pylons/pyramid/pull/2989
+
+Bug Fixes
+---------
+
+- HTTPException's accepts a detail kwarg that may be used to pass additional
+  details to the exception. You may now pass objects so long as they have a
+  valid __str__ method. See https://github.com/Pylons/pyramid/pull/2951
+
+- Fix a reference cycle causing memory leaks in which the registry
+  would keep a ``Configurator`` instance alive even after the configurator
+  was discarded. Another fix was also added for the ``global_registries``
+  object in which the registry was stored in a closure preventing it from
+  being deallocated. See https://github.com/Pylons/pyramid/pull/2967
+
+- Fix a bug directly invoking ``pyramid.scripts.pserve.main`` with the
+  ``--reload`` option in which ``sys.argv`` is always used in the subprocess
+  instead of the supplied ``argv``.
+  See https://github.com/Pylons/pyramid/pull/2962
+
+Deprecations
+------------
+
+- Pyramid currently depends on ``plaster_pastedeploy`` to simplify the
+  transition to ``plaster`` by maintaining integrated support for INI files.
+  This dependency on ``plaster_pastedeploy`` should be considered subject to
+  Pyramid's deprecation policy and may be removed in the future.
+  Applications should depend on the appropriate plaster binding to satisfy
+  their needs.
+
+- Retrieving CSRF token from the session has been deprecated in favor of
+  equivalent methods in the ``pyramid.csrf`` module. The CSRF methods
+  (``ISession.get_csrf_token`` and ``ISession.new_csrf_token``) are no longer
+  required on the ``ISession`` interface except when using the default
+  ``pyramid.csrf.LegacySessionCSRFStoragePolicy``.
+
+  Also, ``pyramid.session.check_csrf_token`` is now located at
+  ``pyramid.csrf.check_csrf_token``.
+
+  See https://github.com/Pylons/pyramid/pull/2854 and
+  https://github.com/Pylons/pyramid/pull/3019
+
+Documentation Changes
+---------------------
+
+- Added the execution policy to the routing diagram in the Request Processing
+  chapter. See https://github.com/Pylons/pyramid/pull/2993
+
 1.8 (2017-01-21)
 ================
 
diff --git a/README.rst b/README.rst
index 57829eb19..ecc8eb32f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,13 +1,13 @@
 Pyramid
 =======
 
-.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=1.9-branch
+.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master
         :target: https://travis-ci.org/Pylons/pyramid
-        :alt: 1.9-branch Travis CI Status
+        :alt: master Travis CI Status
 
-.. image:: https://readthedocs.org/projects/pyramid/badge/?version=1.9-branch
-        :target: https://docs.pylonsproject.org/projects/pyramid/en/1.9-branch/
-        :alt: 1.9-branch Documentation Status
+.. image:: https://readthedocs.org/projects/pyramid/badge/?version=master
+        :target: https://docs.pylonsproject.org/projects/pyramid/en/master
+        :alt: master Documentation Status
 
 .. image:: https://img.shields.io/badge/irc-freenode-blue.svg
         :target: https://webchat.freenode.net/?channels=pyramid
diff --git a/contributing.md b/contributing.md
index fec4f4f27..3b960c1e1 100644
--- a/contributing.md
+++ b/contributing.md
@@ -27,10 +27,8 @@ listed below.
 * [master](https://github.com/Pylons/pyramid/) - The branch on which further
   development takes place. The default branch on GitHub.
 * [1.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The branch
-  classified as "alpha".
-* [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The branch
   classified as "stable" or "latest".
-* [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The oldest
+* [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The oldest
   actively maintained and stable branch.
 
 Older branches are not actively maintained. In general, two stable branches and
diff --git a/docs/conf.py b/docs/conf.py
index 0f42d6c41..3fec0dce2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -160,7 +160,7 @@ html_theme_options = dict(
     github_url='https://github.com/Pylons/pyramid',
     # On master branch and new branch still in
     # pre-release status: true; else: false.
-    in_progress='false',
+    in_progress='true',
     # On branches previous to "latest": true; else: false.
     outdated='false',
     )
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 776a0de44..e6c3a45ba 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -85,7 +85,7 @@ On all platforms, generate a project using cookiecutter.
 
 .. code-block:: bash
 
-   $ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout 1.9-branch
+   $ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
 
 If prompted for the first item, accept the default ``yes`` by hitting return.
 
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 5679b0dc8..f95bff4df 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -510,7 +510,7 @@ Let's use the cookiecutter ``pyramid-cookiecutter-starter`` to create a starter
 
 .. code-block:: bash
 
-    $ $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout 1.9-branch
+    $ $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
 
 If prompted for the first item, accept the default ``yes`` by hitting return.
 
@@ -858,7 +858,7 @@ Pyramid and SQLAlchemy are great friends. That friendship includes a cookiecutte
 .. code-block:: bash
 
     $ cd ~
-    $ env/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout 1.9-branch
+    $ env/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout master
 
 If prompted for the first item, accept the default ``yes`` by hitting return.
 
diff --git a/docs/quick_tutorial/cookiecutters.rst b/docs/quick_tutorial/cookiecutters.rst
index 0f2a24816..f8568206d 100644
--- a/docs/quick_tutorial/cookiecutters.rst
+++ b/docs/quick_tutorial/cookiecutters.rst
@@ -28,7 +28,7 @@ Steps
 
     .. code-block:: bash
 
-        $ $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout 1.9-branch
+        $ $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
 
     If prompted for the first item, accept the default ``yes`` by hitting return.
 
diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index 8df432434..a409284cc 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/docs/tutorials/modwsgi/index.rst
@@ -39,7 +39,7 @@ specific path information for commands and files.
     .. code-block:: bash
 
        $ cd ~
-       $ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout 1.9-branch
+       $ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
 
     If prompted for the first item, accept the default ``yes`` by hitting return.
 
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index fba488aa9..325bcafd5 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -31,7 +31,7 @@ On UNIX
 .. code-block:: bash
 
     $ cd ~
-    $ cookiecutter gh:Pylons/pyramid-cookiecutter-zodb --checkout 1.9-branch
+    $ cookiecutter gh:Pylons/pyramid-cookiecutter-zodb --checkout master
 
 On Windows
 ^^^^^^^^^^
@@ -39,7 +39,7 @@ On Windows
 .. code-block:: doscon
 
     c:\> cd \
-    c:\> cookiecutter gh:Pylons/pyramid-cookiecutter-zodb --checkout 1.9-branch
+    c:\> cookiecutter gh:Pylons/pyramid-cookiecutter-zodb --checkout master
 
 On all operating systems
 ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index d2c33081c..3141bda69 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -43,7 +43,7 @@ On UNIX
 .. code-block:: bash
 
     $ cd ~
-    $ cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout 1.9-branch
+    $ cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout master
 
 On Windows
 ^^^^^^^^^^
@@ -51,7 +51,7 @@ On Windows
 .. code-block:: doscon
 
     c:\> cd \
-    c:\> cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout 1.9-branch
+    c:\> cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout master
 
 On all operating systems
 ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/setup.py b/setup.py
index 2d8922eed..27421d8b2 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.9',
+      version='1.10.dev0',
       description='The Pyramid Web Framework, a Pylons project',
       long_description=README + '\n\n' + CHANGES,
       classifiers=[