members2 -> members

diff --git a/cert.mlt b/cert.mlt
index a541c63..3e033df 100644 (file)
--- a/cert.mlt
+++ b/cert.mlt
@@ -143,7 +143,7 @@ elseif $"mod" <> "" then
 
 <p>Note that you can't use SSL certificates very well over HTTPS without an IP address assigned to your web virtual host.  You can request one separately on <a href="ip">the IP address request page</a>.</p>
 
-<p>The <a href="http://wiki2.hcoop.net/MemberManual/ServingWebsites/SslCert">instructions on our wiki for creating SSL certificates</a> may be helpful.</p>
+<p>The <a href="http://wiki.hcoop.net/MemberManual/ServingWebsites/SslCert">instructions on our wiki for creating SSL certificates</a> may be helpful.</p>
 
 <form method="post">
 <input type="hidden" name="new" value="1">

diff --git a/config.sml b/config.sml
index b8c441a..acb31cc 100644 (file)
--- a/config.sml
+++ b/config.sml
@@ -1,7 +1,7 @@
 structure Config :> CONFIG = struct
 
 val scratchDir = "/afs/hcoop.net/user/h/hc/hcoop"
-val urlPrefix = "https://members2.hcoop.net/portal/"
+val urlPrefix = "https://members.hcoop.net/portal/"
 val emailSuffix = "@hcoop.net"
 val boardEmail = "board" ^ emailSuffix
 

diff --git a/header.mlt.in b/header.mlt.in
index f77396a..6f76526 100644 (file)
--- a/header.mlt.in
+++ b/header.mlt.in
@@ -2,7 +2,7 @@
 
 <div class="sbgroup">
 <li> <a href="portal">Front page</a></li>
-<li> <a href="http://wiki2.hcoop.net/">Wiki</a></li>
+<li> <a href="http://wiki.hcoop.net/">Wiki</a></li>
 </div>
 
 <% if Group.inGroupNum 0 then %>

diff --git a/list.mlt b/list.mlt
index d0865b9..498fe7a 100644 (file)
--- a/list.mlt
+++ b/list.mlt
@@ -116,7 +116,7 @@ elseif $"mod" <> "" then
 
 <p>Enter here the e-mail address you would like for your list.  Please keep in mind that the part of your list address before the "@" must be unique across all mailing lists we run.  We may reject applications with overly general names here, especially names of current users or UNIX usernames that are likely to be chosen by future members.  The "Reason" field is optional.</p>
 
-<p>If you want to use the Mailman web interface on your new list, and you want this to appear on a different web virtual host than hcoop.net, then you should follow <a href="http://wiki2.hcoop.net/MemberManual/Email/MailingLists">these instructions</a> <b>before</b> requesting the list. You should only need to follow the instructions once per domain.</p>
+<p>If you want to use the Mailman web interface on your new list, and you want this to appear on a different web virtual host than hcoop.net, then you should follow <a href="http://wiki.hcoop.net/MemberManual/Email/MailingLists">these instructions</a> <b>before</b> requesting the list. You should only need to follow the instructions once per domain.</p>
 
 <form action="list" method="post">
 <table class="blanks">

diff --git a/paid.txt b/paid.txt
index 7677c8e..a27350d 100644 (file)
--- a/paid.txt
+++ b/paid.txt
@@ -7,7 +7,7 @@ Your new account at hcoop.net has been created.
 You should now read this wiki page, which contains important information
 for new members and describes how you can start using your account:
 
-  http://wiki2.hcoop.net/MemberManual/GettingStarted/AccountCreated
+  http://wiki.hcoop.net/MemberManual/GettingStarted/AccountCreated
 
 We recommend reading it all the way through before proceeding.
 

diff --git a/welcome.txt b/welcome.txt
index 39384f2..6679550 100644 (file)
--- a/welcome.txt
+++ b/welcome.txt
@@ -8,7 +8,7 @@ application.  Welcome to our family! :-)
 You should now read this wiki page, which describes how we can complete
 your joining process:
 
-  http://wiki2.hcoop.net/MemberManual/GettingStarted/NewMember
+  http://wiki.hcoop.net/MemberManual/GettingStarted/NewMember
 
 We recommend reading it all the way through and then following the
 instructions on payment and account creation.