From 71f773159ed46d616aaeaf365c2bf9a22d11aeb0 2010-10-04 00:28:09
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2010-10-04 00:28:09
Subject: [PATCH] s/conservancy.softwarefreedom.org/sfconservancy.org/g

---

diff --git a/www/conservancy/static/401error.html b/www/conservancy/static/401error.html
index 19ad5a38139061d9396e4d1a63764eb7a44fde7d..672f339f28f39b29b66bbb78868caf53fd52c4cc 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 74ca56ce47ba1ee9d6433dc06ec388f1d4b8daf5..936dff5f703e49a901f682beb8ffca4e9d4e51c6 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 05abe70857dc9b0f7947d0979be5c9b8b63a0062..952f852ce108a8b8250113cd08ee9293fed24ab2 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 7f4af010f7c8d8eb0b2c9843dd4df43f16c70f02..2b88345548d5f265ba77f26230a46a98f525ce71 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>