12 files changed, 18 insertions, 18 deletions

diff --git a/doc/khelpcenter/adminguide/index.docbook b/doc/khelpcenter/adminguide/index.docbook
index dd24a1cdc..e474c626f 100644
--- a/doc/khelpcenter/adminguide/index.docbook
+++ b/doc/khelpcenter/adminguide/index.docbook
@@ -36,7 +36,7 @@
 </para>
 
 <para>Please report problems with this document to
-<email>[email protected]</email>.
+<email>[email protected]</email>.
 </para>
 </abstract>
 
diff --git a/doc/khelpcenter/faq/about.docbook b/doc/khelpcenter/faq/about.docbook
index 76967f78a..9b5e0841e 100644
--- a/doc/khelpcenter/faq/about.docbook
+++ b/doc/khelpcenter/faq/about.docbook
@@ -39,7 +39,7 @@ relevant documentation) well before asking questions on the various
 <answer>
 <para>Becoming an <acronym>FAQ</acronym> maintainer is easy
 and we are always grateful for help. :-) Send
-us an email at <email>[email protected]</email>.
+us an email at <email>[email protected]</email>.
 </para>
 </answer>
 </qandaentry>
diff --git a/doc/khelpcenter/faq/contrib.docbook b/doc/khelpcenter/faq/contrib.docbook
index 6bb716f62..d1f4a85f0 100644
--- a/doc/khelpcenter/faq/contrib.docbook
+++ b/doc/khelpcenter/faq/contrib.docbook
@@ -29,7 +29,7 @@ report?</link>.</para></listitem>
 <listitem><para>Draw icons, wallpaper, or compose sound effects.</para></listitem>
 <listitem><para>Write articles and books about &tde;. If you want to
 help spread the word about &tde;, send an email to
-<email>[email protected]</email>. This will get you in touch
+<email>[email protected]</email>. This will get you in touch
 with the &tde; developers and packagers.</para></listitem>
 <listitem><para>Program new &tde; applications. Please refer to <xref
 linkend="programming"/> for more information.</para></listitem>
@@ -98,7 +98,7 @@ directory.</para>
 programming for &tde; should do: please <emphasis>subscribe to the developers
 mailing list</emphasis>. To subscribe, you have to send an email to
 <ulink
-url="mailto:[email protected]">[email protected]</ulink>
+url="mailto:[email protected]">[email protected]</ulink>
 with an empty email.
 <important><para>Please read<ulink url="http://www.trinitydesktop.org/mailinglist.php">
 http://www.trinitydesktop.org/mailinglist.php</ulink>. Everything
@@ -118,8 +118,8 @@ way is to create a patch against a current snapshot and send this
 patch to the developer/maintainer of the respective program.</para>
 <para>If you are doing this more or less regularly, then contact the developers
 to obtain write access to the <acronym>GIT</acronym> repository:
-<ulink url="[email protected]">
[email protected]</ulink>.</para>
+<ulink url="[email protected]">
[email protected]</ulink>.</para>
 </answer>
 </qandaentry>
 
diff --git a/doc/khelpcenter/faq/index.docbook b/doc/khelpcenter/faq/index.docbook
index 478588411..70cf03539 100644
--- a/doc/khelpcenter/faq/index.docbook
+++ b/doc/khelpcenter/faq/index.docbook
@@ -54,7 +54,7 @@
 <abstract> <para>This is a collection of frequently asked
 questions about the Trinity Desktop Environment.  Please report any bugs,
 inconsistencies, or omissions you find in this &FAQ; to
-<email>[email protected]</email>.  Please post
+<email>[email protected]</email>.  Please post
 questions to the &tde; mailing lists. Questions are monitored to help
 maintain this &FAQ;.</para> </abstract>
 
diff --git a/doc/khelpcenter/faq/misc.docbook b/doc/khelpcenter/faq/misc.docbook
index 0dd2c4556..c94418632 100644
--- a/doc/khelpcenter/faq/misc.docbook
+++ b/doc/khelpcenter/faq/misc.docbook
@@ -196,7 +196,7 @@ artwork at <ulink url="http://kde-look.org">http://kde-look.org</ulink>.
 <para>You might want to subscribe to the
 <ulink url="http://www.trinitydesktop.org/mailinglist.php">
 &tde; developer's mail list</ulink>.
-Refer to <ulink url="http://trinity-devel.pearsoncomputing.net/">http://trinity-devel.pearsoncomputing.net/</ulink>
+Refer to <ulink url="[email protected]">[email protected]</ulink>
 if you want to read without subscribing.</para>
 </answer>
 </qandaentry>
diff --git a/doc/khelpcenter/faq/moreinfo.docbook b/doc/khelpcenter/faq/moreinfo.docbook
index f9d619456..60a0fba8f 100644
--- a/doc/khelpcenter/faq/moreinfo.docbook
+++ b/doc/khelpcenter/faq/moreinfo.docbook
@@ -73,17 +73,17 @@ already answered in this &FAQ;.</para>
 
 <variablelist>
 <varlistentry>
-<term><ulink url="http://trinity-users.pearsoncomputing.net/">tde-users</ulink></term>
+<term><ulink url="[email protected]">tde-users</ulink></term>
 <listitem><para>General discussion archives.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><ulink url="http://trinity-announce.pearsoncomputing.net/">tde-announce</ulink></term>
+<term><ulink url="[email protected]">tde-announce</ulink></term>
 <listitem><para>Announcement archives.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><ulink url="http://trinity-devel.pearsoncomputing.net/">tde-devel</ulink></term>
+<term><ulink url="[email protected]">tde-devel</ulink></term>
 <listitem><para>Developers, artists, documentation writer archives.</para></listitem>
 </varlistentry>
 </variablelist>
diff --git a/doc/khelpcenter/faq/questions.docbook b/doc/khelpcenter/faq/questions.docbook
index b24bfa320..bc0be3b32 100644
--- a/doc/khelpcenter/faq/questions.docbook
+++ b/doc/khelpcenter/faq/questions.docbook
@@ -132,6 +132,6 @@ people who do this for free with your politeness and appreciation. :-)</para>
 
 <para>If you think the answer to your question should be included in the
 &tde; &FAQ; please feel free to submit any patches or suggestions to the
-&tde; &FAQ; Maintainer, at <email>[email protected]</email></para>
+&tde; &FAQ; Maintainer, at <email>[email protected]</email></para>
 
 </chapter>
diff --git a/doc/khelpcenter/help.docbook b/doc/khelpcenter/help.docbook
index fd6e68d34..6d787c99f 100644
--- a/doc/khelpcenter/help.docbook
+++ b/doc/khelpcenter/help.docbook
@@ -18,14 +18,14 @@ documentation (&XML;).
 <para> All base &tde; applications come fully documented, thanks to
 the efforts of many people. If you would like to help,
 please contact members of the Trinity development team at
-<email>[email protected]</email> for information.
+<email>[email protected]</email> for information.
 Experience is not required, just enthusiasm and patience.
 </para>
 
 <para>
 If you would like to help translate &tde; documentation to your native
 language,please contact members of the Trinity development team at
-<email>[email protected]</email> for information.</para>
+<email>[email protected]</email> for information.</para>
 
 <sect2 id="installation">
 <title>Installation</title>
diff --git a/doc/khelpcenter/support.docbook b/doc/khelpcenter/support.docbook
index 59ca40c53..4c78f0e6d 100644
--- a/doc/khelpcenter/support.docbook
+++ b/doc/khelpcenter/support.docbook
@@ -40,7 +40,7 @@ that interest you.
 </para></listitem>
 
 <listitem><para>
-Read the <ulink url="http://trinity-devel.pearsoncomputing.net/">&tde;
+Read the <ulink url="[email protected]">&tde;
 developer mailing list</ulink> archives to get a feel for &tde; development.
 </para></listitem>
 
diff --git a/doc/khelpcenter/userguide/getting-help.docbook b/doc/khelpcenter/userguide/getting-help.docbook
index facea078d..b93c8a23b 100644
--- a/doc/khelpcenter/userguide/getting-help.docbook
+++ b/doc/khelpcenter/userguide/getting-help.docbook
@@ -105,7 +105,7 @@ documents</quote> is appropriate for this list.</para>
 <para>Subscribe to this list at <ulink
 url="http://www.trinitydesktop.org/mailinglist.php">http://www.trinitydesktop.org/mailinglist.php</ulink>.</para>
 <para>Find list archives at <ulink
-url="http://trinity-users.pearsoncomputing.net/">http://trinity-users.pearsoncomputing.net/</ulink>.</para>
+url="[email protected]">[email protected]</ulink>.</para>
 </listitem>
 </varlistentry>
 
diff --git a/doc/khelpcenter/userguide/index.docbook b/doc/khelpcenter/userguide/index.docbook
index 2ffdc84f5..691706676 100644
--- a/doc/khelpcenter/userguide/index.docbook
+++ b/doc/khelpcenter/userguide/index.docbook
@@ -82,7 +82,7 @@
 </para>
 
 <para>Please report problems with this document to
-<email>[email protected]</email>.
+<email>[email protected]</email>.
 </para>
 </abstract>
 
diff --git a/ktip/tips b/ktip/tips
index d9a06f914..cd825802e 100644
--- a/ktip/tips
+++ b/ktip/tips
@@ -657,7 +657,7 @@ so on.)</p>
 <tip category="General">
 <html>
 <p>If you want to contribute your own "tip of the day", please send the tip to
-<a href="[email protected]">[email protected]</a>,
+<a href="[email protected]">[email protected]</a>,
 and we will consider the tip for the next release.</p>
 </html>
 </tip>