From 8dc8e41f7aa1bd78875f1e19b7741075ed5f4be0 Mon Sep 17 00:00:00 2001
From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Sat, 3 Nov 2012 15:35:21 -0700
Subject: Update setup_description.rst by running `python setup.py prep`.

---
 setup_description.rst | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/setup_description.rst b/setup_description.rst
index 0f1f86c..db1494e 100644
--- a/setup_description.rst
+++ b/setup_description.rst
@@ -4,15 +4,15 @@
 Pystache
 ========
 
-.. figure:: https://s3.amazonaws.com/webdev_bucket/pystache.png
+.. figure:: http://defunkt.github.com/pystache/images/logo_phillips.png
    :align: center
    :alt: mustachioed, monocled snake by David Phillips
 
-.. figure:: https://secure.travis-ci.org/defunkt/pystache.png?branch=master,development
+.. figure:: https://secure.travis-ci.org/defunkt/pystache.png
    :align: center
    :alt: 
 
-`Pystache <https://github.com/defunkt/pystache>`_ is a Python
+`Pystache <http://defunkt.github.com/pystache>`_ is a Python
 implementation of `Mustache <http://mustache.github.com/>`_. Mustache is
 a framework-agnostic, logic-free templating system inspired by
 `ctemplate <http://code.google.com/p/google-ctemplate/>`_ and
@@ -43,6 +43,7 @@ Pystache is tested with--
 -  Python 2.7
 -  Python 3.1
 -  Python 3.2
+-  Python 3.3
 -  `PyPy <http://pypy.org/>`_
 
 `Distribute <http://packages.python.org/distribute/>`_ (the setuptools
@@ -66,6 +67,8 @@ as follows:
 
     pip install 'simplejson<2.1.0'
 
+Official support for Python 2.4 will end with Pystache version 0.6.0.
+
 Install It
 ----------
 
@@ -306,7 +309,7 @@ Credits
     Author: Chris Wanstrath
     Maintainer: Chris Jerdonek
 
-Pystache logo by `David Phillips <http://davidphillips.us/>`_ and
+Pystache logo by `David Phillips <http://davidphillips.us/>`_ is
 licensed under a `Creative Commons Attribution-ShareAlike 3.0 Unported
 License <http://creativecommons.org/licenses/by-sa/3.0/deed.en_US>`_.
 |image0|
@@ -314,6 +317,9 @@ License <http://creativecommons.org/licenses/by-sa/3.0/deed.en_US>`_.
 History
 =======
 
+**Note:** Official support for Python 2.4 will end with Pystache version
+0.6.0.
+
 0.5.3 (TBD)
 -----------
 
@@ -330,6 +336,7 @@ History
 -  Added a ``parse()`` function that yields a printable, pre-compiled
    parse tree.
 -  Added support for rendering pre-compiled templates.
+-  Added Python 3.3 to the list of supported versions.
 -  Added support for `PyPy <http://pypy.org/>`_ (issue #125).
 -  Added support for `Travis CI <http://travis-ci.org>`_ (issue #124).
    [msabramo]
@@ -339,6 +346,8 @@ History
    when getting a key from a context stack (issue #110).
 -  Bugfix: lambda section values can now return non-ascii, non-unicode
    strings (issue #118).
+-  Bugfix: running ``test_pystache.py`` from a downloaded sdist no
+   longer requires a spec test directory to pass.
 -  Convert HISTORY and README files from reST to Markdown.
 -  More robust handling of byte strings in Python 3.
 -  Added Creative Commons license for David Phillips's logo.
-- 
cgit v1.2.1