--- a/app/soc/templates/soc/base.html	Sun Feb 22 10:54:28 2009 +0000
+++ b/app/soc/templates/soc/base.html	Sun Feb 22 10:55:24 2009 +0000
@@ -112,7 +112,7 @@
   <div id="header">
    <div id="logo">
 	{% block logo %}
-<a href="/"><img src="/soc/content/images/gospo-logo.png" alt="Google Open Source Programs"/></a>
+<a href="/"><img src="/soc/content/images/gospo-logo.png" alt="{{ site_name }}"/></a>
    <span title=" TODO: logo updated in site sponsor interface " class="popup">
 <small>*</small>
    </span>
@@ -161,7 +161,7 @@
      <li>
 <a class="selected" href="/">
     {% block sidebar_menu_title %}
-    Google Open Source Programs
+    {{ site_name }}
     {% endblock %}
     </a>
 {% if sidebar_menu_items %}
@@ -192,24 +192,7 @@
 	
    <div style="line-height: 140%;">
 	{% block body %}
-<p class="todo">
-This is generic HTML that can be configured via the site administration
-interface.  It is unclear if the site admin can be trusted and allowed to enter
-any arbitrary HTML (more flexible and powerful) or if only a whitelist of "safe"
-HTML tags should be permitted (to prevent XSS, etc.).
-(<a href="http://www.feedparser.org/"><code>feedparser</code></a> is useful for
-this and is written in Python, should whitelisting be necessary.)
-</p>
-<p>
-Welcome to Google Open Source Programs, the home of
-<a href="/program/gsoc2009/home">Google Summer of Code</a>
-and the
-<a href="/program/ghop2008/home">Google Highly Open Participation</a> contest.
-</p>
-<p class="todo">
-The site administration interface will provide a mechanism to select a feed to
-be displayed here.
-</p>
+  &lt;Missing Page Body&gt;
 	{% endblock %}
    </div>
    <div id="footer" dir="ltr">

--- a/app/soc/templates/soc/user/edit_profile.html	Sun Feb 22 10:54:28 2009 +0000
+++ b/app/soc/templates/soc/user/edit_profile.html	Sun Feb 22 10:55:24 2009 +0000
@@ -25,7 +25,7 @@
 <p>
 <p>
 {% block instructions %}
-Please use this form to set basic site-wide settings for your participation in Google Open Source Programs.
+Please use this form to set basic site-wide settings for your participation in {{ site_name }}.
 {% endblock %}
 </p>
 <form method="POST">

--- a/app/soc/templates/soc/user/lookup.html	Sun Feb 22 10:54:28 2009 +0000
+++ b/app/soc/templates/soc/user/lookup.html	Sun Feb 22 10:55:24 2009 +0000
@@ -17,7 +17,7 @@
 <p>
 <p>
 {% block instructions %}
-Please use this form to look up an existing User in Google Open Source Programs.
+Please use this form to look up an existing User in {{ site_name }}.
 {% endblock %}
 </p>
 <form method="POST">

--- a/app/soc/views/helper/params.py	Sun Feb 22 10:54:28 2009 +0000
+++ b/app/soc/views/helper/params.py	Sun Feb 22 10:55:24 2009 +0000
@@ -38,7 +38,7 @@
 
 
 DEF_LIST_DESCRIPTION_FMT = ugettext(
-    'List of %(name_plural)s in Google Open Source Programs.')
+    'List of %(name_plural)s.')
 
 DEF_CREATE_INSTRUCTION_MSG_FMT = ugettext(
       'Please use this form to select a %(name).')

--- a/app/soc/views/helper/responses.py	Sun Feb 22 10:54:28 2009 +0000
+++ b/app/soc/views/helper/responses.py	Sun Feb 22 10:55:24 2009 +0000
@@ -133,9 +133,9 @@
 
   settings = site.logic.getSingleton()
 
-  if settings:
-    context['ga_tracking_num'] = settings.ga_tracking_num
-    context['gmaps_api_key'] = settings.gmaps_api_key
+  context['ga_tracking_num'] = settings.ga_tracking_num
+  context['gmaps_api_key'] = settings.gmaps_api_key
+  context['site_name'] = settings.site_name
   context['tos_link'] = redirects.getToSRedirect(settings)
  
   return context