merge with 0.6

1 files changed, 6 insertions, 5 deletions

diff --git a/setup.py b/setup.py
index 981270c8..aedfb8e7 100644
--- a/setup.py
+++ b/setup.py
@@ -21,19 +21,20 @@ Sphinx uses reStructuredText as its markup language, and many of its strengths
 come from the power and straightforwardness of reStructuredText and its
 parsing and translating suite, the Docutils.
 
-Although it is still under constant development, the following features
-are already present, work fine and can be seen "in action" in the Python docs:
+Among its features are the following:
 
-* Output formats: HTML (including Windows HTML Help), plain text and LaTeX,
-  for printable PDF versions
+* Output formats: HTML (including derivative formats such as HTML Help, Epub
+  and Qt Help), plain text and LaTeX or direct PDF output using rst2pdf
 * Extensive cross-references: semantic markup and automatic links
   for functions, classes, glossary terms and similar pieces of information
 * Hierarchical structure: easy definition of a document tree, with automatic
   links to siblings, parents and children
 * Automatic indices: general index as well as a module index
 * Code handling: automatic highlighting using the Pygments highlighter
+* Flexible HTML output using the Jinja 2 templating engine
 * Various extensions are available, e.g. for automatic testing of snippets
-  and inclusion of appropriately formatted docstrings.
+  and inclusion of appropriately formatted docstrings
+* Setuptools integration
 
 A development egg can be found `here
 <http://bitbucket.org/birkenfeld/sphinx/get/tip.gz#egg=Sphinx-dev>`_.