8 files changed, 10 insertions, 36 deletions
diff --git a/etherpad/src/templates/500_body.ejs b/etherpad/src/templates/500_body.ejs
index 291e0fd..34549ed 100644
--- a/etherpad/src/templates/500_body.ejs
+++ b/etherpad/src/templates/500_body.ejs
@@ -19,7 +19,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad Internal S
   <div id="errorpage" class="fpcontent">
     <div class="error500">
       <p>Oops!  A server error occured.  It's been logged.</p>
-      <p>Please email &lt;support@etherpad.com&gt; if this persists.</p>
+      <p>Please email &lt;support@pad.spline.inf.fu-berlin.de&gt; if this persists.</p>
     </div>
   </div>
 <% } %>
diff --git a/etherpad/src/templates/email/eepnet_license_info.ejs b/etherpad/src/templates/email/eepnet_license_info.ejs
index ea431de..85556c7 100644
--- a/etherpad/src/templates/email/eepnet_license_info.ejs
+++ b/etherpad/src/templates/email/eepnet_license_info.ejs
@@ -61,7 +61,7 @@ DOWNLOAD LINK:
 <% if (isEvaluation) { %>
 --
 
-This email was sent automatically from etherpad.com because you signed
+This email was sent automatically from pad.spline.inf.fu-berlin.de because you signed
 up for EtherPad PNE.  If you did not sign up for
 this, then you can safely just ignore this email.
 
diff --git a/etherpad/src/templates/email/padinvite.ejs b/etherpad/src/templates/email/padinvite.ejs
index c6467b8..0f729e3 100644
--- a/etherpad/src/templates/email/padinvite.ejs
+++ b/etherpad/src/templates/email/padinvite.ejs
@@ -15,4 +15,4 @@ limitations under the License. */ %><%= body %>
 --
 Sent by <%= request.host %> at the request of an EtherPad user.
 Do not reply to this email.
-Report abuse to: support@etherpad.com
+Report abuse to: support@pad.spline.inf.fu-berlin.de
diff --git a/etherpad/src/templates/pad/pad_body2.ejs b/etherpad/src/templates/pad/pad_body2.ejs
index 5e3ea97..23b7adb 100644
--- a/etherpad/src/templates/pad/pad_body2.ejs
+++ b/etherpad/src/templates/pad/pad_body2.ejs
@@ -424,32 +424,6 @@ limitations under the License. */ %>
 
 <div id="modaloverlay"><div id="modaloverlay-inner"><!-- --></div></div>
 <div id="mainmodals">
-  <div id="feedbackbox">
-    <div id="feedbackbox-tl"><!-- --></div>
-    <div id="feedbackbox-tr"><!-- --></div>
-    <div id="feedbackbox-bl"><!-- --></div>
-    <div id="feedbackbox-br"><!-- --></div>
-    <div id="feedbackbox-back"><!-- --></div>
-<%/*    <a href="javascript:void(0)" id="feedbackbox-send"><!-- --></a>
-    <input type="text" id="feedbackbox-email" class="modalfield" />
-    <textarea id="feedbackbox-message" rows="6" cols="40" class="modalfield"></textarea>
-    <div id="feedbackbox-response"><!-- --></div>*/%>
-    <div id="feedbackbox-contents">
-      <div id="feedbackbox-contentsinner">
-        <p><strong>Great, we love feedback!  What kind?</strong></p>
-        <ul id="uservoicelinks">
-          <li><a href="http://uservoice.etherpad.com/pages/17280-feature-requests" target="_blank">Feature Request</a></li>
-          <li><a href="http://uservoice.etherpad.com/pages/17285-bugs-and-problems" target="_blank">Bug Report</a></li>
-          <li><a href="http://uservoice.etherpad.com/pages/22732-how-are-you-using-etherpad-" target="_blank">How I'm Using It</a></li>
-          <li><a href="http://uservoice.etherpad.com/pages/22751-general-questions" target="_blank">Other Question</a></li>
-          <li><a href="http://uservoice.etherpad.com/pages/22733-general-feedback" target="_blank">Other Feedback</a></li>
-        </ul>
-        <p>These links will open UserVoice in a new window.</p>
-        <p id="feedbackemails">You can also send email to <a href="feedback"><tt>feedback</tt></a>, <a href="support"><tt>support</tt></a>, or <a href="bugs"><tt>bugs</tt></a> at <tt>etherpad.com</tt>.</p>
-      </div>
-    </div>
-    <a href="javascript:void(0)" id="feedbackbox-hide"><!-- --></a>
-  </div>
   <div id="sharebox">
     <div id="sharebox-inner">
       <a href="javascript:void(0)" id="sharebox-hide"><!-- --></a>
diff --git a/etherpad/src/templates/pad/padfull_body.ejs b/etherpad/src/templates/pad/padfull_body.ejs
index 41a100c..5f85b4e 100644
--- a/etherpad/src/templates/pad/padfull_body.ejs
+++ b/etherpad/src/templates/pad/padfull_body.ejs
@@ -23,7 +23,7 @@ limitations under the License. */ %><div id="padfullpage" class="fpcontent">
 <p>Sorry, only <%= maxUsersPerPad %> people are allowed to edit a
 single pad at the same time in the free version of EtherPad.</p>
 
-<p>Please see our <a href="http://etherpad.com/ep/about/pricing">pricing plans</a> for
+<p>Please see our <a href="http://pad.spline.inf.fu-berlin.de/ep/about/pricing">pricing plans</a> for
 information about having more than <%= maxUsersPerPad %>
 collaborators.</p>
 
diff --git a/etherpad/src/templates/pro/account/account-welcome-email.ejs b/etherpad/src/templates/pro/account/account-welcome-email.ejs
index 25af6f8..33e1ac5 100644
--- a/etherpad/src/templates/pro/account/account-welcome-email.ejs
+++ b/etherpad/src/templates/pro/account/account-welcome-email.ejs
@@ -22,7 +22,7 @@ Thank you for signing up for EtherPad Professional Edition.  You can sign in by
 
 <%= signinLink %>
 
-For help signing in, or general support issues, please email support@etherpad.com.
+For help signing in, or general support issues, please email support@pad.spline.inf.fu-berlin.de.
 
 --
 This email was sent to <%= toEmail %> from an EtherPad user.
diff --git a/etherpad/src/templates/pro/admin/manage-billing.ejs b/etherpad/src/templates/pro/admin/manage-billing.ejs
index 8a7bd51..514d943 100644
--- a/etherpad/src/templates/pro/admin/manage-billing.ejs
+++ b/etherpad/src/templates/pro/admin/manage-billing.ejs
@@ -32,4 +32,4 @@ function plural(amt) {
 <h3 class="top">Payment Information</h3>
 
 <p>EtherPad Professional will be discontinued on <%= helpers.rafterTerminationDate() %>. No further payments will be collected.</p>
-<p><a href="http://etherpad.com<%= helpers.rafterBlogUrl() %>">Read more</a>.</p>
+<p><a href="http://pad.spline.inf.fu-berlin.de<%= helpers.rafterBlogUrl() %>">Read more</a>.</p>
diff --git a/etherpad/src/templates/pro/admin/pne-license-manager.ejs b/etherpad/src/templates/pro/admin/pne-license-manager.ejs
index f160be0..42594b8 100644
--- a/etherpad/src/templates/pro/admin/pne-license-manager.ejs
+++ b/etherpad/src/templates/pro/admin/pne-license-manager.ejs
@@ -21,7 +21,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad PNE Licens
     <div class="lm-error-msg">
       <p>Your evaluation license has expired!</p>
       <p>Please contact <%= helpers.oemail("sales") %> or visit the <a
-      href="http://etherpad.com/ep/about/pricing-eepnet">pricing page on etherpad.com</a>
+      href="http://pad.spline.inf.fu-berlin.de/ep/about/pricing-eepnet">pricing page on pad.spline.inf.fu-berlin.de</a>
       to purchase a license key.</p>
     </div>
 
@@ -32,8 +32,8 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad PNE Licens
     <div class="lm-notice-msg">
       <p>The version of EtherPad you are running (<%= runningVersionString %>) is too old.
       Please update to version <%= licenseVersionString %> or newer by <a
-      href="http://etherpad.com/ep/store/eepnet-download">downloading the latest version on
-      etherpad.com</a>.</p>
+      href="http://pad.spline.inf.fu-berlin.de/ep/store/eepnet-download">downloading the latest version on
+      pad.spline.inf.fu-berlin.de</a>.</p>
     </div>
 
   <% } %>
@@ -99,7 +99,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad PNE Licens
       <p>Before you can use this copy of EtherPad Private Network Edition, you must first
         enter a valid license.  Free trial licenses can be obtained <a
         target="_blank"
-        href="https://etherpad.com/ep/store/eepnet-eval-signup">obtained here</a>.
+        href="https://pad.spline.inf.fu-berlin.de/ep/store/eepnet-eval-signup">obtained here</a>.
       </p>
     <% } %>