tweak description text

README.md

@@ -1,6 +1,10 @@
 ![Granary](https://raw.github.com/snarfed/granary/master/static/logo_small.png) granary
 ===
 
+[Free](https://en.wikipedia.org/wiki/Threshing) yourself from silo API
+[chaff](https://en.wikipedia.org/wiki/Chaff) and expose the sweet social
+data foodstuff inside in standard formats and protocols!
+
   * [About](#about)
   * [Using](#using)
     * [Using the REST API](#using-the-REST-API)
@@ -13,15 +17,15 @@
 About
 ---
 
-This is a library and REST API that fetches and converts social network data between a wide variety of formats:
+Granary is a library and REST API that converts between a wide variety of formats:
 * Facebook, Google+, Instagram, and Twitter native APIs
 * [ActivityStreams](http://activitystrea.ms/)
 * [microformats2](http://microformats.org/wiki/microformats2) HTML
 * [microformats2](http://microformats.org/wiki/microformats2) JSON
 * [Atom](http://atomenabled.org/)
 * XML
 
-You can try out an interactive demo at https://granary-demo.appspot.com/
+Try out the interactive demo: https://granary-demo.appspot.com/
 
 License: This project is placed in the public domain.
 

README.rst

@@ -1,21 +1,15 @@
-|Granary|
-
-This is a library and REST API that fetches and converts social network
+Granary is a library and REST API that fetches and converts social network
 data between a wide variety of formats:
+
 - Facebook, Google+, Instagram, and Twitter native APIs
 - `ActivityStreams <http://activitystrea.ms/>`__
 - `microformats2 <http://microformats.org/wiki/microformats2>`__ HTML
 - `microformats2 <http://microformats.org/wiki/microformats2>`__ JSON
 - `Atom <http://atomenabled.org/>`__
 - XML
 
-You can try it out with these interactive demos:
-
-http://facebook-activitystreams.appspot.com/
-http://twitter-activitystreams.appspot.com/
-http://instagram-activitystreams.appspot.com/
-
-`Check out the docs for more! <https://github.com/snarfed/granary>`__
+`Try out the interactive demo <https://granary-demo.appspot.com/>`__ and
+`check out the docs <https://github.com/snarfed/granary>`__.
 
 License: This project is placed in the public domain.
 
@@ -39,7 +33,7 @@ is equivalent to this ``HTTP GET`` request:
 
 ::
 
-    https://twitter-activitystreams.appspot.com/@me/@friends/@app/
+    https://granary-demo.appspot.com/twitter/@me/@friends/@app/
       ?access_token_key=ACCESS_TOKEN_KEY&access_token_secret=ACCESS_TOKEN_SECRET
 
 They return the authenticated user's Twitter stream, ie tweets from the

granary/templates/index.html

@@ -65,19 +65,17 @@ <h1>granary</h1>
 
 <p class="lead">
 A library and REST API
-that <a href="https://en.wikipedia.org/wiki/Threshing">frees</a> social data
-from the <a href="https://en.wikipedia.org/wiki/Chaff">chaff</a> of social
-network
-<a href="https://indiewebcamp.com/silo">silos</a> and gives you the sweet
-foodstuffs inside: HTML and JSON
+that <a href="https://en.wikipedia.org/wiki/Threshing">frees</a> you
+from <a href="https://indiewebcamp.com/silo">silo</a>
+API <a href="https://en.wikipedia.org/wiki/Chaff">chaff</a> and and exposes the
+sweet social data foodstuff inside as HTML and JSON
 with <a href="http://microformats.org/wiki/microformats2">microformats2</a>,
 <a href="http://activitystrea.ms/">ActivityStreams</a>,
 <a href="http://atomenabled.org/">Atom</a>, XML, and more!
 </p>
 
 <p class="lead">
-Details in
-the <a href="https://github.com/snarfed/granary">GitHub repo</a>.
+Details in the <a href="https://github.com/snarfed/granary">GitHub repo</a>.
 Click on a site to try the demo!
 </p>
 

setup.py

@@ -21,7 +21,7 @@ def __init__(self, *args, **kwargs):
 
 setup(name='granary',
       version='1.0',
-      description='`Free <https://en.wikipedia.org/wiki/Threshing>`__ yourself from silo API `chaff <https://en.wikipedia.org/wiki/Chaff>`__ and expose the sweet social data foodstuff inside in standard formats and protocols!',
+      description='Free yourself from silo API chaff and expose the sweet social data foodstuff inside in standard formats and protocols!',
       long_description=open('README.rst').read(),
       url='https://github.com/snarfed/granary',
       packages=find_packages(exclude='test'),