Automated merge with ssh://bitbucket.org/ned/coveragepycoverage-3.6b2

5 files changed, 31 insertions, 8 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index be5531a1..6ffc024a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,13 +2,13 @@
 Change history for Coverage.py
 ------------------------------
 
-Version 3.6b2
--------------
+Version 3.6b2 -- 23 December 2012
+---------------------------------
 
-- Coverage.py runs on Python 2.3 and 2.4 again.
+- Coverage.py runs on Python 2.3 and 2.4 again. It was broken in 3.6b1.
 
 - The C extension is optionally compiled using a different more widely-used
-  technique, taking another stab at fixing ``issue 80``_ once and for all.
+  technique, taking another stab at fixing `issue 80`_ once and for all.
 
 - Combining data files would create entries for phantom files if used with
   ``source`` and path aliases.  It no longer does.
diff --git a/doc/changes.rst b/doc/changes.rst
index 17927d64..7305082d 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -23,6 +23,7 @@ Major change history for coverage.py
 :history: 20120503T233700, updated for 3.5.2
 :history: 20120929T093100, updated for 3.5.3
 :history: 20121129T060100, updated for 3.6b1.
+:history: 20121223T180600, updated for 3.6b2.
 
 
 These are the major changes for coverage.py.  For a more complete change
@@ -30,6 +31,26 @@ history, see the `CHANGES.txt`_ file in the source tree.
 
 .. _CHANGES.txt: http://bitbucket.org/ned/coveragepy/src/tip/CHANGES.txt
 
+Version 3.6b2 -- 23 December 2012
+---------------------------------
+
+- Coverage.py runs on Python 2.3 and 2.4 again. It was broken in 3.6b1.
+
+- The C extension is optionally compiled using a different more widely-used
+  technique, taking another stab at fixing `issue 80`_ once and for all.
+
+- Combining data files would create entries for phantom files if used with
+  ``source`` and path aliases.  It no longer does.
+
+- ``debug sys`` now shows the configuration file path that was read.
+
+- If an oddly-behaved package claims that code came from an empty-string
+  filename, coverage.py no longer associates it with the directory name,
+  fixing `issue 221`_.
+
+.. _issue 80: https://bitbucket.org/ned/coveragepy/issue/80/is-there-a-duck-typing-way-to-know-we-cant
+.. _issue 221: https://bitbucket.org/ned/coveragepy/issue/221/coveragepy-incompatible-with-pyratemp
+
 
 Version 3.6b1 -- 28 November 2012
 ---------------------------------
diff --git a/doc/conf.py b/doc/conf.py
index 842704b3..9891e3e5 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2009-2012, Ned Batchelder'
 # The short X.Y version.

 version = '3.6'

 # The full version, including alpha/beta/rc tags.

-release = '3.6b1'

+release = '3.6b2'

 

 # The language for content autogenerated by Sphinx. Refer to documentation

 # for a list of supported languages.

diff --git a/doc/index.rst b/doc/index.rst
index aa374c99..25d18677 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -26,6 +26,7 @@ coverage.py
 :history: 20120929T093500, updated for 3.5.3
 :history: 20121117T094900, Change from easy_install to pip.
 :history: 20121128T203700, Updated for 3.6b1.
+:history: 20121223T180600, Updated for 3.6b2.
 
 
 Coverage.py is a tool for measuring code coverage of Python programs. It
@@ -43,7 +44,7 @@ not.
 
 .. ifconfig:: prerelease
 
-    The latest version is coverage.py 3.6b1, released 28 Novermber 2012.
+    The latest version is coverage.py 3.6b2, released 23 December 2012.
     It is supported on Python versions 2.3 through 3.3, and PyPy 1.9.
     **This is a pre-release build.  The usual warnings about possible bugs apply.**
     The latest stable version is coverage.py 3.5.3, `described here`_.
diff --git a/doc/install.rst b/doc/install.rst
index a2093c4f..9cfb019b 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -15,6 +15,7 @@ Installation
 :history: 20120929T093600, updated for 3.5.3.
 :history: 20121117T095000, Now setuptools is a pre-req.
 :history: 20121128T203000, updated for 3.6b1.
+:history: 20121223T180800, updated for 3.6b2.
 
 
 .. highlight:: console
@@ -69,9 +70,9 @@ If all went well, you should be able to open a command prompt, and see
 coverage installed properly::
 
     $ coverage --version
-    Coverage.py, version 3.6b1.  http://nedbatchelder.com/code/coverage/3.6b1
+    Coverage.py, version 3.6b2.  http://nedbatchelder.com/code/coverage/3.6b2
 
 You can also invoke coverage as a module::
 
     $ python -m coverage --version
-    Coverage.py, version 3.6b1.  http://nedbatchelder.com/code/coverage/3.6b1
+    Coverage.py, version 3.6b2.  http://nedbatchelder.com/code/coverage/3.6b2