refine and structure CHANGELOG

--HG--
branch : trunk

CHANGELOG

@@ -1,23 +1,10 @@
 Changes between 1.3.0 and 1.3.1
 ==================================================
 
-- fix issue96: make capturing more resilient against Control-C 
-  interruptions (involved somewhat substantial refactoring
-  to the underlying capturing functionality to avoid race 
-  conditions).
+New features 
+++++++++++++++++++
 
-- fix issue89 - allow py.test.mark decorators to be used on classes
-  (class decorators were introduced with python2.6)
-  also allow to have multiple markers applied at class/module level
-
-- fix chaining of conditional skipif/xfail decorators - so it works now 
-  as expected to use multiple @py.test.mark.skipif(condition) decorators,
-  including specific reporting which of the conditions lead to skipping. 
-
-- fix issue95: late-import zlib so that it's not required 
-  for general py.test startup. 
-
-- fix issue91: introduce new py.test.xfail(reason) helper 
+- issue91: introduce new py.test.xfail(reason) helper 
   to imperatively mark a test as expected to fail. Can 
   be used from within setup and test functions. This is
   useful especially for parametrized tests when certain 
@@ -25,8 +12,10 @@ Changes between 1.3.0 and 1.3.1
   declarative approach with the @py.test.mark.xfail cannot
   be used as it would mark all configurations as xfail. 
 
-- fix issue94: make reporting more robust against bogus source code
-  (and internally be more careful when presenting unexpected byte sequences)
+- issue89: allow py.test.mark decorators to be used on classes
+  (class decorators were introduced with python2.6) and 
+  also allow to have multiple markers applied at class/module level
+  by specifying a list. 
 
 - improve and refine letter reporting in the progress bar:
   .  pass
@@ -40,12 +29,13 @@ Changes between 1.3.0 and 1.3.1
   skipped tests in the junitxml output - which also fixes 
   issue99.
 
-- make py.test.cmdline.main() return the exitstatus 
-  instead of raising (which is still done by py.cmdline.pytest())
-  and make it so that py.test.cmdline.main() can be called
-  multiple times, at least as far as py.test's internal 
-  state is concerned - previously it would raise an exception
-  on the second time. 
+- make py.test.cmdline.main() return the exitstatus instead of raising 
+  SystemExit and also allow it to be called multiple times.  This of
+  course requires that your application and tests are properly teared 
+  down and don't have global state. 
+
+Fixes / Maintenance 
+++++++++++++++++++++++
 
 - improve tracebacks presentation: 
   - raises shows shorter more relevant tracebacks
@@ -53,7 +43,23 @@ Changes between 1.3.0 and 1.3.1
 - improve support for raises and other dynamically compiled code by
   manipulating python's linecache.cache instead of the previous
   rather hacky way of creating custom code objects.  This makes 
-  it seemlessly work on Jython and PyPy at least. 
+  it seemlessly work on Jython and PyPy where it previously didn't.
+
+- fix issue96: make capturing more resilient against Control-C 
+  interruptions (involved somewhat substantial refactoring
+  to the underlying capturing functionality to avoid race 
+  conditions).
+
+- fix chaining of conditional skipif/xfail decorators - so it works now 
+  as expected to use multiple @py.test.mark.skipif(condition) decorators,
+  including specific reporting which of the conditions lead to skipping. 
+
+- fix issue95: late-import zlib so that it's not required 
+  for general py.test startup. 
+
+- fix issue94: make reporting more robust against bogus source code
+  (and internally be more careful when presenting unexpected byte sequences)
+
 
 Changes between 1.2.1 and 1.3.0
 ==================================================