# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1280374839 25200
# Node ID 9a37a94fed68fe851583f4ed1e03c641707a9884
# Parent  1fa9ca23d6967e70d534759be0bb6ed0057b1b00# Parent  f207357d7ca98e4a9ce61cf29b24ffa7c5ec6806
merging, the fun

diff -r f207357d7ca9 -r 9a37a94fed68 README.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.txt	Wed Jul 28 20:40:39 2010 -0700
@@ -0,0 +1,28 @@
+buttercup: a flower for k0s.org
+===============================
+
+buttercup is a `flower <TODO>`_ that is used to bloom a website like
+`k0s.org <http://k0s.org>`_.  There are several `python <http://python.org>`_
+components to a buttercup website:
+
+ * `decoupage <http://k0s.org/portfolio/software.html#decoupage>`_: for static files and indices
+   - `montage <http://k0s.org/portfolio/software.html#montage>`_for image galleries
+   - contenttransformer for static file presentation
+ * `bitsyblog <http://k0s.org/portfolio/software.html#bitsblog`_ for blogging
+ * a set of mercurial repositories
+ * software demos:
+   - anagram
+   - wordstream
+
+why is buttercup so messy?
+--------------------------
+
+Easy.  Its the backport of a highly specific website to a flower.  The
+buttercup flower is in fact a study in botany, useful in the study of
+species, but probably less interesting as a practical deployment.
+
+
+does buttercup work yet?
+------------------------
+
+No.  It is still a work in progress.
diff -r f207357d7ca9 -r 9a37a94fed68 setup.py
--- a/setup.py	Mon Mar 29 11:31:14 2010 -0700
+++ b/setup.py	Wed Jul 28 20:40:39 2010 -0700
@@ -1,10 +1,16 @@
 from setuptools import find_packages, setup
 
+try:
+    description = file("README.txt").read()
+except:
+    description = ''
+
 version='0.0'
 
 setup(name='buttercup',
       version=version,
       description="paste template for creating instances of the buttercup flower website pattern",
+      long_description=description,
       author='Jeff Hammel',
       author_email='k0scist@gmail.com',
       url='http://k0s.org',