diff -r 1186d68715cc Doc/distutils/uploading.rst
--- a/Doc/distutils/uploading.rst	Wed Jul 04 19:33:45 2012 -0700
+++ b/Doc/distutils/uploading.rst	Thu Jul 05 19:13:04 2012 -0700
@@ -73,4 +73,6 @@
     $ python setup.py --long-description | rst2html.py > output.html
 
 :mod:`docutils` will display a warning if there's something wrong with your
-syntax.
+syntax.  Because PyPI applies additional checks (e.g. by passing ``--no-raw``
+to ``rst2html.py`` in the command above), running the command above without
+warnings is not sufficient for PyPI to convert the content successfully.
diff -r 1186d68715cc Misc/ACKS
--- a/Misc/ACKS	Wed Jul 04 19:33:45 2012 -0700
+++ b/Misc/ACKS	Thu Jul 05 19:13:04 2012 -0700
@@ -505,6 +505,7 @@
 Drew Jenkins
 Flemming Kjær Jensen
 MunSic Jeong
+Chris Jerdonek
 Jim Jewett
 Orjan Johansen
 Fredrik Johansson
diff -r 1186d68715cc Misc/NEWS
--- a/Misc/NEWS	Wed Jul 04 19:33:45 2012 -0700
+++ b/Misc/NEWS	Thu Jul 05 19:13:04 2012 -0700
@@ -64,6 +64,12 @@
 
 - Issue #15235: Allow Berkley DB versions up to 5.3 to build the dbm module.
 
+Documentation
+-------------
+
+- Issue #15231: Updated the "PyPI package display" documentation to say that
+  running rst2html.py without warnings does not guarantee conversion to HTML.
+
 
 What's New in Python 3.3.0 Beta 1?
 ==================================
@@ -128,7 +134,7 @@
 
 - Issue #15176: Clarified behavior, documentation, and implementation
   of os.listdir().
-  
+
 - Issue #15061: Re-implemented hmac.compare_digest() in C to prevent further
   timing analysis and to support all buffer protocol aware objects as well as
   ASCII only str instances safely.