summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/conf.py6
-rw-r--r--docs/whatsnew-1.3.rst12
2 files changed, 9 insertions, 9 deletions
diff --git a/docs/conf.py b/docs/conf.py
index f913b2462..9be5db325 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.3a1'
+version = '1.4dev'
# The full version, including alpha/beta/rc tags.
release = version
@@ -475,7 +475,7 @@ def resig(app, what, name, obj, options, signature, return_annotation):
# -- Options for Epub output ---------------------------------------------------
# Bibliographic Dublin Core info.
-epub_title = 'The Pyramid Web Application Development Framework, Version 1.3'
+epub_title = 'The Pyramid Web Application Development Framework, Version 1.4dev'
epub_author = 'Chris McDonough'
epub_publisher = 'Agendaless Consulting'
epub_copyright = '2008-2011'
@@ -492,7 +492,7 @@ epub_scheme = 'ISBN'
epub_identifier = '0615445675'
# A unique identification for the text.
-epub_uid = 'The Pyramid Web Application Development Framework, Version 1.3'
+epub_uid = 'The Pyramid Web Application Development Framework, Version 1.4dev'
# HTML files that should be inserted before the pages created by sphinx.
# The format is a list of tuples containing the path and title.
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index bbf1d9842..d19935c97 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -57,14 +57,14 @@ to make some changes:
Previously (in Pyramid 1.0, 1.1 and 1.2), you created a Pyramid application
using ``paster create``, like so::
- $myvenv/bin/paster create -t pyramid_starter foo
+ $ myvenv/bin/paster create -t pyramid_starter foo
You're now instead required to create an application using ``pcreate`` like
so::
- $myvenv/bin/pcreate -s starter foo
+ $ myvenv/bin/pcreate -s starter foo
-Note that the names of available scaffolds have changed the and flags
+Note that the names of available scaffolds have changed and the flags
supported by ``pcreate`` are different than those that were supported by
``paster create``.
@@ -83,11 +83,11 @@ Analogues of ``paster pshell``, ``paster pviews`` and ``paster ptweens`` also
exist under the respective console script names ``pshell``, ``pviews``, and
``ptweens``.
-We've replaced use of the Paste http server with the ``wsgiref`` server in
+We've replaced use of the Paste ``httpserver`` with the ``wsgiref`` server in
the scaffolds, so once you create a project from a scaffold, its
``development.ini`` and ``production.ini`` will have the following line::
- use = egg:pyramid#wsgref
+ use = egg:pyramid#wsgiref
Instead of this (which was the default in older versions)::
@@ -96,7 +96,7 @@ Instead of this (which was the default in older versions)::
Using ``wsgiref`` as the default WSGI server is purely a default to make it
possible to use the same scaffolding under Python 2 and Python 3; people
running Pyramid under Python 2 can still manually install ``Paste`` and use
-the Paste httpserver by replacing the former line with the latter. This is
+the Paste ``httpserver`` by replacing the former line with the latter. This is
actually recommended if you rely on proxying from Apache or Nginx to a
``pserve`` -invoked application. **The wsgiref server is not a production
quality server.** See :ref:`alternate_wsgi_server` for more information.