From 71f773159ed46d616aaeaf365c2bf9a22d11aeb0 Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Sun, 3 Oct 2010 20:28:09 -0400
Subject: [PATCH] s/conservancy.softwarefreedom.org/sfconservancy.org/g

---
 www/conservancy/static/401error.html | 2 +-
 www/conservancy/static/403error.html | 2 +-
 www/conservancy/static/404error.html | 2 +-
 www/conservancy/templates/feeds.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/conservancy/static/401error.html b/www/conservancy/static/401error.html
index 19ad5a38..672f339f 100644
--- a/www/conservancy/static/401error.html
+++ b/www/conservancy/static/401error.html
@@ -3,7 +3,7 @@
 
 <h1>401 Error</h1>
 
-<p>The page you request at <tt>conservancy.softwarefreedom.org</tt>
+<p>The page you request at <tt>sfconservancy.org</tt>
 requires authorization.  Please use the navigation items to find a
 page that you are authorized to see.</p>
 
diff --git a/www/conservancy/static/403error.html b/www/conservancy/static/403error.html
index 74ca56ce..936dff5f 100644
--- a/www/conservancy/static/403error.html
+++ b/www/conservancy/static/403error.html
@@ -3,7 +3,7 @@
 
 <h1>403 Error</h1>
 
-<p>The page you request at <tt>conservancy.softwarefreedom.org</tt>
+<p>The page you request at <tt>sfconservancy.org</tt>
 does not have read permission.  Please use the navigation items to
 find a page that you are authorized to see.</p>
 
diff --git a/www/conservancy/static/404error.html b/www/conservancy/static/404error.html
index 05abe708..952f852c 100644
--- a/www/conservancy/static/404error.html
+++ b/www/conservancy/static/404error.html
@@ -3,7 +3,7 @@
 
 <h1>404 Error</h1>
 
-<p>The page you request at <tt>conservancy.softwarefreedom.org</tt>
+<p>The page you request at <tt>sfconservancy.org</tt>
 was not found.  Please use the navigation items to find a page that is
 available.</p>
 
diff --git a/www/conservancy/templates/feeds.html b/www/conservancy/templates/feeds.html
index 7f4af010..2b883455 100644
--- a/www/conservancy/templates/feeds.html
+++ b/www/conservancy/templates/feeds.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<h1>News Feeds Available at conservancy.softwarefreedom.org</h1>
+<h1>News Feeds Available at sfconservancy.org</h1>
 
 <p>All feeds are RSS 2.0.</p>