[Zope-dev] Version bumping in the trunk after release

[Baiju M]

Hi,
    I would propose a one word change in the "Releasing Software"
document which is part of process documentation for zopetookit.

After preparing a release, developer increase next version number to
next feature version or next bugfix version.  From the explanation
given there, it is very obvious that the number should be changed
to next bugfix release. I think the wording also should be changed,
so that there won't be any confusion.

This sentence:

  Back on the trunk or the release branch, increase the version
  number in ``setup.py`` to the *next* release while preserving the
``dev`` marker.

Should be changed to:

  Back on the trunk or the release branch, increase the version
  number in ``setup.py`` to the *next* bugfix release while preserving the
  ``dev`` marker.

If there is no objection, I am going to make this change after 3 days.

To understand the context, here is the full text:

6. Back on the trunk or the release branch, increase the version
   number in ``setup.py`` to the *next* bugfix release while preserving the
   ``dev`` marker.  The convention is that the trunk or release branch
   always points to the upcoming release, *not* the one that has been
   released already.  So if you've just released version 3.4.1, you
   should change ``setup.py`` to read::

     setup(
         name='...',
         version='3.4.2dev',
         ...
         )

   In ``CHANGES.txt`` add a *new* section for the upcoming release.
   The release date for that should say "unreleased" so that
   committers recording their changes won't accidentally put their
   entry in the section for an already released version.  For
   example::

     3.4.2 (unreleased)
     ------------------

     * ...

     3.4.1 (2007-01-24)
     ------------------

     * Fixed bug in the foo adapter.

     * Added a bar utility for optimized kaboodling.

     3.4.0 (2006-09-13)
     ------------------

     Initial release as separate egg.

Regards,
Baiju M

Index: source/process/releasing-software.rst
===================================================================
--- source/process/releasing-software.rst       (revision 109748)
+++ source/process/releasing-software.rst       (working copy)
@@ -74,7 +74,7 @@
       versions and linking models (framework / non-framework).

 6. Back on the trunk or the release branch, increase the version
-   number in ``setup.py`` to the *next* release while preserving the
+   number in ``setup.py`` to the *next* bugfix release while preserving the
    ``dev`` marker.  The convention is that the trunk or release branch
    always points to the upcoming release, *not* the one that has been
    released already.  So if you've just released version 3.4.1, you