diff --git a/www/conservancy/apps/blog/models.py b/www/conservancy/apps/blog/models.py index 85dea531..942e97a3 100644 --- a/www/conservancy/apps/blog/models.py +++ b/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_url = 'http://www.softwarefreedom.org/blog/' - post_url = ('http://www.softwarefreedom.org' + blog_name = 'Software Freedom Conservancy Blog' + blog_url = 'http://www.sfconservancy.org/blog/' + post_url = ('http://www.sfconservancy.org' + self.get_absolute_url()) import xmlrpclib diff --git a/www/conservancy/apps/news/models.py b/www/conservancy/apps/news/models.py index 4fc5e3d9..ef916360 100644 --- a/www/conservancy/apps/news/models.py +++ b/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_url = 'http://www.softwarefreedom.org/news/' - post_url = ('http://www.softwarefreedom.org' + blog_name = 'Software Freedom Conservancy News' + blog_url = 'https://www.sfconservancy.org/news/' + post_url = ('https://www.sfconservancy.org' + self.get_absolute_url()) import xmlrpclib diff --git a/www/conservancy/templates/feeds/blog_description.html b/www/conservancy/templates/feeds/blog_description.html index 4912c87c..56ed0925 100644 --- a/www/conservancy/templates/feeds/blog_description.html +++ b/www/conservancy/templates/feeds/blog_description.html @@ -1,2 +1,2 @@ -

Blog post by {{ obj.author.formal_name }}. Please email any comments on this entry to <{{ obj.author.username }}@sfconservancy.org>.

+

Blog post by {{ obj.author.formal_name }}. Please email any comments on this entry to <{{ obj.author.username }}@sfconservancy.org>.

{{ obj.body|safe }}