From cc655f38bd0948ea467665b082352ff693dd85a3 2015-12-25 00:55:19
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2015-12-25 00:55:19
Subject: [PATCH] Be consistent about names of social networks.

Also, a grammar fix.

---

diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index be0dd57b51a6f7adabf906883862d9dce7feff0c..ad2c1e9f38ac4b8bdea8863d8ad00feeba79cc4e 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -63,8 +63,8 @@ who sign up by January 31 will count twice, thanks to <a href="https://www.priva
     <div id="conservancyfooter">
       <p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/sponsors/">Sponsors</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/omnibus/">RSS Feed</a></p>
       <p>Follow Conservancy
-      on <a href="https://identi.ca/conservancy">identi.ca</a>,
-      and <a href="https://twitter.com/conservancy">twitter</a>, <a href="https://plus.google.com/104268783278405704634/">Google+</a>,
+      on <a href="https://identi.ca/conservancy">pump.io</a>,
+      and <a href="https://twitter.com/conservancy">Twitter</a>, <a href="https://plus.google.com/104268783278405704634/">Google+</a>,
       and <a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">Youtube</a>.</p>
       <p class="copyright_info">
       <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0"><img alt="Creative Commons License" style="border-width:0" src="/img/cc-by-sa_88x31.png" /></a> 
diff --git a/www/conservancy/templates/frontpage.html b/www/conservancy/templates/frontpage.html
index b50f9caa6ad1ddea044e954d21515b8313e06045..f6785187b8c70b5da1050eb1060464085a1e4719 100644
--- a/www/conservancy/templates/frontpage.html
+++ b/www/conservancy/templates/frontpage.html
@@ -44,11 +44,11 @@
 <p>There is a <a href="/feeds/omnibus/">full site feed available</a> (as
   well as separate feeds for the <a href="/feeds/news/">news items</a> and
   <a href="/feeds/blog/">blog posts</a>).  You can follow Conservancy
- on <a href="https://identi.ca/conservancy">identi.ca (aka pump.io)</a>, 
+ on <a href="https://identi.ca/conservancy">pump.io</a>, 
   <a href="https://twitter.com/conservancy">Twitter</a>, <a href="https://plus.google.com/104268783278405704634/">Google+</a>,
       <a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">Youtube</a>,
       and probably can be found on whatever social network you prefer.  Look
-      for everywhere and follow us!</p>
+      for us everywhere and follow us!</p>
 
 <p>
     <span id="subbox">