path: root/pages/index
diff options
authorBernhard Froehlich <>2011-09-24 21:24:58 +0200
committerBernhard Froehlich <>2011-09-24 21:24:58 +0200
commit235788dbb6d050fe0c0d3a02771a508331c02e73 (patch)
treebe26e47fe17e0d8498eef6a724fd1dad224cdfdb /pages/index
parent33ddc197b25f9d06f216aa0a3f2a9bf117010eaf (diff)
parent863618723ff55b4ebb19da4f5144ca7790e8748c (diff)
Merge branch 'release' of ssh:// into bug-846
Diffstat (limited to 'pages/index')
2 files changed, 7 insertions, 13 deletions
diff --git a/pages/index/11.php b/pages/index/11.php
index 1b76f9c..8391903 100644
--- a/pages/index/11.php
+++ b/pages/index/11.php
@@ -23,7 +23,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
<p><b><?=_("PLEASE NOTE: Due to the large amounts of support questions, incorrectly directed emails may be over looked, this is a volunteer effort and directing general questions to the right place will help everyone, including yourself as you will get a reply quicker.")?></b></p>
<p><b><?=_("If you are contacting us about advertising, please use the form at the bottom of the website, the first contact form is not the correct place.")?></b></p>
<p><?=sprintf(_("If you are having trouble with your username or password, please visit our %swiki page%s for more information"), "<a href='' target='_new'>", "</a>");?></p>
-<p><?=_("Before contacting us, be sure to read the information on our official and unofficial HowTo and FAQ pages.")?> - <a href=""><?=_("Go here for more details.")?></a></p>
+<p><?=_("Before contacting us, be sure to read the information on our official and unofficial HowTo and FAQ pages.")?> - <a href="//"><?=_("Go here for more details.")?></a></p>
<p><?=_("General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p>
<p><a href=""><?=_("Click here to go to the Support List")?></a></p>
<p><?=_("You can alternatively use the form below, however joining the list is the prefered option to support your queries")?></p>
diff --git a/pages/index/8.php b/pages/index/8.php
index e45090d..4d515a6 100644
--- a/pages/index/8.php
+++ b/pages/index/8.php
@@ -15,16 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<p><b><? printf(_("The current %s board, and roles."), "CAcert Inc."); ?></b></p>
-Lambert Hofstra - <?=_("President")?><br/>
-Peter Yuill - <?=_("Vice President")?><br/>
-Alexander Prinsier - <?=_("Treasurer")?><br/>
-Mario Lipinski - <?=_("Secretary")?><br/>
-Piers Lauder - <?=_("member")?><br/>
-Ian Grigg - <?=_("member")?><br/>
-Dirk Astrath - <?=_("member")?><br/>
+<p style="background-color: #FF8080; font-size: 150%">
+printf(_("This page has been moved to the %swiki%s. Please update your ".
+ "bookmarks and report any broken links."),
+ '<a href="//">', '</a>');
-Kevin Dawson - <?=_("Public Officer")?><br />
-<br />
-More detailed informations can be found in the CAcert wiki under <a href="//"><?=_("CAcert Board")?></a>