4 files changed, 53 insertions, 6 deletions
diff --git a/doc/changes.rst b/doc/changes.rst
index b16a1dd3..b2836128 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -19,6 +19,7 @@ Major change history for coverage.py
 :history: 20110604T214100, updated for 3.5b1
 :history: 20110629T082200, updated for 3.5
 :history: 20110923T081600, updated for 3.5.1
+:history: 20120429T162100, updated for 3.5.2b1
 
 
 These are the major changes for coverage.py.  For a more complete change
@@ -27,6 +28,50 @@ history, see the `CHANGES.txt`_ file in the source tree.
 .. _CHANGES.txt: http://bitbucket.org/ned/coveragepy/src/tip/CHANGES.txt
 
 
+Version 3.5.2b1 --- 29 April 2012
+---------------------------------
+
+- The HTML report has slightly tweaked controls: the buttons at the top of
+  the page are color-coded to the source lines they affect.
+
+- Custom CSS can be applied to the HTML report by specifying a CSS file as
+  the extra_css configuration value in the [html] section.
+
+- Source files with custom encodings declared in a comment at the top are now
+  properly handled during reporting on Python 2.  Python 3 always handled them
+  properly.  This fixes `issue 157`_.
+
+- Backup files left behind by editors are no longer collected by the source=
+  option, fixing `issue 168`_.
+
+- If a file doesn't parse properly as Python, we don't report it as an error
+  if the filename seems like maybe it wasn't meant to be Python.  This is a
+  pragmatic fix for `issue 82`_.
+
+- The ``-m`` switch on ``coverage report``, which includes missing line numbers
+  in the summary report, can now be specifed as ``show_missing`` in the
+  config file.  Closes `issue 173`_.
+
+- When running a module with ``coverage run -m <modulename>``, certain details
+  of the execution environment weren't the same as for
+  ``python -m <modulename>``.  This had the unfortunate side-effect of making
+  ``coverage run -m unittest discover`` not work if you had tests in a
+  directory named "test".  This fixes `issue 155`_.
+
+- Now the exit status of your product code is properly used as the process
+  status when running ``python -m coverage run ...``.  Thanks, JT Olds.
+
+- When installing into pypy, we no longer attempt (and fail) to compile
+  the C tracer function, closing `issue 166`_.
+
+.. _issue 82: https://bitbucket.org/ned/coveragepy/issue/82/tokenerror-when-generating-html-report
+.. _issue 155: https://bitbucket.org/ned/coveragepy/issue/155/cant-use-coverage-run-m-unittest-discover
+.. _issue 157: https://bitbucket.org/ned/coveragepy/issue/157/chokes-on-source-files-with-non-utf-8
+.. _issue 166: https://bitbucket.org/ned/coveragepy/issue/166/dont-try-to-compile-c-extension-on-pypy
+.. _issue 168: https://bitbucket.org/ned/coveragepy/issue/168/dont-be-alarmed-by-emacs-droppings
+.. _issue 173: https://bitbucket.org/ned/coveragepy/issue/173/theres-no-way-to-specify-show-missing-in
+
+
 Version 3.5.1 --- 23 September 2011
 -----------------------------------
 
diff --git a/doc/conf.py b/doc/conf.py
index 679c5058..0fac2ece 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -40,16 +40,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'coverage.py'
-copyright = u'2009-2011, Ned Batchelder'
+copyright = u'2009-2012, Ned Batchelder'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '3.5.1'
+version = '3.5.2'
 # The full version, including alpha/beta/rc tags.
-release = '3.5.1'
+release = '3.5.2b1'
 
 # 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 bf8d9931..49b04eb3 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -21,6 +21,7 @@ coverage.py
 :history: 20110629T082300, update for 3.5
 :history: 20110827T221800, update for 3.5.1b1
 :history: 20110923T081800, update for 3.5.1
+:history: 20120429T162100, updated for 3.5.2b1
 
 
 Coverage.py is a tool for measuring code coverage of Python programs. It
@@ -38,10 +39,10 @@ not.
 
 .. ifconfig:: prerelease
 
-    The latest version is coverage.py 3.5.1b1, released 28 August 2011.
+    The latest version is coverage.py 3.5.2b1, released 29 April 2012.
     *This is a pre-release build.  The usual warnings about possible bugs apply.*
     It is supported on Python versions 2.3 through 3.2.
-    The latest stable version is coverage.py 3.5, `described here`_.
+    The latest stable version is coverage.py 3.5.1, `described here`_.
 
 .. _described here: http://nedbatchelder.com/code/coverage
 
diff --git a/doc/install.rst b/doc/install.rst
index 6d175506..f4af2d63 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -10,6 +10,7 @@ Installation
 :history: 20110604T213400, updated for 3.5b1.
 :history: 20110629T082400, updated for 3.5.
 :history: 20110923T081900, updated for 3.5.1.
+:history: 20120429T162500, updated for 3.5.2b1
 
 
 .. highlight:: console
@@ -62,5 +63,5 @@ If all went well, you should be able to open a command prompt, and see
 coverage installed properly::
 
     $ coverage --version
-    Coverage.py, version 3.5.1.  http://nedbatchelder.com/code/coverage
+    Coverage.py, version 3.5.2b1.  http://nedbatchelder.com/code/coverage