Merge branch 'master' of ssh://k.sfconservancy.org/website

www/conservancy/apps/blog/models.py

@@ -60,9 +60,9 @@ class Entry(models.Model, bsoup.SoupModelMixin):
             super(Entry, self).save()
             return
 
-        blog_name = 'Software Freedom Law Center Blog'
+        blog_name = 'Software Freedom Conservancy Blog'
-        blog_url =  'http://www.softwarefreedom.org/blog/'
+        blog_url =  'http://www.sfconservancy.org/blog/'
-        post_url = ('http://www.softwarefreedom.org'
+        post_url = ('http://www.sfconservancy.org'
                     + self.get_absolute_url())
 
         import xmlrpclib

www/conservancy/apps/news/models.py

@@ -48,9 +48,9 @@ class PressRelease(models.Model, bsoup.SoupModelMixin):
             super(PressRelease, self).save()
             return
 
-        blog_name = 'Software Freedom Law Center News'
+        blog_name = 'Software Freedom Conservancy News'
-        blog_url =  'http://www.softwarefreedom.org/news/'
+        blog_url =  'https://www.sfconservancy.org/news/'
-        post_url = ('http://www.softwarefreedom.org'
+        post_url = ('https://www.sfconservancy.org'
                     + self.get_absolute_url())
 
         import xmlrpclib

www/conservancy/templates/feeds/blog_description.html

@@ -1,2 +1,2 @@
-<p><i>Blog post by <strong>{{ obj.author.formal_name }}</strong>.  Please email any comments on this entry to <a href="mailto:{{ obj.author.username }}@softwarefreedom.org">&lt;{{ obj.author.username }}@sfconservancy.org&gt;</a>.</i></p>
+<p><i>Blog post by <strong>{{ obj.author.formal_name }}</strong>.  Please email any comments on this entry to <a href="mailto:{{ obj.author.username }}@sfconservancy.org">&lt;{{ obj.author.username }}@sfconservancy.org&gt;</a>.</i></p>
 {{ obj.body|safe }}