[kde-doc-english] [kdepim] doc/kmail: REVIEW: 111159

[Yuri Chornoivan]

Git commit faa961e6fbddd2a5bd75270f5496a51556ee12e3 by Yuri Chornoivan, on behalf of Scarlett Clark.
Committed on 22/06/2013 at 05:35.
Pushed by yurchor into branch 'master'.

REVIEW: 111159

Documentation: EBN corrections and added myself to 4.11 Documentation

M  +20   -19   doc/kmail/credits-and-licenses.docbook

http://commits.kde.org/kdepim/faa961e6fbddd2a5bd75270f5496a51556ee12e3

diff --git a/doc/kmail/credits-and-licenses.docbook b/doc/kmail/credits-and-licenses.docbook
index c4126de..849bf56 100644
--- a/doc/kmail/credits-and-licenses.docbook
+++ b/doc/kmail/credits-and-licenses.docbook
@@ -6,14 +6,14 @@
 <firstname>Daniel</firstname>
 <surname>Naber</surname>
 <affiliation><address>
-<email>daniel.naber at t-online.de</email>
+&Daniel.Naber.mail;
 </address></affiliation>
 </author>
 <author>
 <firstname>David</firstname>
 <surname>Rugge</surname>
 <affiliation><address>
-<email>davidrugge at mediaone.net</email>
+&David.Rugge.mail;
 </address></affiliation>
 </author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
@@ -107,29 +107,30 @@
 <title>Documentation</title>
 
 <para>Update for &kmail; 4.11 by
-Laurent Montel <email>montel at kde.org</email>.</para>
+Laurent Montel <email>montel at kde.org</email>.
+Scarlett Clark <email>scarlett at scarlettgatelyclark.com</email></para>
 
 <para>Update for &kmail; 1.7 by
-Ingo Klöcker <email>kloecker at kde.de</email> and
-Marc Mutz <email>mutz at kde.org</email>,
-Anti-Spam Wizard chapter by Andreas Gungl <email>a.gungl at gmx.de</email>,
-section about filter log by Andreas Gungl <email>a.gungl at gmx.de</email> and
-Brad Hards <email>bradh at frogmouth.net</email>,
-additional changes by Daniel Naber <email>daniel.naber at t-online.de</email>.</para>
-
-<para>Update for &kmail; 1.2 to 1.5 by Daniel Naber
-<email>daniel.naber at t-online.de</email>,
-<application>OpenPGP</application> chapter by Andreas Gungl
-<email>a.gungl at gmx.de</email> and Ingo Klöcker <email>kloecker at kde.de</email>,
-message filter chapter by Marc Mutz
-<email>mutz at kde.org</email>, download filter chapter by Thorsten
-Zachmann <email>T.Zachmann at zagge.de</email>. Other parts have been
+Ingo Klöcker &Ingo.Kloecker.mail; and
+&Marc.Mutz; &Marc.Mutz.mail;,
+Anti-Spam Wizard chapter by &Andreas.Gungl; &Andreas.Gungl.mail;,
+section about filter log by &Andreas.Gungl; &Andreas.Gungl.mail; and
+&Brad.Hards; &Brad.Hards.mail;,
+additional changes by &Daniel.Naber; &Daniel.Naber.mail;.</para>
+
+<para>Update for &kmail; 1.2 to 1.5 by &Daniel.Naber;
+&Daniel.Naber.mail;,
+<application>OpenPGP</application> chapter by &Andreas.Gungl;
+&Andreas.Gungl.mail; and Ingo Klöcker &Ingo.Kloecker.mail;,
+message filter chapter by &Marc.Mutz;
+&Marc.Mutz.mail;, download filter chapter by &Thorsten.Zachmann;
+&Thorsten.Zachmann.mail;. Other parts have been
 contributed by various &kmail; developers.</para>
 
 <para>&kmail; 1.0
-documentation by David Rugge <email>davidrugge at mediaone.net</email>.
+documentation by &David.Rugge; &David.Rugge.mail;.
 Original documentation by Markus Wuebben
-<email>markus.wuebben at kde.org</email>, Robert Williams
+<email>markus.&Bernd.Johannes.Wuebben.mail;</email>, Robert Williams
 <email>rwilliams at kde.org</email> (Editor).</para>
 
 <para>Thanks to Michael Elkins <email>me at cs.hmc.edu</email> for his excellent