--- a/app/soc/templates/soc/home/public.html	Thu Jan 22 16:05:49 2009 +0000
+++ b/app/soc/templates/soc/home/public.html	Thu Jan 22 17:23:17 2009 +0000
@@ -53,7 +53,7 @@
   {{ home_document.content|safe }}
  {% else %}
 {% block missing_doc %}
-This is the default home page can be edited via <a href="/site/settings/edit">Edit Site Settings</a>.<br />
+This is the default home page can be edited via <a href="/site/edit">Edit Site Settings</a>.<br />
 {% endblock %}
  {% endif %}
  {% if entity.feed_url %}

--- a/app/soc/templates/soc/presence/public.html	Thu Jan 22 16:05:49 2009 +0000
+++ b/app/soc/templates/soc/presence/public.html	Thu Jan 22 17:23:17 2009 +0000
@@ -18,10 +18,10 @@
 <a href="/document/edit">creating a new Document</a> or
 <a href="/document/list">editing an existing Document</a> and then selecting
 that Document in the
-<a href="/site/settings/edit">Site Settings</a> interface.
+<a href="/site/edit">Site Settings</a> interface.
 Other elements of this page, such as a feed to be displayed below this
 content, can also be set using the
-<a href="/site/settings/edit">Site Settings</a> interface.
+<a href="/site/edit">Site Settings</a> interface.
 You need to sign in as site Developer in order to change
-<a href="/site/settings/edit">Site Settings</a>.
+<a href="/site/edit">Site Settings</a>.
 {% endblock %}

--- a/app/soc/templates/soc/site/error.html	Thu Jan 22 16:05:49 2009 +0000
+++ b/app/soc/templates/soc/site/error.html	Thu Jan 22 17:23:17 2009 +0000
@@ -22,5 +22,5 @@
 {% endblock %}
 
 {% block body %}
-This is the default home page, which can be edited via <a href="/site/settings/edit">Edit Site Settings</a>.<br />
+This is the default home page, which can be edited via <a href="/site/edit">Edit Site Settings</a>.<br />
 {% endblock %}

--- a/app/soc/templates/soc/site/list/row.html	Thu Jan 22 16:05:49 2009 +0000
+++ b/app/soc/templates/soc/site/list/row.html	Thu Jan 22 17:23:17 2009 +0000
@@ -1,9 +1,9 @@
 <tr class="off" onmouseover="this.className='on'" onmouseout="this.className='off'" 
-onclick="document.location.href='/site/settings/edit/{{ list.item.scope_path }}/{{ list.item.link_id }}'" name="name">
+onclick="document.location.href='/site/edit/{{ list.item.scope_path }}/{{ list.item.link_id }}'" name="name">
   <td align="right">
    <div class="title">
     <a class="noul"
-     href="/site/settings/edit/{{ list.item.scope_path }}/{{ list.item.link_id }}">{{ list.item.scope_path}}/{{ list.item.link_id }}</a>
+     href="/site/edit/{{ list.item.scope_path }}/{{ list.item.link_id }}">{{ list.item.scope_path}}/{{ list.item.link_id }}</a>
    </div>
   </td>
   <td><div class="link_id">{{ list.item.home.title }}</div></td>

--- a/app/soc/views/models/site.py	Thu Jan 22 16:05:49 2009 +0000
+++ b/app/soc/views/models/site.py	Thu Jan 22 17:23:17 2009 +0000
@@ -56,9 +56,8 @@
     new_params['rights'] = rights
 
     new_params['name'] = "Site Settings"
+    new_params['name_plural'] = new_params['name']
     new_params['name_short'] = "Site"
-    new_params['url_name'] = "site/settings"
-    new_params['module_name'] = "site"
 
     new_params['sidebar_defaults'] = [('/%s/edit', 'Edit %(name)s', 'edit')]
     new_params['sidebar_heading'] = new_params['name_short']