diff options
| author | Ryan Petrello <lists@ryanpetrello.com> | 2013-04-25 11:06:07 -0400 |
|---|---|---|
| committer | Ryan Petrello <lists@ryanpetrello.com> | 2013-04-25 11:06:07 -0400 |
| commit | b294752202a7034a32dabc14c6497a80d9ee145a (patch) | |
| tree | 18eb2e1d0d8912d28d2ba28dfe035cc6e5bb5b0b /docs | |
| parent | 14bf7e205a0d510ad6c9c6875c560f21dee8dc42 (diff) | |
| parent | 5c4580f5749e8084ba7f91a4e2101eab5c1cf28e (diff) | |
| download | pecan-b294752202a7034a32dabc14c6497a80d9ee145a.tar.gz | |
Merge branch 'master' into next
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/changes.rst | 10 | ||||
| -rw-r--r-- | docs/source/conf.py | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/docs/source/changes.rst b/docs/source/changes.rst index b01b3ec..9a6cefe 100644 --- a/docs/source/changes.rst +++ b/docs/source/changes.rst @@ -1,3 +1,13 @@ +0.2.2 +===== +* Unobfuscate syntax highlighting JavaScript for debian packaging. +* Extract the scaffold-building tests into tox. +* Add support for specifying a pecan configuration file via the + ``PECAN_CONFIG`` + environment variable. +* Fix a bug in ``DELETE`` methods in two (or more) nested ``RestControllers``. +* Add documentation for returning specific HTTP status codes. + 0.2.1 ===== diff --git a/docs/source/conf.py b/docs/source/conf.py index 4da67c3..163224d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -49,9 +49,9 @@ copyright = u'2010, Jonathan LaCour' # built documents. # # The short X.Y version. -version = '0.2.1' +version = '0.2.2' # The full version, including alpha/beta/rc tags. -release = '0.2.1' +release = '0.2.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |